Changeset 3713:38a2d99a3bed in roaraudio

Timestamp:

04/25/10 04:24:59 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved socket cred things out of the network.c into the clients.c/client_set_fh()

Location:

roard

Files:

• clients.c (modified) (1 diff)
• network.c (modified) (2 diffs)

roard/clients.c

@@ -132 +132 @@
 
 int clients_set_fh    (int id, int    fh) {
-
- if ( g_clients[id] == NULL )
-  return -1;
-
- g_clients[id]->fh = fh;
+ struct roar_client * c;
+#ifdef SO_PEERCRED
+ struct ucred cred;
+ socklen_t cred_len = sizeof(cred);
+#endif
+
+ if ( (c = g_clients[id]) == NULL )
+  return -1;
+
+ c->fh = fh;
+
+#ifdef SO_PEERCRED
+ 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));
+ }
+#elif defined(ROAR_HAVE_GETPEEREID)
+ if (getpeereid(fh, &(c->uid), &(c->gid)) == -1) {
+  ROAR_DBG("req_on_identify(): Can't get creds via getpeereid(): %s", strerror(errno));
+ }
+#endif
 
  return 0;

roard/network.c

@@ -84 +84 @@
  int client;
  struct roar_client * c;
-#ifdef SO_PEERCRED
- struct ucred cred;
- socklen_t cred_len = sizeof(cred);
-#endif
  struct roar_vio_calls    vio;
  struct sockaddr_storage  addr;
@@ -126 +122 @@
 
  if ( clients_get(client, &c) != -1 ) {
-#ifdef SO_PEERCRED
-  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));
-  }
-#elif defined(ROAR_HAVE_GETPEEREID)
-  if (getpeereid(fh, &(c->uid), &(c->gid)) == -1) {
-   ROAR_DBG("req_on_identify(): Can't get creds via getpeereid(): %s", strerror(errno));
-  }
-#endif
-
   if ( roar_nnode_free(&(c->nnode)) == -1 )
    return -1;