Changeset 2517:183f9b04d767 in roaraudio

Timestamp:

09/01/09 15:23:53 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added very basic begin of multi protocol handling

Location:

roard

Files:

• clients.c (modified) (3 diffs)
• include/client.h (modified) (1 diff)

roard/clients.c

@@ -61 +61 @@
     *n->host = 0;
 
+    n->proto = ROAR_PROTO_ROARAUDIO;
+
     n->acl   = NULL;
 
@@ -158 +160 @@
 
  g_clients[id]->gid = gid;
+
+ return 0;
+}
+
+int clients_set_proto (int id, int    proto) {
+ if ( g_clients[id] == NULL )
+  return -1;
+
+ g_clients[id]->proto = proto;
 
  return 0;
@@ -335 +346 @@
  roar_connect_fh(&con, g_clients[id]->fh);
 
- r = roar_recv_message(&con, &m, &data);
-
- if ( r == -1 ) { // should we drop the client?
-  clients_delete(id);
-  return -1;
- }
-
- roar_debug_message_print(&m);
-
- oldcmd = m.cmd;
-
- if ( (r = command_exec(id, &m, data)) == -1 ) {
-  m.cmd     = ROAR_CMD_ERROR;
-  m.datalen = 0;
-  ROAR_DBG("clients_check(*): Exec of command faild!");
- } else {
-  if ( m.cmd == oldcmd ) {
-   m.cmd     = ROAR_CMD_OK;
-   m.datalen = 0;
-  } else if ( m.cmd == ROAR_CMD_OK_STOP ) {
-   m.cmd     = ROAR_CMD_OK;
-   rv        = 1;
-  }
- }
-
- roar_send_message(&con, &m, NULL);
+ switch (g_clients[id]->proto) {
+  case ROAR_PROTO_ROARAUDIO:
+    r = roar_recv_message(&con, &m, &data);
+
+    if ( r == -1 ) { // should we drop the client?
+     clients_delete(id);
+     return -1;
+    }
+
+    roar_debug_message_print(&m);
+
+    oldcmd = m.cmd;
+
+    if ( (r = command_exec(id, &m, data)) == -1 ) {
+     m.cmd     = ROAR_CMD_ERROR;
+     m.datalen = 0;
+     ROAR_DBG("clients_check(*): Exec of command faild!");
+    } else {
+     if ( m.cmd == oldcmd ) {
+      m.cmd     = ROAR_CMD_OK;
+      m.datalen = 0;
+     } else if ( m.cmd == ROAR_CMD_OK_STOP ) {
+      m.cmd     = ROAR_CMD_OK;
+      rv        = 1;
+     }
+    }
+
+    roar_send_message(&con, &m, NULL);
+   break;
+  default:
+    rv = -1;
+ }
 
  if ( data )
   free(data);
 
- ROAR_DBG("clients_check(id=%i) = 0", id);
+ ROAR_DBG("clients_check(id=%i) = %i", id, rv);
  return rv;
 }

roard/include/client.h

@@ -60 +60 @@
 int clients_set_gid   (int id, int    gid);
 int clients_set_name  (int id, char * name);
+int clients_set_proto (int id, int    proto);
 int clients_get       (int id, struct roar_client ** client);
 int clients_get_fh    (int id);