Changeset 2014:6646d9a2113a in roaraudio

Timestamp:

06/16/09 13:26:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to force non caching on SLP lookup

Files:

• include/libroar/roarslp.h (modified) (1 diff)
• libroar/basic.c (modified) (1 diff)
• libroar/slp.c (modified) (3 diffs)

include/libroar/roarslp.h

@@ -74 +74 @@
 int roar_slp_cookie_init     (struct roar_slp_cookie * cookie, struct roar_slp_search * search);
 
-char * roar_slp_find_roard   (void);
-int    roar_slp_find_roard_r (char * addr, size_t len);
+char * roar_slp_find_roard   (int nocache);
+int    roar_slp_find_roard_r (char * addr, size_t len, int nocache);
 
 #endif

libroar/basic.c

@@ -107 +107 @@
 
 #ifdef ROAR_HAVE_LIBSLP
- if ( (server = roar_slp_find_roard()) != NULL ) {
-  return roar_connect_raw(server);
- } else {
-  return -1;
- }
-#endif
+ 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
+
+ return -1;
 
  } else {

libroar/slp.c

@@ -136 +136 @@
 
 
-char * roar_slp_find_roard   (void) {
+char * roar_slp_find_roard   (int nocache) {
  static char addr[80];
 
- if ( roar_slp_find_roard_r(addr, 80) == -1 )
+ if ( roar_slp_find_roard_r(addr, 80, nocache) == -1 )
   return NULL;
 
@@ -145 +145 @@
 }
 
-int    roar_slp_find_roard_r (char * addr, size_t len) {
+int    roar_slp_find_roard_r (char * addr, size_t len, int nocache) {
  static struct roar_slp_match    cache  = {"", 0};
         struct roar_slp_cookie   cookie;
@@ -158 +158 @@
  *addr = 0; // just in case...
 
- if ( cache.tod < time(NULL) ) {
+ if ( nocache || cache.tod < time(NULL) ) {
+  if ( nocache ) {
+   ROAR_WARN("roar_slp_find_roard_r(*): forced ignoring of cache, doing a new lookup.");
+  }
   ROAR_WARN("roar_slp_find_roard_r(*): cache too old, searching for a new server...");
   ROAR_DBG("roar_slp_find_roard_r(*) = ?");