X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fclient-publish-service.c;h=94dcd1e9b060cb5bad69fd522af494666eeea6c3;hb=f16fb5b323ef49cec531a817a66c88503c32fc46;hp=c3f11added056dba099252a141b9055ad93fa3e2;hpb=424aefe8a431b79496672799dc4f4430fa935252;p=catta diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c index c3f11ad..94dcd1e 100644 --- a/examples/client-publish-service.c +++ b/examples/client-publish-service.c @@ -29,10 +29,13 @@ #include #include +#include + #include #include #include #include +#include static AvahiEntryGroup *group = NULL; static AvahiSimplePoll *simple_poll = NULL; @@ -40,27 +43,43 @@ static char *name = NULL; static void create_services(AvahiClient *c); -static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { - assert(g == group); +static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) { + assert(g == group || group == NULL); /* 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 : + /* The entry group has been established successfully */ + fprintf(stderr, "Service '%s' successfully established.\n", name); + break; - /* A service name collision happened. Let's pick a new name */ - n = avahi_alternative_service_name(name); - avahi_free(name); - name = n; + 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(avahi_entry_group_get_client(g)); + break; + } - fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); + case AVAHI_ENTRY_GROUP_FAILURE : - /* And recreate the services */ - create_services(avahi_entry_group_get_client(g)); + 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; + + case AVAHI_ENTRY_GROUP_UNCOMMITED: + case AVAHI_ENTRY_GROUP_REGISTERING: + ; } } @@ -70,15 +89,14 @@ static void create_services(AvahiClient *c) { assert(c); /* If this is the first time we're called, let's create a new entry group */ - if (!group) { + if (!group) if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) { fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(c))); goto fail; } - } fprintf(stderr, "Adding service '%s'\n", name); - + /* Create some random TXT data */ snprintf(r, sizeof(r), "random=%i", rand()); @@ -94,6 +112,12 @@ static void create_services(AvahiClient *c) { goto fail; } + /* Add an additional (hypothetic) subtype */ + if ((ret = avahi_entry_group_add_service_subtype(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_entry_group_commit(group)) < 0) { fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); @@ -104,37 +128,78 @@ static void create_services(AvahiClient *c) { fail: avahi_simple_poll_quit(simple_poll); - return; } -static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) { +static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) { assert(c); /* Called whenever the client or server state changes */ - if (state == AVAHI_CLIENT_S_RUNNING) - /* The serve has startup successfully and registered its host - * name on the network, so it's time to create our services */ - create_services(c); - - else if (state == 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. */ + switch (state) { + case AVAHI_CLIENT_S_RUNNING: + + /* The server has startup successfully and registered its host + * name on the network, so it's time to create our services */ + if (!group) + 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. */ + + 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. */ + + if (group) + avahi_entry_group_reset(group); + + break; + + case AVAHI_CLIENT_CONNECTING: + ; + } +} + +static void modify_callback(AVAHI_GCC_UNUSED AvahiTimeout *e, void *userdata) { + AvahiClient *client = userdata; + + fprintf(stderr, "Doing some weird modification\n"); + + avahi_free(name); + name = avahi_strdup("Modified MegaPrinter"); + + /* If the server is currently running, we need to remove our + * service and create it anew */ + if (avahi_client_get_state(client) == AVAHI_CLIENT_S_RUNNING) { + + /* Remove the old services */ if (group) avahi_entry_group_reset(group); - - } else if (state == AVAHI_CLIENT_DISCONNECTED) { - fprintf(stderr, "Server connection terminated.\n"); - avahi_simple_poll_quit(simple_poll); + /* And create them again with the new name */ + create_services(client); } } -int main(int argc, char*argv[]) { +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { AvahiClient *client = NULL; int error; int ret = 1; + struct timeval tv; /* Allocate main loop object */ if (!(simple_poll = avahi_simple_poll_new())) { @@ -145,26 +210,29 @@ int main(int argc, char*argv[]) { name = avahi_strdup("MegaPrinter"); /* Allocate a new client */ - client = avahi_client_new(avahi_simple_poll_get(simple_poll), client_callback, NULL, &error); + client = avahi_client_new(avahi_simple_poll_get(simple_poll), 0, client_callback, NULL, &error); /* Check wether creating the client object succeeded */ if (!client) { fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error)); goto fail; } + + /* After 20s do some weird modification to the service */ + avahi_simple_poll_get(simple_poll)->timeout_new( + avahi_simple_poll_get(simple_poll), + avahi_elapse_time(&tv, 1000*10, 0), + modify_callback, + client); /* 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_entry_group_free(group); if (client) avahi_client_free(client);