2008-06-24 Dimitris Glezos <dimitris@glezos.com> (via glezos@fedoraproject.org)

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

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 6873b5cda1a9b7cb4f3ddae69457abc3891db457..dc3c864eb7b13465f98c1e0d737052be0a818f87 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -23,14 +23,16 @@
 #include <config.h>
 #endif
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <avahi-common/alternative.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
@@ -107,7 +109,6 @@ static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UN
     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;
@@ -143,9 +144,11 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     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;
+    /* Evil, but the conformace test requires that*/
+    create_service("gurke");
+
+    
+    avahi_simple_poll_loop(simple_poll);
     
     if (group)
         avahi_s_entry_group_free(group);