Changeset 2007:4eb7199520fb in roaraudio for libroar/slp.c

Timestamp:

06/15/09 20:01:29 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got client slp working, need cleanup

File:

• libroar/slp.c (modified) (7 diffs)

libroar/slp.c

@@ -42 +42 @@
  struct roar_slp_cookie * self = cookie;
 
+ ROAR_WARN("roar_slp_url_callback(*) = ?");
+
  if (errcode == SLP_OK || errcode == SLP_LAST_CALL) {
-  *(SLPError*)cookie = SLP_OK;
+  self->callbackerr = SLP_OK;
+
+  if ( srvurl == NULL ) /* hu? */
+   return SLP_TRUE;
 
   if ( self->matchcount == ROAR_SLP_MAX_MATCHES )
    return SLP_FALSE;
 
-  strncpy(self->match[self->matchcount++].url, srvurl, ROAR_SLP_MAX_URL_LEN);
+  strncpy(self->match[self->matchcount].url, srvurl, ROAR_SLP_MAX_URL_LEN);
 
   self->match[self->matchcount].url[ROAR_SLP_MAX_URL_LEN-1] = 0;
+
+  self->matchcount++;
  } else {
-  *(SLPError*)cookie = errcode;
+  self->callbackerr = errcode;
  }
+
 
  /* return SLP_TRUE because we want to be called again */
@@ -64 +72 @@
 #ifdef ROAR_HAVE_LIBSLP
  SLPError err;
- SLPError callbackerr;
  SLPHandle hslp;
+
+ ROAR_WARN("roar_slp_search(cookie=%p, type='%s') = ?", cookie, type);
 
  if ( cookie->search != NULL ) /* currently only non-search filter mode supported */
@@ -75 +84 @@
  }
 
+ ROAR_WARN("roar_slp_search(*) = ?");
+
  err = SLPFindSrvs(hslp,
                    type,
@@ -80 +91 @@
                    0,                    /* no attr filter        */
                    roar_slp_url_callback,
-                   &callbackerr);
+                   cookie);
+
+ ROAR_WARN("roar_slp_search(*) = ?");
 
   /* err may contain an error code that occurred as the slp library    */
   /* _prepared_ to make the call.                                     */
-  if(err != SLP_OK) {
+  if (err != SLP_OK) {
    return -1;
   }
@@ -91 +104 @@
  /* the callback cookie) that occurred as slp packets were sent on    */
  /* the wire */
- if (callbackerr != SLP_OK) {
+ if (cookie->callbackerr != SLP_OK) {
   return -1;
  }
 
+ ROAR_WARN("roar_slp_search(*) = ?");
+
  /* Now that we're done using slp, close the slp handle */
- SLPClose(hslp);
+ //SLPClose(hslp);
 
- return -1;
+ ROAR_WARN("roar_slp_search(*) = ?");
+
+ return 0;
 #else
  return -1;
@@ -127 +144 @@
 int    roar_slp_find_roard_r (char * addr, size_t len) {
  struct roar_slp_cookie cookie;
+ int offset = 0;
+
+ ROAR_WARN("roar_slp_find_roard_r(addr=%p, len=%i) = ?", addr, len);
 
  if ( addr == NULL || len == 0 )
@@ -133 +153 @@
  *addr = 0; // just in case...
 
+ ROAR_WARN("roar_slp_find_roard_r(*) = ?");
+
  if ( roar_slp_cookie_init(&cookie, NULL) == -1 )
   return -1;
+
+ ROAR_WARN("roar_slp_find_roard_r(*) = ?");
 
  if ( roar_slp_search(&cookie, "service:mixer.fellig:roar") == -1 )
   return -1;
 
+ ROAR_WARN("roar_slp_find_roard_r(*) = ?");
+
  if ( cookie.matchcount == 0 )
   return -1;
 
- strncpy(addr, cookie.match[0].url, len);
+ ROAR_WARN("roar_slp_find_roard_r(*) = ?");
+
+ if ( !strncmp(cookie.match[0].url, "service:mixer.fellig:roar://", 28) )
+  offset = 28;
+
+ ROAR_WARN("roar_slp_find_roard_r(*): url='%s'", cookie.match[0].url);
+
+ strncpy(addr, &(cookie.match[0].url[offset]), len);
  addr[len-1] = 0; // also just in case.
+
+ ROAR_WARN("roar_slp_find_roard_r(*): addr='%s'", addr);
 
  return 0;