X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fclient-publish-service.c;h=96afaf33810de89827143126ffbb4b8073395931;hb=b7e4639b7f117250021a38b018c54e8004bff0d9;hp=bb895ce66cc9c6ba10ed56a4f125b9f460d89fad;hpb=6b391bb81f0dce0193a722254016b26c12a17643;p=catta

diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c
index bb895ce..96afaf3 100644
--- a/examples/client-publish-service.c
+++ b/examples/client-publish-service.c
@@ -35,6 +35,7 @@
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
+#include <avahi-common/timeval.h>
 
 static AvahiEntryGroup *group = NULL;
 static AvahiSimplePoll *simple_poll = NULL;
@@ -42,27 +43,41 @@ static char *name = NULL;
 
 static void create_services(AvahiClient *c);
 
-static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
+static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) {
     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 :
+            /* The entry group has been established successfully */
+            fprintf(stderr, "Service '%s' successfully established.\n", name);
+            break;
+
+        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;
+        }
 
-        /* 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_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:
+            ;
     }
 }
 
@@ -111,40 +126,70 @@ 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) {
+    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);
-    
-    } else if (state == AVAHI_CLIENT_S_COLLISION) {
+            /* 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:
         
-        /* 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. */
+            /* 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:
+            
+            fprintf(stderr, "Client failure: %s\n", avahi_strerror(avahi_client_errno(c)));
+            avahi_simple_poll_quit(simple_poll);
+            
+            break;
+
+        case AVAHI_CLIENT_CONNECTING:
+        case AVAHI_CLIENT_S_REGISTERING:
+            ;
+    }
+}
+
+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())) {
@@ -155,7 +200,7 @@ 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) {
@@ -163,6 +208,13 @@ int main(int argc, char*argv[]) {
         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 */
     avahi_simple_poll_loop(simple_poll);