Changeset 4777:5a250aafb5ba in roaraudio

Timestamp:

03/10/11 16:11:03 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for use of DECnet and ARP neighbour tables to locate servers (enumdev only at the moment).

Files:

• ChangeLog (modified) (1 diff)
• libroar/enumdev.c (modified) (6 diffs)

ChangeLog

@@ -9 +9 @@
         * Added IPv6 support
         * Updated Debian init script (See: DEB#613772)
+        * Added support for use of DECnet and ARP neighbour tables to locate servers
+          (enumdev only at the moment) (pr1)
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

libroar/enumdev.c

@@ -41 +41 @@
  struct roar_connection con;
  struct roar_server_info * info;
+ int checked = 0;
 
  if ( c->server == NULL )
@@ -47 +48 @@
  if ( flags & ROAR_ENUM_FLAG_NONBLOCK )
   return 0;
+
+ ROAR_DBG("_test_server(c=%p{.server='%s', ...}, flags=0x%.4X) = ?", c, c->server, flags);
 
  if ( roar_connect(&con, (char*)c->server) == -1 )
@@ -54 +57 @@
   info = roar_server_info(&con);
   if ( info != NULL ) {
+   checked = 1;
    if ( info->location != NULL )
     c->location = roar_mm_strdup(info->location);
@@ -61 +65 @@
 
    roar_server_info_free(info);
+  }
+ }
+
+ // make sure we get at least a NOOP from the server to detect protocol mismatch.
+ if ( !checked ) {
+  if ( roar_noop(&con) != 0 ) {
+   roar_disconnect(&con);
+   return -1;
   }
  }
@@ -162 +174 @@
 }
 
+static ssize_t _esl_neighbours(int flags, int dir, int socktype, char ** servers, size_t maxlen) {
+ ssize_t ret = 0;
+ char buf[1024];
+ FILE * inp;
+ size_t i;
+ char * delm;
+ const struct {
+  const char * file;
+  const char * suffix;
+  const size_t skip;
+ } *f, files[] = {
+#ifdef ROAR_PROC_NET_DECNET_NEIGH
+  {ROAR_PROC_NET_DECNET_NEIGH, "::", 1},
+#endif
+#ifdef ROAR_PROC_NET_ARP
+  {ROAR_PROC_NET_ARP, NULL, 1},
+#endif
+  {NULL, NULL, 0}
+ };
+
+ for (f = &(files[0]); f->file != NULL; f++) {
+  if ( (inp = fopen(f->file, "r")) == NULL )
+   continue;
+
+  for (i = 0; i < f->skip; i++) {
+   if ( fgets(buf, sizeof(buf), inp) == NULL ) {
+    // bad error...
+    fclose(inp);
+    return ret;
+   }
+  }
+
+  while (ret < (ssize_t)maxlen && fgets(buf, sizeof(buf), inp) != NULL) {
+   // skip comments and empty lions
+   if ( buf[0] == '#' || buf[0] == '\0' )
+    continue;
+
+   // ensure we have a tailing \0.
+   buf[sizeof(buf)-1] = 0;
+
+   delm = strstr(buf, " ");
+   if ( delm == NULL )
+    delm = strstr(buf, "\t");
+
+   // does it look like a correctly formated lion?
+   // we may remove this check or relax it later.
+   if ( delm == NULL )
+    continue;
+
+   *delm = 0;
+
+   if ( f->suffix != NULL ) {
+    if ( (strlen(buf) + strlen(f->suffix) + 1) > sizeof(buf) )
+     continue;
+
+    strcat(buf, f->suffix);
+   }
+
+   // work around a bug in Linux kernel which always reports node 0.2 to be up.
+   if ( !strcmp(buf, "0.2::") )
+    continue;
+
+   _add(buf);
+  }
+
+  fclose(inp);
+  if ( ret == (ssize_t)maxlen )
+   break;
+ }
+
+ return ret;
+}
+
 struct locmed {
  int supflags;
@@ -169 +254 @@
 static struct locmed _libroar_locmod[] = {
  {ROAR_ENUM_FLAG_NONBLOCK|ROAR_ENUM_FLAG_HARDNONBLOCK, _esl_defaults},
- {ROAR_ENUM_FLAG_NONE,                                 _esl_slp}
+ {ROAR_ENUM_FLAG_NONE,                                 _esl_slp},
+ {ROAR_ENUM_FLAG_NONBLOCK,                             _esl_neighbours}
 };