Changeset 1993:735317524c03 in roaraudio

Timestamp:

06/15/09 16:25:50 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to *REGISTER* to SLP, need to write code to deregister ;)

Location:

roard

Files:

• Makefile (modified) (1 diff)
• include/roard.h (modified) (1 diff)
• roard.c (modified) (6 diffs)

roard/Makefile

@@ -16 +16 @@
 CODECLIBS = $(lib_vorbisfile) $(lib_vorbisenc) $(lib_vorbis) $(lib_celt) $(lib_fishsound) $(lib_speex) $(lib_speexdsp)
 CONTLIBS  = $(lib_oggz) $(lib_sndfile) $(lib_ogg)
-LIBS      = -lroarlight -lroarmidi -lroardsp -lroar $(DRVLIBS) $(CODECLIBS) $(CONTLIBS) $(lib_m) $(NETLIBS)
+PROTOLIBS = -lslp
+LIBS      = -lroarlight -lroarmidi -lroardsp -lroar $(DRVLIBS) $(CODECLIBS) $(CONTLIBS) $(PROTOLIBS) $(lib_m) $(NETLIBS)
 
 all: ${TARGETS}

roard/include/roard.h

@@ -50 +50 @@
 #include <sys/time.h>
 #include <time.h>
+#endif
+
+#ifdef ROAR_HAVE_LIBSLP
+#include <slp.h>
 #endif
 

roard/roard.c

@@ -105 +105 @@
         " -b  --bind            - IP/Hostname to bind to\n"
         "     --sock            - Filename for UNIX Domain Socket\n"
+#ifdef ROAR_HAVE_LIBSLP
+        "     --slp             - Enable OpenSLP support\n"
+#endif
         " -G  GROUP             - Sets the group for the UNIX Domain Socket, (default: %s)\n"
         "                         You need the permittions to change the GID\n"
@@ -360 +363 @@
 }
 
+
+// SLP:
+void register_slp_callback(SLPHandle hslp, SLPError errcode, void * cookie) {
+ /* return the error code in the cookie */
+ *(SLPError*)cookie = errcode;
+}
+
+int register_slp (int unreg, char * sockname) {
+#ifdef ROAR_HAVE_LIBSLP
+ static int regged = 0;
+ static char * sn = NULL;
+ SLPError err;
+ SLPError callbackerr;
+ SLPHandle hslp;
+ char addr[1024];
+ char attr[1024] = "";
+
+ if ( sockname != NULL )
+  sn = sockname;
+
+ snprintf(addr, sizeof(addr), "service:mixer.fellig:roar://%s", sockname);
+
+ err = SLPOpen("en", SLP_FALSE, &hslp);
+
+ if (err != SLP_OK) {
+  ROAR_ERR("Error opening slp handle: Error #%i", err);
+  return -1;
+ }
+
+ if (!unreg) {
+  /* Register a service with SLP */
+  err = SLPReg(hslp,
+               addr,
+               SLP_LIFETIME_MAXIMUM,
+               0,
+               attr,
+               SLP_TRUE,
+               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;
+  }
+ } else if ( unreg && regged ) {
+ }
+
+ SLPClose(hslp);
+ return 0;
+#else
+ return -1;
+#endif
+}
+
+
+// MAIN:
+
 #ifdef ROAR_HAVE_MAIN_ARGS
 int main (int argc, char * argv[]) {
@@ -405 +475 @@
  int    sock_type = ROAR_SOCKET_TYPE_UNKNOWN;
 #endif
+#ifdef ROAR_HAVE_LIBSLP
+ int    reg_slp   = 0;
+#endif
 #ifdef ROAR_HAVE_CHROOT
  char * chrootdir = NULL;
@@ -686 +759 @@
     return 1;
 #endif
+#endif
+
+  } else if ( strcmp(k, "--slp") == 0 ) {
+#ifdef ROAR_HAVE_LIBSLP
+   reg_slp = 1;
+#else
+    ROAR_ERR("No OpenSLP support compiled in!");
+    return 1;
 #endif
 
@@ -929 +1010 @@
 #endif
 
+ // Register with OpenSLP:
+ if ( reg_slp ) {
+  register_slp(0, server);
+ }
+
  // start main loop...
  main_loop(drvid, drvinst, &sa, sysclocksync);
@@ -941 +1027 @@
 
 void cleanup_listen_socket (int terminate) {
+ // Deregister from SLP:
+ register_slp(1, NULL);
 
 #ifdef ROAR_SUPPORT_LISTEN