X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fconformance-test.c;h=b119e467fa08cab467c4e4770e989a0950ba2906;hb=d322a943be5387a539f8f3ea3a19a7e2ed5a55a2;hp=37023721bbd868cfab903fc3e006dbacc49218b9;hpb=f1167112d926b189fe189599576e8588923f036c;p=catta

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 3702372..b119e46 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -37,6 +37,7 @@
 
 #include "core.h"
 #include "log.h"
+#include "lookup.h"
 
 static char *name = NULL;
 static AvahiSEntryGroup *group = NULL;
@@ -73,7 +74,7 @@ static void create_service(const char *t) {
     else
         group = avahi_s_entry_group_new(avahi, entry_group_callback, NULL);
     
-    avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);   
+    avahi_server_add_service(avahi, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);   
     avahi_s_entry_group_commit(group);
 
     try++;
@@ -106,6 +107,14 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void* userda
     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);
+
     }
 }
 
@@ -113,11 +122,18 @@ int main(int argc, 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);