summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-15 00:11:51 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-15 00:11:51 +0000
commit082bf7c49d390001c869925fbde2f35d7d9ac6ce (patch)
treeb0528a0f0f43e42f8e3340444fa16cf88e62f958
parent2fec4cc43bbc88b71484a73fa8c2911fe51b5a06 (diff)
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
-rw-r--r--avahi-core/conformance-test.c9
-rw-r--r--avahi-core/internal.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 3c4ce6e..dc3c864 100644
--- 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 e360889..c791d8d 100644
--- 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;