Changeset 4653:fb6662ea5f57 in roaraudio for libroar/basic.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Support option to disable OpenSLP

File:

• libroar/basic.c (modified) (2 diffs)

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