MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Avahi mDNS backend

Browse Source 
Fix Avahi polling:
 - use avahi_simple_poll_loop() in rend-avahi.c:rend_poll() instead
   of reinventing yet another type of wheel;
 - start RendezVous thread after daemonizing, so the thread actually
   runs after we've daemonized.

Also handle Avahi daemon restarts, as it's good practice and easy to do.

 ... And /that/, my friends, is how we do that ...
This commit is contained in:
Julien BLACHE 2009-04-02 13:22:23 +02:00
parent 464bd414a1
commit 1b98e3c036
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@ -469,6 +469,12 @@ int main(int argc, char *argv[]) {
runas = conf_alloc_string("general","runas","nobody"); runas = conf_alloc_string("general","runas","nobody");
if(!os_init(config.foreground,runas)) {
DPRINTF(E_LOG,L_MAIN,"Could not initialize server\n");
os_deinit();
exit(EXIT_FAILURE);
}
if(config.use_mdns) { if(config.use_mdns) {
DPRINTF(E_LOG,L_MAIN,"Starting rendezvous daemon\n"); DPRINTF(E_LOG,L_MAIN,"Starting rendezvous daemon\n");
if(rend_init(runas)) { if(rend_init(runas)) {
@ -477,12 +483,6 @@ int main(int argc, char *argv[]) {
} }
} }
if(!os_init(config.foreground,runas)) {
DPRINTF(E_LOG,L_MAIN,"Could not initialize server\n");
os_deinit();
exit(EXIT_FAILURE);
}
free(runas); free(runas);
#ifdef UPNP #ifdef UPNP

45
src/rend-avahi.c
View File

@ -93,15 +93,9 @@ static int _rend_avahi_add_group_entry(char *name, char *type, int port, char *i
} }
static void *rend_poll(void *arg) { static void *rend_poll(void *arg) {
int ret; avahi_simple_poll_loop(simple_poll);
while((ret = avahi_simple_poll_iterate(simple_poll,-1)) == 0);
if(ret < 0) { DPRINTF(E_DBG,L_REND,"Avahi poll thread exited\n");
DPRINTF(E_WARN,L_REND,"Avahi poll thread quit iwth error: %s\n",
avahi_strerror(avahi_client_errno(mdns_client)));
} else {
DPRINTF(E_DBG,L_REND,"Avahi poll thread quit\n");
}
return NULL; return NULL;
} }
@ -109,6 +103,9 @@ static void *rend_poll(void *arg) {
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) { static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) {
// assert(g == mdns_group); // assert(g == mdns_group);
if (!g || (g != mdns_group))
return;
switch (state) { switch (state) {
case AVAHI_ENTRY_GROUP_ESTABLISHED: case AVAHI_ENTRY_GROUP_ESTABLISHED:
DPRINTF(E_DBG, L_REND, "Successfully added mdns services\n"); DPRINTF(E_DBG, L_REND, "Successfully added mdns services\n");
@ -186,7 +183,7 @@ int _rend_avahi_create_services(void) {
unsigned char *key,*nextkey; unsigned char *key,*nextkey;
unsigned char *newtxt; unsigned char *newtxt;
DPRINTF(E_DBG,L_REND,"Creting service group\n"); DPRINTF(E_DBG,L_REND,"Creating service group\n");
if(!rend_avahi_entries.next) { if(!rend_avahi_entries.next) {
DPRINTF(E_DBG,L_REND,"No entries yet... skipping service create\n"); DPRINTF(E_DBG,L_REND,"No entries yet... skipping service create\n");
@ -262,6 +259,8 @@ int _rend_avahi_create_services(void) {
} }
static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) { static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
int error;
assert(c); assert(c);
switch(state) { switch(state) {
case AVAHI_CLIENT_S_RUNNING: case AVAHI_CLIENT_S_RUNNING:
@ -276,7 +275,29 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
break; break;
case AVAHI_CLIENT_FAILURE: case AVAHI_CLIENT_FAILURE:
DPRINTF(E_LOG,L_REND,"Client failure\n"); DPRINTF(E_LOG,L_REND,"Client failure\n");
avahi_simple_poll_quit(simple_poll);
error = avahi_client_errno(c);
if (error == AVAHI_ERR_DISCONNECTED)
{
DPRINTF(E_LOG,L_REND,"Server disconnected, reconnecting\n");
avahi_client_free(mdns_client);
mdns_group = NULL;
mdns_client = avahi_client_new(avahi_simple_poll_get(simple_poll),
AVAHI_CLIENT_NO_FAIL,
client_callback,NULL,&error);
if (mdns_client == NULL)
{
DPRINTF(E_LOG,L_REND,"Failed to create new Avahi client: %s\n", avahi_strerror(error));
avahi_simple_poll_quit(simple_poll);
}
}
else
{
DPRINTF(E_LOG,L_REND,"Client failure: %s\n", avahi_strerror(error));
avahi_simple_poll_quit(simple_poll);
}
break; break;
case AVAHI_CLIENT_S_REGISTERING: case AVAHI_CLIENT_S_REGISTERING:
DPRINTF(E_LOG,L_REND,"Client registering\n"); DPRINTF(E_LOG,L_REND,"Client registering\n");
@ -284,6 +305,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
avahi_entry_group_reset(mdns_group); avahi_entry_group_reset(mdns_group);
break; break;
case AVAHI_CLIENT_CONNECTING: case AVAHI_CLIENT_CONNECTING:
DPRINTF(E_LOG,L_REND,"Client connecting\n");
break; break;
} }
} }
@ -317,7 +339,8 @@ int rend_init(char *user) {
*/ */
if (!(mdns_client = avahi_client_new(avahi_simple_poll_get(simple_poll), if (!(mdns_client = avahi_client_new(avahi_simple_poll_get(simple_poll),
0,client_callback,NULL,&error))) { AVAHI_CLIENT_NO_FAIL,
client_callback,NULL,&error))) {
DPRINTF(E_WARN, L_REND, "avahi_client_new: Error in avahi: %s\n", DPRINTF(E_WARN, L_REND, "avahi_client_new: Error in avahi: %s\n",
avahi_strerror(avahi_client_errno(mdns_client))); avahi_strerror(avahi_client_errno(mdns_client)));
avahi_simple_poll_free(simple_poll); avahi_simple_poll_free(simple_poll);