Changeset 5608:584b36c566e2 in roaraudio for roard/req.c

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)

File:

• roard/req.c (modified) (3 diffs)

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;
 }