* progress on python port of avahi-discover basic things are in place

[catta] / avahi-core / conformance-test.c

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 001bff13b05eddf6a28cdde62535846896a7132b..f7eba12a06bd1b94097db5eb94f1fb6d16b81ae4 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -31,14 +31,20 @@
 
 #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;
 }
 
@@ -60,7 +66,7 @@ static void create_service(gchar *t) {
         sleep(2); /* ugly ugly ugly hack */
     
     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 +74,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 +82,25 @@ 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);
+}
+
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
 
-    avahi = avahi_server_new(NULL);
+    avahi = avahi_server_new(NULL, NULL, server_callback, NULL);
     create_service("gurke");
-    avahi_server_dump(avahi, stdout);
+    avahi_server_dump(avahi, dump_line, NULL);
     
     loop = g_main_loop_new(NULL, FALSE);
     g_timeout_add(1000*5, dump_timeout, avahi);