#include <string.h>
#include <stdlib.h>
+#include <time.h>
#include <avahi-common/timeval.h>
#include <avahi-common/malloc.h>
AVAHI_LLIST_HEAD_INIT(AvahiCacheEntry, c->entries);
c->n_entries = 0;
+
+ c->last_rand_timestamp = 0;
return c;
}
assert(percent > 0);
- /* Request a cache update, if we are subscribed to this entry */
- if (avahi_querier_exists(e->cache->interface, e->record->key)) {
-/* avahi_log_debug("Requesting cache entry update at %i%% for %s.", percent, txt); */
- avahi_interface_post_query(e->cache->interface, e->record->key, 1);
- }
+ /* Request a cache update if we are subscribed to this entry */
+ if (avahi_querier_shall_refresh_cache(e->cache->interface, e->record->key))
+ avahi_interface_post_query(e->cache->interface, e->record->key, 0, NULL);
/* Check again later */
next_expiry(e->cache, e, percent);
static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, unsigned percent) {
AvahiUsec usec, left, right;
+ time_t now;
assert(c);
assert(e);
left = usec * percent;
right = usec * (percent+2); /* 2% jitter */
- usec = left + (AvahiUsec) ((double) (right-left) * rand() / (RAND_MAX+1.0));
+ now = time(NULL);
+
+ if (now >= c->last_rand_timestamp + 10) {
+ c->last_rand = rand();
+ c->last_rand_timestamp = now;
+ }
+
+ usec = left + (AvahiUsec) ((double) (right-left) * c->last_rand / (RAND_MAX+1.0));
e->expiry = e->timestamp;
avahi_timeval_add(&e->expiry, usec);
static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void *userdata) {
AvahiAddress *a = userdata;
+ struct timeval now;
assert(c);
assert(pattern);
assert(e);
assert(a);
-
+
+ gettimeofday(&now, NULL);
+
switch (e->state) {
case AVAHI_CACHE_VALID:
e->state = AVAHI_CACHE_POOF;
e->poof_address = *a;
-
+ e->poof_timestamp = now;
+ e->poof_num = 0;
+
break;
case AVAHI_CACHE_POOF:
+ if (avahi_timeval_diff(&now, &e->poof_timestamp) < 1000000)
+ break;
- /* This is the second time we got no response, so let's
+ e->poof_timestamp = now;
+ e->poof_address = *a;
+ e->poof_num ++;
+
+ /* This is the 4th time we got no response, so let's
* fucking remove this entry. */
-
- expire_in_one_second(c, e, AVAHI_CACHE_POOF_FINAL);
+ if (e->poof_num > 3)
+ expire_in_one_second(c, e, AVAHI_CACHE_POOF_FINAL);
break;
default:
assert(c);
assert(key);
- avahi_cache_walk(c, key, start_poof_callback, a);
+ avahi_cache_walk(c, key, start_poof_callback, (void*) a);
}
void avahi_cache_stop_poof(AvahiCache *c, AvahiRecord *record, const AvahiAddress *a) {