Changeset 5608:584b36c566e2 in roaraudio for roard

Timestamp:

07/31/12 15:31:35 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Handle super long client names well (Closes: #286)

Location:

roard

Files:

• clients.c (modified) (2 diffs)
• commands.c (modified) (1 diff)
• include/commands.h (modified) (1 diff)
• include/req.h (modified) (1 diff)
• req.c (modified) (3 diffs)

roard/clients.c

@@ -758 +758 @@
   return -1;
 
- roar_connect_fh(&con, ROAR_CLIENT(cs)->fh);
+ if ( roar_connect_fh(&con, ROAR_CLIENT(cs)->fh) == -1 ) {
+  ROAR_WARN("clients_check(id=%i): Can not create con object for client: %s", id, roar_errorstring);
+ }
 
  ROAR_DBG("clients_check(id=%i): c->proto=%i", id, ROAR_CLIENT(cs)->proto);
@@ -802 +804 @@
     } else {
      roar_notify_core_emit_simple(event, id, -1, -1, m.cmd, -1, NULL, 0);
-     roar_send_message(&con, &m, flags[1] & COMMAND_FLAG_OUT_LONGDATA ? data : NULL);
+     if ( roar_send_message(&con, &m, flags[1] & COMMAND_FLAG_OUT_LONGDATA ? data : NULL) == -1 ) {
+      ROAR_WARN("clients_check(id=%i): Can not send answer to client: %s", id, roar_errorstring);
+     }
     }
 
     if ( flags[1] & COMMAND_FLAG_OUT_CLOSECON )
      clients_close(id, 1);
+
+    if ( flags[1] & COMMAND_FLAG_OUT_DELETE )
+     clients_delete(id);
 
    break;

roard/commands.c

@@ -48 +48 @@
 
   {ROAR_CMD_EXEC_STREAM,  _NAME("EXEC_STREAM"),  req_on_exec_stream,  ACCLEV_PWRUSER},
-  {ROAR_CMD_QUIT,         _NAME("QUIT"),         (int(*)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]))clients_delete, ACCLEV_NONE},
+  {ROAR_CMD_QUIT,         _NAME("QUIT"),         req_on_quit, ACCLEV_NONE},
 
   {ROAR_CMD_CON_STREAM,   _NAME("CON_STREAM"),   req_on_con_stream,   ACCLEV_PWRUSER},

roard/include/commands.h

@@ -36 +36 @@
 #define COMMAND_FLAG_OUT_LONGDATA  0x00000002
 #define COMMAND_FLAG_OUT_NOSEND    0x00000004
+#define COMMAND_FLAG_OUT_DELETE    0x00000008 /* delete the client */
 
 struct roar_command {

roard/include/req.h

@@ -30 +30 @@
 
 int req_on_noop        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
+int req_on_quit        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
 
 int req_on_identify    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]);

roard/req.c

@@ -81 +81 @@
 }
 
+int req_on_quit        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ (void)client, (void)data;
+ mes->cmd     = ROAR_CMD_OK;
+ mes->pos     = g_pos;
+ mes->datalen = 0;
+ flags[1] |= COMMAND_FLAG_OUT_DELETE;
+ return 0;
+}
+
 int req_on_identify    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  struct roar_client_server * cs;
@@ -1067 +1076 @@
 int req_on_get_client  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  struct roar_client * c;
+ int ret;
 
  if ( mes->datalen != 1 )
   return -1;
 
+ if ( *data != NULL )
+  roar_mm_free(*data);
+ *data = NULL;
+
  if ( clients_get(mes->data[0], &c) == -1 )
   return -1;
@@ -1076 +1090 @@
  mes->cmd = ROAR_CMD_OK;
 
- return roar_ctl_c2m(mes, c);
+ ret = roar_ctl_c2m2(mes, c, data);
+
+ if ( *data != NULL )
+  flags[1] |= COMMAND_FLAG_OUT_LONGDATA;
+
+ return ret;
 }