diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/client-publish-service.c | 24 | ||||
-rw-r--r-- | examples/core-publish-service.c | 12 |
2 files changed, 26 insertions, 10 deletions
diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c index 96afaf3..66a59de 100644 --- a/examples/client-publish-service.c +++ b/examples/client-publish-service.c @@ -71,6 +71,8 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, case AVAHI_ENTRY_GROUP_FAILURE : + fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g)))); + /* Some kind of failure happened while we were registering our services */ avahi_simple_poll_quit(simple_poll); break; @@ -142,24 +144,32 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN create_services(c); break; + case AVAHI_CLIENT_FAILURE: + + fprintf(stderr, "Client failure: %s\n", avahi_strerror(avahi_client_errno(c))); + avahi_simple_poll_quit(simple_poll); + + break; + case AVAHI_CLIENT_S_COLLISION: /* Let's drop our registered services. When the server is back * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. */ - if (group) - avahi_entry_group_reset(group); - break; - case AVAHI_CLIENT_FAILURE: + case AVAHI_CLIENT_S_REGISTERING: + + /* The server records are now being established. This + * might be caused by a host name change. We need to wait + * for our own records to register until the host name is + * properly esatblished. */ - fprintf(stderr, "Client failure: %s\n", avahi_strerror(avahi_client_errno(c))); - avahi_simple_poll_quit(simple_poll); + if (group) + avahi_entry_group_reset(group); break; case AVAHI_CLIENT_CONNECTING: - case AVAHI_CLIENT_S_REGISTERING: ; } } diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index 65dfe5d..6370383 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -72,6 +72,8 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry case AVAHI_ENTRY_GROUP_FAILURE : + fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_server_errno(s))); + /* Some kind of failure happened while we were registering our services */ avahi_simple_poll_quit(simple_poll); break; @@ -162,14 +164,19 @@ static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UN return; } - /* Let's drop our registered services. When the server is back + } + + /* Fall through */ + + case AVAHI_SERVER_REGISTERING: + + /* Let's drop our registered services. When the server is back * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. */ if (group) avahi_s_entry_group_reset(group); break; - } case AVAHI_SERVER_FAILURE: @@ -180,7 +187,6 @@ static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UN break; case AVAHI_SERVER_INVALID: - case AVAHI_SERVER_REGISTERING: ; } } |