X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fconformance-test.c;h=13704c355950d76d2bd15ce75df46935c1aa3243;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=74c38332b00b4fe468d1a7878d1c34dcc918e3eb;hpb=40cd1f60e9d84610401db992003a3b282de5fcae;p=catta

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 74c3833..13704c3 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -28,39 +28,44 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdio.h>
 
 #include "core.h"
 #include "util.h"
+#include "alternative.h"
+#include "log.h"
 
 static gchar *name = NULL;
 static AvahiEntryGroup *group = NULL;
 static int try = 0;
 static AvahiServer *avahi = NULL;
 
+static void dump_line(const gchar *text, gpointer userdata) {
+    printf("%s\n", text);
+}
+
 static gboolean dump_timeout(gpointer data) {
-    avahi_server_dump(avahi, stdout);
+    avahi_server_dump(avahi, dump_line, NULL);
     return TRUE;
 }
 
 static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata);
 
-static void create_service(gchar *t) {
+static void create_service(const gchar *t) {
     gchar *n;
 
     g_assert(t || name);
 
-    if (group)
-        avahi_entry_group_free(group);
-    
     n = t ? g_strdup(t) : avahi_alternative_service_name(name);
     g_free(name);
     name = n;
 
-    if (try > 10)
-        sleep(2); /* ugly ugly ugly hack */
+    if (group)
+        avahi_entry_group_reset(group);
+    else
+        group = avahi_entry_group_new(avahi, entry_group_callback, NULL);
     
-    group = avahi_entry_group_new(avahi, entry_group_callback, NULL);   
-    avahi_server_add_service(avahi, group, 0, AF_UNSPEC, "_http._tcp", name, NULL, NULL, 80, "foo", NULL);   
+    avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);   
     avahi_entry_group_commit(group);
 
     try++;
@@ -68,7 +73,6 @@ static void create_service(gchar *t) {
 
 static gboolean rename_timeout(gpointer data) {
     
-    
     if (access("flag", F_OK) == 0) { 
         create_service("New - Bonjour Service Name");
         return FALSE;
@@ -77,23 +81,29 @@ static gboolean rename_timeout(gpointer data) {
     return TRUE;
 }
 
-
-
 static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) {
     if (state == AVAHI_ENTRY_GROUP_COLLISION)
         create_service(NULL);
     else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) {
-        g_message("ESTABLISHED !!!!");
+        avahi_log_debug("ESTABLISHED !!!!");
         try = 0;
     }
 }
 
+static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+    avahi_log_debug("server state: %i", state);
+
+    if (state == AVAHI_SERVER_RUNNING) {
+        create_service("gurke");
+        avahi_server_dump(avahi, dump_line, NULL);
+    }
+}
+
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
+    gint error;
 
-    avahi = avahi_server_new(NULL, NULL);
-    create_service("gurke");
-    avahi_server_dump(avahi, stdout);
+    avahi = avahi_server_new(NULL, NULL, server_callback, NULL, &error);
     
     loop = g_main_loop_new(NULL, FALSE);
     g_timeout_add(1000*5, dump_timeout, avahi);
@@ -101,7 +111,8 @@ int main(int argc, char *argv[]) {
     g_main_loop_run(loop);
     g_main_loop_unref(loop);
 
-    avahi_entry_group_free(group);   
+    if (group)
+        avahi_entry_group_free(group);   
     avahi_server_free(avahi);
     
     return 0;