Changeset 1994:31e1d8c4f3c1 in roaraudio

Timestamp:

06/15/09 16:39:48 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

we now support to deregister :)

File:

• roard/roard.c (modified) (2 diffs)

roard/roard.c

@@ -383 +383 @@
   sn = sockname;
 
- snprintf(addr, sizeof(addr), "service:mixer.fellig:roar://%s", sockname);
+ snprintf(addr, sizeof(addr), "service:mixer.fellig:roar://%s", sn);
 
  err = SLPOpen("en", SLP_FALSE, &hslp);
@@ -402 +402 @@
                register_slp_callback,
                &callbackerr);
-
-  /* err may contain an error code that occurred as the slp library    */
-  /* _prepared_ to make the call.                                     */
-  if ( (err != SLP_OK) || (callbackerr != SLP_OK) ) {
-   ROAR_ERR("Error registering service with slp: Error #%i", err);
-   return -1;
-  }
-
-  /* callbackerr may contain an error code (that was assigned through */
-  /* the callback cookie) that occurred as slp packets were sent on    */
-  /* the wire */
-  if (callbackerr != SLP_OK) {
-   ROAR_ERR("Error registering service with slp: Error #%i", callbackerr);
-   return -1;
-  }
+  regged = 1;
  } else if ( unreg && regged ) {
+  err = SLPDereg(hslp, addr, register_slp_callback, &callbackerr);
+  regged = 0;
+ } else {
+  SLPClose(hslp);
+  return -1;
+ }
+
+ /* err may contain an error code that occurred as the slp library    */
+ /* _prepared_ to make the call.                                     */
+ if ( err != SLP_OK ) {
+  ROAR_ERR("Error (de)registering service with slp: Error #%i", err);
+  return -1;
+ }
+
+ /* callbackerr may contain an error code (that was assigned through */
+ /* the callback cookie) that occurred as slp packets were sent on    */
+ /* the wire */
+ if (callbackerr != SLP_OK) {
+  ROAR_ERR("Error (de)registering service with slp: Error #%i", callbackerr);
+  return -1;
  }