Changeset 5373:8da157c10483 in roaraudio for libroar/enumdev.c

Timestamp:

12/21/11 19:02:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Updated config structure
• Added a flag to ask libroar to only connect to local servers
• Added a way to override fork()
• added support for +internal

File:

• libroar/enumdev.c (modified) (4 diffs)

libroar/enumdev.c

@@ -105 +105 @@
  (void)flags, (void)dir, (void)socktype;
 
- if ( maxlen < 11 )
-  return -1;
-
- new = roar_libroar_get_server();
- _add(new);
-
- new = getenv("ROAR_SERVER");
- _add(new);
+ if ( maxlen < 12 )
+  return -1;
+
+ // We can not yet test if those servers are local or reachable via network so
+ // we skip them for now.
+ // TODO: test those servers.
+ if ( !(flags & ROAR_ENUM_FLAG_LOCALONLY) ) {
+  new = roar_libroar_get_server();
+  _add(new);
+
+  new = getenv("ROAR_SERVER");
+  _add(new);
 
 #ifdef ROAR_HAVE_LIBX11
- if ( (x11con = roar_x11_connect(NULL)) != NULL ) {
-  new = roar_x11_get_prop(x11con, "ROAR_SERVER");
-  _add(new);
-  roar_x11_disconnect(x11con);
- }
-#endif
-
- new = getenv("SSH_CLIENT");
- if ( new == NULL )
-  new = getenv("SSH_CONNECTION");
-
- if ( new != NULL ) {
-  ssh_buf = roar_mm_strdup(new);
-  if ( ssh_buf != NULL ) {
-   tmp = strstr(ssh_buf, " ");
-   if ( tmp == NULL ) {
-    // invalid format.
-    roar_mm_free(ssh_buf);
-   } else {
-    *tmp = 0;
-    servers[ret++] = ssh_buf;
+  if ( (x11con = roar_x11_connect(NULL)) != NULL ) {
+   new = roar_x11_get_prop(x11con, "ROAR_SERVER");
+   _add(new);
+   roar_x11_disconnect(x11con);
+  }
+#endif
+
+  new = getenv("SSH_CLIENT");
+  if ( new == NULL )
+   new = getenv("SSH_CONNECTION");
+
+  if ( new != NULL ) {
+   ssh_buf = roar_mm_strdup(new);
+   if ( ssh_buf != NULL ) {
+    tmp = strstr(ssh_buf, " ");
+    if ( tmp == NULL ) {
+     // invalid format.
+     roar_mm_free(ssh_buf);
+    } else {
+     *tmp = 0;
+     servers[ret++] = ssh_buf;
+    }
    }
   }
- }
 
 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER)
- if ( (i = readlink("/etc/roarserver", buf, sizeof(buf)-1)) != -1 ) {
-   buf[i] = 0;
-   _add(buf);
- }
-#endif
+  if ( (i = readlink("/etc/roarserver", buf, sizeof(buf)-1)) != -1 ) {
+    buf[i] = 0;
+    _add(buf);
+  }
+#endif
+ }
 
  if ( (new = roar_env_get_home(0)) != NULL ) {
@@ -158 +163 @@
  servers[ret++] = roar_mm_strdup("+abstract");
  servers[ret++] = roar_mm_strdup("/tmp/muroard");
+ servers[ret++] = roar_mm_strdup("/dev/roar");
 
  return ret;
@@ -290 +296 @@
 
 static struct locmed _libroar_locmod[] = {
- {ROAR_ENUM_FLAG_NONBLOCK|ROAR_ENUM_FLAG_HARDNONBLOCK, _esl_defaults},
- {ROAR_ENUM_FLAG_NONE,                                 _esl_slp},
+ {ROAR_ENUM_FLAG_NONBLOCK|ROAR_ENUM_FLAG_HARDNONBLOCK|ROAR_ENUM_FLAG_LOCALONLY, _esl_defaults},
+ {ROAR_ENUM_FLAG_NONE,                                                          _esl_slp},
 #ifdef ROAR_HAVE_FOPEN
- {ROAR_ENUM_FLAG_NONBLOCK,                             _esl_neighbours}
+ {ROAR_ENUM_FLAG_NONBLOCK,                                                      _esl_neighbours}
 #endif
 };
 
 struct roar_server * roar_enum_servers(int flags, int dir, int socktype) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
  struct roar_server * ret = NULL;
  struct roar_server * c;
@@ -304 +311 @@
  size_t i, cp, unic;
  ssize_t r;
- int testflags = flags;
+ int testflags;
  int is_uniq;
+
+ flags     |= config->serverflags;
+ testflags  = flags;
 
  if ( flags & ROAR_ENUM_FLAG_HARDNONBLOCK )