X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fcore-publish-service.c;h=65dfe5d84e74cf60cafb80f59d7b65ba90bf6858;hb=0d787cfca3b6e2c0755a54ca732a85e15756aa57;hp=30210949699e74109612681926952489c61e4d9b;hpb=af548e38c2c282132ddac2a75a76218ff3be3175;p=catta diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index 3021094..65dfe5d 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -40,28 +41,44 @@ static char *name = NULL; static void create_services(AvahiServer *s); -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void *userdata) { +static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) { assert(s); assert(g == group); /* Called whenever the entry group state changes */ - if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) - /* The entry group has been established successfully */ - fprintf(stderr, "Service '%s' successfully established.\n", name); - - else if (state == AVAHI_ENTRY_GROUP_COLLISION) { - char *n; + switch (state) { + + case AVAHI_ENTRY_GROUP_ESTABLISHED: - /* A service name collision happened. Let's pick a new name */ - n = avahi_alternative_service_name(name); - avahi_free(name); - name = n; + /* The entry group has been established successfully */ + fprintf(stderr, "Service '%s' successfully established.\n", name); + break; - fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); + case AVAHI_ENTRY_GROUP_COLLISION: { + char *n; + + /* A service name collision happened. Let's pick a new name */ + n = avahi_alternative_service_name(name); + avahi_free(name); + name = n; + + fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); + + /* And recreate the services */ + create_services(s); + break; + } + + case AVAHI_ENTRY_GROUP_FAILURE : - /* And recreate the services */ - create_services(s); + /* Some kind of failure happened while we were registering our services */ + avahi_simple_poll_quit(simple_poll); + break; + + case AVAHI_ENTRY_GROUP_UNCOMMITED: + case AVAHI_ENTRY_GROUP_REGISTERING: + ; } } @@ -71,12 +88,11 @@ static void create_services(AvahiServer *s) { assert(s); /* If this is the first time we're called, let's create a new entry group */ - if (!group) { + if (!group) if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); goto fail; } - } fprintf(stderr, "Adding service '%s'\n", name); @@ -84,17 +100,23 @@ static void create_services(AvahiServer *s) { snprintf(r, sizeof(r), "random=%i", rand()); /* Add the service for IPP */ - if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { + if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); goto fail; } /* Add the same service for BSD LPR */ - if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { + if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); goto fail; } + /* Add an additional (hypothetic) subtype */ + if ((ret = avahi_server_add_service_subtype(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_printer._tcp", NULL, "_magic._sub._printer._tcp") < 0)) { + fprintf(stderr, "Failed to add subtype _magic._sub._printer._tcp: %s\n", avahi_strerror(ret)); + goto fail; + } + /* Tell the server to register the service */ if ((ret = avahi_s_entry_group_commit(group)) < 0) { fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); @@ -105,45 +127,65 @@ static void create_services(AvahiServer *s) { fail: avahi_simple_poll_quit(simple_poll); - return; } -static void server_callback(AvahiServer *s, AvahiServerState state, void * userdata) { +static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UNUSED void * userdata) { assert(s); /* Called whenever the server state changes */ - if (state == AVAHI_SERVER_RUNNING) - /* The serve has startup successfully and registered its host - * name on the network, so it's time to create our services */ - create_services(s); - - else if (state == AVAHI_SERVER_COLLISION) { - char *n; - int r; - - /* A host name collision happened. Let's pick a new name for the server */ - n = avahi_alternative_host_name(avahi_server_get_host_name(s)); - fprintf(stderr, "Host name collision, retrying with '%s'\n", n); - r = avahi_server_set_host_name(s, n); - avahi_free(n); + switch (state) { - if (r < 0) { - fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); + case AVAHI_SERVER_RUNNING: + /* The serve has startup successfully and registered its host + * name on the network, so it's time to create our services */ + + if (!group) + create_services(s); - avahi_simple_poll_quit(simple_poll); - return; + break; + + case AVAHI_SERVER_COLLISION: { + char *n; + int r; + + /* A host name collision happened. Let's pick a new name for the server */ + n = avahi_alternative_host_name(avahi_server_get_host_name(s)); + fprintf(stderr, "Host name collision, retrying with '%s'\n", n); + r = avahi_server_set_host_name(s, n); + avahi_free(n); + + if (r < 0) { + fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); + + avahi_simple_poll_quit(simple_poll); + return; + } + + /* 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; } - /* 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); + case AVAHI_SERVER_FAILURE: + + /* Terminate on failure */ + + fprintf(stderr, "Server failure: %s\n", avahi_strerror(avahi_server_errno(s))); + avahi_simple_poll_quit(simple_poll); + break; + + case AVAHI_SERVER_INVALID: + case AVAHI_SERVER_REGISTERING: + ; } } -int main(int argc, char*argv[]) { +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { AvahiServerConfig config; AvahiServer *server = NULL; int error; @@ -176,19 +218,15 @@ int main(int argc, char*argv[]) { fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); goto fail; } - + /* Run the main loop */ - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; + avahi_simple_poll_loop(simple_poll); ret = 0; fail: /* Cleanup things */ - if (group) - avahi_s_entry_group_free(group); if (server) avahi_server_free(server);