Changeset 5567:6ecf012d7063 in roaraudio for roard/network.c

Timestamp:

07/16/12 17:02:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

roard now tries to auto load missing protocols as plugins (Closes: #275)

File:

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

roard/network.c

@@ -70 +70 @@
 
 int net_get_new_client (struct roard_listen * lsock) {
+ const struct roard_proto_handle * proto;
  int fh;
  int client;
@@ -77 +78 @@
  struct sockaddr_storage  addr;
  socklen_t                addrlen = sizeof(addr);
- size_t i;
  int supported = 0;
 
@@ -191 +191 @@
      return -1;
 
-    for (i = 0; g_proto[i].proto != -1; i++) {
-     //printf("g_proto[i=%i].proto=%i, lsock->proto=%i\n", (int)i, g_proto[i].proto, lsock->proto);
-     if ( g_proto[i].proto == lsock->proto ) {
-      supported = 1;
-      if ( g_proto[i].new_client != NULL ) {
-       if ( g_proto[i].new_client(client, &vio, lsock) == -1 ) {
+    proto = clients_get_protohandle(lsock->proto);
+    supported = 0;
+    if ( proto != NULL ) {
+     switch (proto->type) {
+      case ROARD_PROTO_TYPE_BUILDIN:
+        //this should not end up here.
+        ROAR_WARN("net_get_new_client(lsock=%p): proto(%i) marked as buildin but isn't. BAD.", lsock, lsock->proto);
         supported = 0;
-       }
-      }
+       break;
+      case ROARD_PROTO_TYPE_ROARDPROTO:
+        supported = 1;
+        if ( proto->impl.roardproto.new_client != NULL ) {
+         if ( proto->impl.roardproto.new_client(client, &vio, lsock) == -1 ) {
+          supported = 0;
+         }
+        }
+       break;
      }
     }