Changeset 5567:6ecf012d7063 in roaraudio for roard/roard.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/roard.c (modified) (2 diffs)

roard/roard.c

@@ -953 +953 @@
  return 0;
 }
+
+static int check_listen(void) {
+ const struct roard_proto_handle * proto;
+ const char * protoname;
+ char buffer[80];
+ size_t i, j;
+
+ for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
+  if ( g_listen[i].used ) {
+   proto = clients_get_protohandle(g_listen[i].proto);
+   if ( proto != NULL )
+    continue;
+   protoname = roar_proto2str(g_listen[i].proto);
+   if ( protoname == NULL ) {
+    ROAR_ERR("check_listen(void): protocol %i is unknown (protocol ID not assigned?).");
+   } else {
+    ROAR_DBG("check_listen(void): Unknown protocol %s(%i) is used.", protoname, g_listen[i].proto);
+    snprintf(buffer, sizeof(buffer), "protocol-%s", protoname);
+    for (j = 0; buffer[j]; j++)
+     buffer[j] = tolower(buffer[j]);
+
+    ROAR_DBG("check_listen(void): Trying to load plugin \"%s\"", buffer);
+    if ( plugins_load(buffer, NULL) == -1 ) {
+     ROAR_WARN("check_listen(void): unabled to load plugin: %s: %s", buffer, roar_errorstring);
+    }
+   }
+
+   // recheck:
+   proto = clients_get_protohandle(g_listen[i].proto);
+   if ( proto == NULL ) {
+    ROAR_WARN("check_listen(void): Protocol %s(%i) is still unknown. Deleting listen socket.", protoname, g_listen[i].proto);
+    roar_vio_close(&(g_listen[i].sock));
+#ifdef ROAR_HAVE_UNIX
+    if ( server[i] != NULL )
+     if ( server[i][0] == '/' )
+      unlink(server[i]);
+#endif
+    g_listen[i].used = 0;
+    server[i] = NULL;
+   }
+  }
+ }
+
+ return 0;
+}
 #endif
 
@@ -2400 +2445 @@
  }
 
+ if ( check_listen() == -1 ) {
+  ROAR_ERR("Can not check listen sockets. BAD.");
+  return 1;
+ }
 
  // we should handle this on microcontrollers, too.