Rename some server side objects/symbols so that they do not conflict with the same...

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

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 4bcd691d5660a048407f95697fb8442fc0ddb329..b786e855268a0b538c9e9be5acfeb069dd1fda19 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -28,83 +28,102 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include <avahi-common/alternative.h>
+#include <avahi-glib/glib-watch.h>
+#include <avahi-glib/glib-malloc.h>
 
 #include "core.h"
-#include "util.h"
-#include "alternative.h"
+#include "log.h"
 
-static gchar *name = NULL;
-static AvahiEntryGroup *group = NULL;
+static char *name = NULL;
+static AvahiSEntryGroup *group = NULL;
 static int try = 0;
 static AvahiServer *avahi = NULL;
 
-static gboolean dump_timeout(gpointer data) {
-    avahi_server_dump(avahi, stdout);
-    return TRUE;
+static void dump_line(const char *text, void* userdata) {
+    printf("%s\n", text);
 }
 
-static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata);
+static int dump_timeout(void* data) {
+    avahi_server_dump(avahi, dump_line, NULL);
+    return 1;
+}
 
-static void create_service(gchar *t) {
-    gchar *n;
+static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata);
 
-    g_assert(t || name);
+static void create_service(const char *t) {
+    char *n;
+
+    assert(t || name);
 
-    if (group)
-        avahi_entry_group_free(group);
-    
     n = t ? g_strdup(t) : avahi_alternative_service_name(name);
-    g_free(name);
+    avahi_free(name);
     name = n;
 
-    if (try > 10)
-        sleep(2); /* ugly ugly ugly hack */
+    if (group)
+        avahi_s_entry_group_reset(group);
+    else
+        group = avahi_s_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_entry_group_commit(group);
+    avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);   
+    avahi_s_entry_group_commit(group);
 
     try++;
 }
 
-static gboolean rename_timeout(gpointer data) {
+static int rename_timeout(void* data) {
     
     if (access("flag", F_OK) == 0) { 
         create_service("New - Bonjour Service Name");
-        return FALSE;
+        return 0;
     }
 
-    return TRUE;
+    return 1;
 }
 
-static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) {
+static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* 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) {
-    g_message("server state: %i", state);
+static void server_callback(AvahiServer *s, AvahiServerState state, void* 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;
+    AvahiGLibPoll *glib_poll;
+
+    avahi_set_allocator(avahi_glib_allocator());
 
-    avahi = avahi_server_new(NULL, NULL, server_callback, NULL);
-    create_service("gurke");
-    avahi_server_dump(avahi, stdout);
+    glib_poll = avahi_glib_poll_new(NULL);
     
-    loop = g_main_loop_new(NULL, FALSE);
+    avahi = avahi_server_new(avahi_glib_poll_get(glib_poll), NULL, server_callback, NULL, &error);
+    
+    loop = g_main_loop_new(NULL, 0);
     g_timeout_add(1000*5, dump_timeout, avahi);
     g_timeout_add(1000*5, rename_timeout, avahi); 
     g_main_loop_run(loop);
     g_main_loop_unref(loop);
 
-    avahi_entry_group_free(group);   
+    if (group)
+        avahi_s_entry_group_free(group);   
     avahi_server_free(avahi);
+
+    avahi_glib_poll_free(glib_poll);
     
     return 0;
 }