X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fclient-publish-service.c;h=d99c46b351cb9060f602bbd92e735d9628c3ecc2;hb=8d83c6ca359d27f7c90ba874add798d064e58bc2;hp=c3f11added056dba099252a141b9055ad93fa3e2;hpb=424aefe8a431b79496672799dc4f4430fa935252;p=catta

diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c
index c3f11ad..d99c46b 100644
--- a/examples/client-publish-service.c
+++ b/examples/client-publish-service.c
@@ -29,6 +29,8 @@
 #include <assert.h>
 
 #include <avahi-client/client.h>
+#include <avahi-client/publish.h>
+
 #include <avahi-common/alternative.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
@@ -45,22 +47,36 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
 
     /* 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;
+        }
+
+        case AVAHI_ENTRY_GROUP_FAILURE :
 
-        fprintf(stderr, "Service name collision, renaming service to '%s'\n", name);
+            /* Some kind of failure happened while we were registering our services */
+            avahi_simple_poll_quit(simple_poll);
+            break;
 
-        /* And recreate the services */
-        create_services(avahi_entry_group_get_client(g));
+        case AVAHI_ENTRY_GROUP_UNCOMMITED:
+        case AVAHI_ENTRY_GROUP_REGISTERING:
+            ;
     }
 }
 
@@ -70,15 +86,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 +109,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,7 +125,6 @@ static void create_services(AvahiClient *c) {
 
 fail:
     avahi_simple_poll_quit(simple_poll);
-    return;
 }
 
 static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) {
@@ -112,22 +132,35 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void * userd
 
     /* 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. */
-        if (group)
-            avahi_entry_group_reset(group);
+    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_S_COLLISION:
         
-    } else if (state == AVAHI_CLIENT_DISCONNECTED) {
+            /* 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_DISCONNECTED:
 
-        fprintf(stderr, "Server connection terminated.\n");
-        avahi_simple_poll_quit(simple_poll);
+            fprintf(stderr, "Server connection terminated.\n");
+            avahi_simple_poll_quit(simple_poll);
+
+            break;
+
+        case AVAHI_CLIENT_S_FAILURE:
+        case AVAHI_CLIENT_S_INVALID:
+        case AVAHI_CLIENT_S_REGISTERING:
+            ;
     }
 }
 
@@ -152,19 +185,15 @@ int main(int argc, char*argv[]) {
         fprintf(stderr, "Failed to create client: %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_entry_group_free(group);
 
     if (client)
         avahi_client_free(client);