Changeset 1162:d9b136a87245 in roaraudio

Timestamp:

01/24/09 02:00:26 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added whoami call

Files:

• include/libroar/ctl.h (modified) (1 diff)
• include/roaraudio/proto.h (modified) (1 diff)
• libroar/ctl.c (modified) (1 diff)
• roarclients/roarctl.c (modified) (1 diff)
• roard/commands.c (modified) (1 diff)
• roard/include/req.h (modified) (1 diff)
• roard/req.c (modified) (1 diff)

include/libroar/ctl.h

@@ -40 +40 @@
 #define ROAR_CTL_FILTER_ANY   0
 
+int roar_get_clientid  (struct roar_connection * con);
 
 int roar_get_standby   (struct roar_connection * con);

include/roaraudio/proto.h

@@ -81 +81 @@
 #define ROAR_CMD_GETTIMEOFDAY  31
 
+#define ROAR_CMD_WHOAMI        32
+
 
 #define ROAR_CMD_EPERM        252 /* error: permition denided */

libroar/ctl.c

@@ -35 +35 @@
 #include "libroar.h"
 
+int roar_get_clientid  (struct roar_connection * con) {
+ struct roar_message mes;
+
+ memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy!
+
+ mes.cmd     = ROAR_CMD_WHOAMI;
+ mes.datalen = 0;
+
+ if ( roar_req(con, &mes, NULL) == -1 )
+  return -1;
+
+ if ( mes.cmd != ROAR_CMD_OK )
+  return -1;
+
+ if ( mes.datalen != 1 )
+  return -1;
+
+ return mes.data[0];
+}
+
 int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * sa) {
  struct roar_message mes;

roarclients/roarctl.c

@@ -608 +608 @@
    }
 
+  } else if ( !strcmp(k, "whoami") ) {
+   printf("My client ID is: %i\n", roar_get_clientid(&con));
   } else if ( !strcmp(k, "serveroinfo") ) {
    server_oinfo(&con);

roard/commands.c

@@ -29 +29 @@
   {ROAR_CMD_IDENTIFY,     "IDENTIFY",     req_on_identify},
   {ROAR_CMD_AUTH,         "AUTH",         req_on_auth},
+  {ROAR_CMD_WHOAMI,       "WHOAMI",       req_on_whoami},
+
+
   {ROAR_CMD_NEW_STREAM,   "NEW_STREAM",   req_on_new_stream},
 

roard/include/req.h

@@ -32 +32 @@
 int req_on_identify    (int client, struct roar_message * mes, char * data);
 int req_on_auth        (int client, struct roar_message * mes, char * data);
+
+int req_on_whoami      (int client, struct roar_message * mes, char * data);
 
 int req_on_new_stream  (int client, struct roar_message * mes, char * data);

roard/req.c

@@ -72 +72 @@
 
 
+int req_on_whoami      (int client, struct roar_message * mes, char * data) {
+ mes->cmd     = ROAR_CMD_OK;
+ mes->datalen = 1;
+ mes->data[0] = client;
+ return 0;
+}
+
+
 int req_on_new_stream  (int client, struct roar_message * mes, char * data) {
  int stream;