X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fconformance-test.c;h=dc3c864eb7b13465f98c1e0d737052be0a818f87;hb=cce02bf638894512769ff026f5702c3e892a20f1;hp=1856fc56d8f48ca2b4022bb19341d52495b04da7;hpb=424aefe8a431b79496672799dc4f4430fa935252;p=catta

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 1856fc5..dc3c864 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -23,21 +23,25 @@
 #include <config.h>
 #endif
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <avahi-common/alternative.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/timeval.h>
 
-#include "core.h"
-#include "log.h"
-#include "lookup.h"
+#include <avahi-core/core.h>
+#include <avahi-core/log.h>
+#include <avahi-core/lookup.h>
+#include <avahi-core/publish.h>
 
 static char *name = NULL;
 static AvahiSEntryGroup *group = NULL;
@@ -45,11 +49,11 @@ static int try = 0;
 static AvahiServer *avahi = NULL;
 static const AvahiPoll *poll_api;
 
-static void dump_line(const char *text, void* userdata) {
+static void dump_line(const char *text, AVAHI_GCC_UNUSED void* userdata) {
     printf("%s\n", text);
 }
 
-static void dump_timeout_callback(AvahiTimeout *timeout, void* data) {
+static void dump_timeout_callback(AvahiTimeout *timeout, AVAHI_GCC_UNUSED void* userdata) {
     struct timeval tv;
     
     avahi_server_dump(avahi, dump_line, NULL);
@@ -80,7 +84,7 @@ static void create_service(const char *t) {
     try++;
 }
 
-static void rename_timeout_callback(AvahiTimeout *timeout, void *userdata) {
+static void rename_timeout_callback(AvahiTimeout *timeout, AVAHI_GCC_UNUSED void *userdata) {
     struct timeval tv;
     
     if (access("flag", F_OK) == 0) { 
@@ -92,7 +96,7 @@ static void rename_timeout_callback(AvahiTimeout *timeout, void *userdata) {
     poll_api->timeout_update(timeout, &tv);
 }
 
-static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata) {
+static void entry_group_callback(AVAHI_GCC_UNUSED AvahiServer *s, AVAHI_GCC_UNUSED AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void* userdata) {
     if (state == AVAHI_ENTRY_GROUP_COLLISION)
         create_service(NULL);
     else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) {
@@ -101,24 +105,38 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry
     }
 }
 
-static void server_callback(AvahiServer *s, AvahiServerState state, void* userdata) {
+static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UNUSED void* userdata) {
     avahi_log_debug("server state: %i", state);
 
     if (state == AVAHI_SERVER_RUNNING) {
-        create_service("gurke");
         avahi_server_dump(avahi, dump_line, NULL);
+    } else if (state == AVAHI_SERVER_COLLISION) {
+        char *n;
+        
+        n = avahi_alternative_host_name(avahi_server_get_host_name(s));
+        avahi_log_warn("Host name conflict, retrying with <%s>", n);
+        avahi_server_set_host_name(s, n);
+        avahi_free(n);
+
     }
 }
 
-int main(int argc, char *argv[]) {
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     int error;
     AvahiSimplePoll *simple_poll;
     struct timeval tv;
+    struct AvahiServerConfig config;
 
     simple_poll = avahi_simple_poll_new();
     poll_api = avahi_simple_poll_get(simple_poll);
-    
-    avahi = avahi_server_new(poll_api, NULL, server_callback, NULL, &error);
+
+    avahi_server_config_init(&config);
+    config.publish_workstation = 0;
+    config.use_ipv6 = 0;
+    config.publish_domain = 0;
+    config.publish_hinfo = 0;
+    avahi = avahi_server_new(poll_api, &config, server_callback, NULL, &error);
+    avahi_server_config_free(&config);
 
     avahi_elapse_time(&tv, 5000, 0);
     poll_api->timeout_new(poll_api, &tv, dump_timeout_callback, avahi);
@@ -126,9 +144,11 @@ int main(int argc, char *argv[]) {
     avahi_elapse_time(&tv, 5000, 0);
     poll_api->timeout_new(poll_api, &tv, rename_timeout_callback, avahi);
 
-    for (;;)
-        if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
-            break;
+    /* Evil, but the conformace test requires that*/
+    create_service("gurke");
+
+    
+    avahi_simple_poll_loop(simple_poll);
     
     if (group)
         avahi_s_entry_group_free(group);