mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix handling of Avahi server restart.

merge-requests/1/head
Julien BLACHE 2009-02-18 13:19:51 +00:00
rodzic 6733db0ec1
commit 25818023c6
2 zmienionych plików z 12 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ChangeLog
Wyświetl plik

@ -1,6 +1,8 @@
2009-02-18 Julien Blache <jb@jblache.org>
* backend/net.c: do not lock the Avahi thread before stopping
it. It looks like it's no longer necessary to do so.
* frontend/saned.c: fix handling of Avahi server restart so it
actually works.
2009-02-14 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* configure.in, doc/Makefile.am, frontend/Makefile.am,

11
frontend/saned.c
Wyświetl plik

@ -2519,26 +2519,35 @@ saned_avahi_callback (AvahiClient *c, AvahiClientState state, void *userdata)
switch (state)
{
case AVAHI_CLIENT_CONNECTING:
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_CLIENT_CONNECTING\n");
break;
case AVAHI_CLIENT_S_RUNNING:
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_CLIENT_S_RUNNING\n");
saned_create_avahi_services (c);
break;
case AVAHI_CLIENT_S_COLLISION:
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_CLIENT_S_COLLISION\n");
case AVAHI_CLIENT_S_REGISTERING:
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_CLIENT_S_REGISTERING\n");
if (avahi_group)
avahi_entry_group_reset (avahi_group);
break;
case AVAHI_CLIENT_FAILURE:
error = avahi_client_errno (c);
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_CLIENT_FAILURE\n");
error = avahi_client_errno (c);
if (error == AVAHI_ERR_DISCONNECTED)
{
DBG (DBG_INFO, "saned_avahi_callback: AVAHI_ERR_DISCONNECTED\n");
/* Server disappeared - try to reconnect */
avahi_client_free (avahi_client);
avahi_client = NULL;
avahi_group = NULL;
avahi_client = avahi_client_new (avahi_simple_poll_get (avahi_poll), AVAHI_CLIENT_NO_FAIL, saned_avahi_callback, NULL, &error);
if (avahi_client == NULL)