Changeset 4653:fb6662ea5f57 in roaraudio

Timestamp:

12/09/10 19:43:50 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Support option to disable OpenSLP

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/config.h (modified) (1 diff)
• libroar/basic.c (modified) (2 diffs)
• libroar/config.c (modified) (1 diff)

ChangeLog

@@ -17 +17 @@
         * Fixed a FTBFS error with clang (Closes: #86)
         * Corrected some typos in manpages (pr1)
+        * Support option to disable OpenSLP (pr1)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

include/libroar/config.h

@@ -42 +42 @@
 #define ROAR_LIBROAR_CONFIG_WAS_NONE        0x00
 #define ROAR_LIBROAR_CONFIG_WAS_USE_EXECED  0x01
+#define ROAR_LIBROAR_CONFIG_WAS_NO_SLP      0x02
 
 #define ROAR_LIBROAR_CONFIG_PSET_Q          0x0001

libroar/basic.c

@@ -37 +37 @@
 
 int roar_connect_raw (char * server) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
  char user_sock[80];
  char * roar_server;
@@ -136 +137 @@
 
 #ifdef ROAR_HAVE_LIBSLP
- if ( (server = roar_slp_find_roard(0)) != NULL )
-  if ( (fh = roar_connect_raw(server)) != -1 )
-   return fh;
-
- /* in case we can not connect to the server given this may be a cache problem,
-    we do a new lookup with the cache disabled in this case                     */
- ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache");
- if ( (server = roar_slp_find_roard(1)) != NULL )
-  if ( (fh = roar_connect_raw(server)) != -1 )
-   return fh;
+ if ( !(config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_NO_SLP) ) {
+  if ( (server = roar_slp_find_roard(0)) != NULL )
+   if ( (fh = roar_connect_raw(server)) != -1 )
+    return fh;
+
+  /* in case we can not connect to the server given this may be a cache problem,
+     we do a new lookup with the cache disabled in this case                     */
+  ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache");
+  if ( (server = roar_slp_find_roard(1)) != NULL )
+   if ( (fh = roar_connect_raw(server)) != -1 )
+    return fh;
+ }
 #endif
 

libroar/config.c

@@ -220 +220 @@
    if ( !strcmp(v, "use-execed") ) {
     config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_USE_EXECED;
+   } else if ( !strcmp(v, "no-slp") ) {
+    config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_NO_SLP;
    } else {
     ROAR_WARN("roar_libroar_config_parse(*): Unknown workaround option: %s", v);