MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 07:05:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update rend-howl to run with howl 0.9.6

Browse Source
This commit is contained in:
Ron Pedde 2004-11-27 03:13:35 +00:00
parent f53a5ce363
commit 08bef94c48
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/rend-howl.c
View File

@ -29,15 +29,14 @@
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <rendezvous/rendezvous.h> #include <howl.h>
#include <salt/log.h>
#include <pthread.h> #include <pthread.h>
#include "err.h" #include "err.h"
#include "rend-unix.h" #include "rend-unix.h"
pthread_t rend_tid; pthread_t rend_tid;
sw_rendezvous rend_handle; sw_discovery rend_handle;
/* Forwards */ /* Forwards */
void *rend_pipe_monitor(void* arg); void *rend_pipe_monitor(void* arg);
@ -48,10 +47,9 @@ void rend_callback(void);
* *
* Callback function for mDNS stuff * Callback function for mDNS stuff
*/ */
static sw_result rend_howl_reply(sw_rendezvous_publish_handler handler, static sw_result rend_howl_reply(sw_discovery discovery,
sw_rendezvous rendezvous, sw_discovery_publish_status status,
sw_rendezvous_publish_status status, sw_discovery_oid oid,
sw_rendezvous_publish_id id,
sw_opaque extra) { sw_opaque extra) {
static sw_string status_text[] = { static sw_string status_text[] = {
"started", "started",
@ -76,8 +74,8 @@ int rend_private_init(char *user) {
DPRINTF(E_DBG,L_REND,"Starting rendezvous services\n"); DPRINTF(E_DBG,L_REND,"Starting rendezvous services\n");
signal(SIGHUP, SIG_IGN); // SIGHUP might happen from a request to reload the daap server signal(SIGHUP, SIG_IGN); // SIGHUP might happen from a request to reload the daap server
if(sw_rendezvous_init(&rend_handle) != SW_OKAY) { if(sw_discovery_init(&rend_handle) != SW_OKAY) {
DPRINTF(E_WARN,L_REND,"Error initializing rendezvous\n"); DPRINTF(E_WARN,L_REND,"Error initializing howl\n");
errno=EINVAL; errno=EINVAL;
return -1; return -1;
} }
@ -95,7 +93,7 @@ int rend_private_init(char *user) {
DPRINTF(E_DBG,L_REND,"Entering runloop\n"); DPRINTF(E_DBG,L_REND,"Entering runloop\n");
sw_rendezvous_run(rend_handle); sw_discovery_run(rend_handle);
DPRINTF(E_DBG,L_REND,"Exiting runloop\n"); DPRINTF(E_DBG,L_REND,"Exiting runloop\n");
@ -138,7 +136,7 @@ void *rend_pipe_monitor(void* arg) {
*/ */
void rend_callback(void) { void rend_callback(void) {
REND_MESSAGE msg; REND_MESSAGE msg;
sw_rendezvous_publish_id rend_id; sw_discovery_oid rend_oid;
sw_result result; sw_result result;
/* here, we've seen the message, now we have to process it */ /* here, we've seen the message, now we have to process it */
@ -151,8 +149,18 @@ void rend_callback(void) {
switch(msg.cmd) { switch(msg.cmd) {
case REND_MSG_TYPE_REGISTER: case REND_MSG_TYPE_REGISTER:
DPRINTF(E_DBG,L_REND,"Registering %s.%s (%d)\n",msg.type,msg.name,msg.port); DPRINTF(E_DBG,L_REND,"Registering %s.%s (%d)\n",msg.type,msg.name,msg.port);
if((result=sw_rendezvous_publish(rend_handle,msg.name,msg.type,NULL,NULL,msg.port,NULL,0, if((result=sw_discovery_publish(rend_handle,
NULL,rend_howl_reply,NULL,&rend_id)) != SW_OKAY) { 0, /* interface handle */
msg.name,
msg.type,
NULL, /* domain */
NULL, /* host */
msg.port,
NULL, /* text record */
0, /* text record length */
rend_howl_reply,
NULL,
&rend_oid)) != SW_OKAY) {
DPRINTF(E_WARN,L_REND,"Error registering name\n"); DPRINTF(E_WARN,L_REND,"Error registering name\n");
rend_send_response(-1); rend_send_response(-1);
} else { } else {
@ -167,7 +175,7 @@ void rend_callback(void) {
DPRINTF(E_DBG,L_REND,"Stopping mDNS\n"); DPRINTF(E_DBG,L_REND,"Stopping mDNS\n");
rend_send_response(0); rend_send_response(0);
//sw_rendezvous_stop_publish(rend_handle); //sw_rendezvous_stop_publish(rend_handle);
sw_rendezvous_fina(rend_handle); sw_discovery_fina(rend_handle);
break; break;
case REND_MSG_TYPE_STATUS: case REND_MSG_TYPE_STATUS:
DPRINTF(E_DBG,L_REND,"Status inquiry -- returning 0\n"); DPRINTF(E_DBG,L_REND,"Status inquiry -- returning 0\n");