some minor adjusments to the conformance testing program. We now pass Apple's

conformance tests without any changes or exceptions.

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@966 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 3c4ce6ed1b82ebedfbb34d0de5b86a966c1c05e3..dc3c864eb7b13465f98c1e0d737052be0a818f87 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -109,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;
@@ -145,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);   

diff --git a/avahi-core/internal.h b/avahi-core/internal.h
index e3608899709abf7d004ac21f20c8b5359e4562e7..c791d8d80d766d02d2804d1190932843e2a4b86f 100644 (file)
--- a/avahi-core/internal.h
+++ b/avahi-core/internal.h
@@ -46,7 +46,7 @@ typedef struct AvahiEntry AvahiEntry;
 #define AVAHI_FLAGS_VALID(flags, max) (!((flags) & ~(max)))
 
 #define AVAHI_RR_HOLDOFF_MSEC 1000
-#define AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT 60000
+#define AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT 20000
 #define AVAHI_RR_RATE_LIMIT_COUNT 15
 
 typedef struct AvahiLegacyUnicastReflectSlot AvahiLegacyUnicastReflectSlot;