Changeset 2814:40065eb210bc in roaraudio

Timestamp:

09/29/09 18:00:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for nnode and prethru

File:

• roarclients/roarctl.c (modified) (5 diffs)

roarclients/roarctl.c

@@ -200 +200 @@
  int id[ROAR_CLIENTS_MAX];
  char tmp[80];
+ int self_id;
+ struct roar_client self_client;
  struct roar_client c;
 #ifdef _POSIX_USERS
@@ -206 +208 @@
 #endif
 
+ if ( (self_id = roar_get_clientid(con)) != -1 ) {
+  if ( roar_get_client(con, &self_client, self_id) == -1 )
+   self_id = -1;
+ }
+
  if ( (num = roar_list_clients(con, id, ROAR_CLIENTS_MAX)) == -1 ) {
   fprintf(stderr, "Error: can not get client list\n");
@@ -218 +225 @@
   }
   printf("Client name           : %s\n", c.name);
-  printf("Client PID            : %i(%s)\n", c.pid, proc_name(c.pid));
+
+  if ( roar_nnode_get_socktype(&(c.nnode)) != ROAR_SOCKET_TYPE_UNKNOWN ) {
+   if ( roar_nnode_to_str(&(c.nnode), tmp, 80) == 0 ) {
+    printf("Client network node   : %s\n", tmp);
+   }
+  }
+
+  if ( self_id != -1 && roar_nnode_cmp(&(self_client.nnode), &(c.nnode)) == 0 ) {
+   printf("Client PID            : %i(%s)\n", c.pid, proc_name(c.pid));
+  } else { 
+   printf("Client PID            : %i\n", c.pid);
+  }
   if ( c.uid != -1 ) {
 #ifdef _POSIX_USERS
-   pwd = getpwuid(c.uid);
-   grp = getgrgid(c.gid);
-   printf("Client UID/GID        : %i(%s)/%i(%s)\n", c.uid, pwd ? pwd->pw_name : "?", c.gid, grp ? grp->gr_name : "?");
+   if ( self_id != -1 && roar_nnode_cmp(&(self_client.nnode), &(c.nnode)) == 0 ) {
+    pwd = getpwuid(c.uid);
+    grp = getgrgid(c.gid);
+    printf("Client UID/GID        : %i(%s)/%i(%s)\n", c.uid, pwd ? pwd->pw_name : "?", c.gid, grp ? grp->gr_name : "?");
+   } else {
 #else
-   printf("Client UID/GID        : %i/%i\n", c.uid, c.gid);
+   if ( 1 ) {
 #endif
+    printf("Client UID/GID        : %i/%i\n", c.uid, c.gid);
+   }
   }
 
@@ -376 +398 @@
     if ( info.flags & ROAR_FLAG_PASSMIXER )
      strcat(flags, "passmixer ");
+    if ( info.flags & ROAR_FLAG_PRETHRU )
+     strcat(flags, "prethru ");
 
     printf("Flags                 : %s\n", flags);
@@ -759 +783 @@
   } else if ( !strcmp(c, "virtual") ) {
    f |= ROAR_FLAG_VIRTUAL;
+  } else if ( !strcmp(c, "prethru") ) {
+   f |= ROAR_FLAG_PRETHRU;
   } else {
    fprintf(stderr, "Error: unknown flag: %s\n", c);