Changeset 490:dc9ab0d247dc in roaraudio

Timestamp:

08/14/08 05:02:17 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected a cast and moved SO_PEERCRED code from req.c to network.c

Location:

roard

Files:

• network.c (modified) (2 diffs)
• req.c (modified) (3 diffs)

roard/network.c

@@ -25 +25 @@
  int fh;
  int client;
+#ifdef SO_PEERCRED
+ struct roar_client * c;
+ struct ucred cred;
+ socklen_t cred_len = sizeof(cred);
+#endif
 
  fh = accept(g_listen_socket, NULL, NULL);
@@ -42 +47 @@
  }
 
+#ifdef SO_PEERCRED
+ if ( clients_get(client, &c) != -1 ) {
+  if (getsockopt(fh, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len) != -1) {
+   if ( cred.pid != 0 ) {
+    c->pid = cred.pid;
+    c->uid = cred.uid;
+    c->gid = cred.gid;
+   }
+  } else {
+   ROAR_DBG("req_on_identify(): Can't get creds via SO_PEERCRED: %s", strerror(errno));
+  }
+ }
+#endif
+
 // close(fh);
 

roard/req.c

@@ -12 +12 @@
  struct roar_client * c;
  int max_len;
-#ifdef SO_PEERCRED
- struct ucred cred;
- socklen_t cred_len = sizeof(cred);
-#endif
 
  if ( mes->datalen < 1 )
@@ -23 +19 @@
 
  if ( mes->data[0] == 1 ) {
-#ifdef SO_PEERCRED
-  if (getsockopt(c->fh, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len) != -1) {
-   if ( cred.pid != 0 ) {
-    c->pid = cred.pid;
-    c->uid = cred.uid;
-    c->gid = cred.gid;
-   }
-  } else {
-   ROAR_DBG("req_on_identify(): Can't get creds via SO_PEERCRED: %s", strerror(errno));
-  }
-#endif
   if ( c->pid == -1 ) {
    c->pid       = ROAR_NET2HOST32(*(uint32_t*)((mes->data)+1));
@@ -420 +405 @@
  }
 
- if ( streams_get(mes->stream, ROAR_STREAM_SERVER(&s)) == -1 ) {
+ if ( streams_get(mes->stream, (struct roar_stream_server **)&s) == -1 ) {
   ROAR_WARN("req_on_get_stream_para(*): request on non existing (or other error?) stream %i", mes->stream);
   return -1;