* do no longer include timeval.h in watch.h by default

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

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index c14a761ba7c6df734b9107e599c711f66c422994..6e8e00e9183cf87a53d73b049811454ef630dfb3 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -29,58 +29,71 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <assert.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"
 
-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 const AvahiPoll *poll_api;
 
-static void dump_line(const gchar *text, gpointer userdata) {
+static void dump_line(const char *text, void* userdata) {
     printf("%s\n", text);
 }
 
-static gboolean dump_timeout(gpointer data) {
+static void dump_timeout_callback(AvahiTimeout *timeout, void* data) {
+    struct timeval tv;
+    
     avahi_server_dump(avahi, dump_line, NULL);
-    return TRUE;
+
+    avahi_elapse_time(&tv, 5000, 0);
+    poll_api->timeout_update(timeout, &tv);
 }
 
-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);
 
-static void create_service(const gchar *t) {
-    gchar *n;
+static void create_service(const char *t) {
+    char *n;
 
-    g_assert(t || name);
+    assert(t || name);
 
-    n = t ? g_strdup(t) : avahi_alternative_service_name(name);
-    g_free(name);
+    n = t ? avahi_strdup(t) : avahi_alternative_service_name(name);
+    avahi_free(name);
     name = n;
 
     if (group)
-        avahi_entry_group_reset(group);
+        avahi_s_entry_group_reset(group);
     else
-        group = avahi_entry_group_new(avahi, entry_group_callback, NULL);
+        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_entry_group_commit(group);
+    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++;
 }
 
-static gboolean rename_timeout(gpointer data) {
+static void rename_timeout_callback(AvahiTimeout *timeout, void *userdata) {
+    struct timeval tv;
     
     if (access("flag", F_OK) == 0) { 
         create_service("New - Bonjour Service Name");
-        return FALSE;
+        return;
     }
 
-    return TRUE;
+    avahi_elapse_time(&tv, 5000, 0);
+    poll_api->timeout_update(timeout, &tv);
 }
 
-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) {
@@ -89,30 +102,55 @@ static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryG
     }
 }
 
-static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+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);
+    } 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[]) {
-    GMainLoop *loop = NULL;
-    gint error;
-
-    avahi = avahi_server_new(NULL, NULL, server_callback, NULL, &error);
+    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_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);
+
+    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;
     
-    loop = g_main_loop_new(NULL, FALSE);
-    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);
-
     if (group)
-        avahi_entry_group_free(group);   
+        avahi_s_entry_group_free(group);   
     avahi_server_free(avahi);
+
+    avahi_simple_poll_free(simple_poll);
     
     return 0;
 }