X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fcache.c;h=174fceb108c2c9b065302843a5a9589eb5815641;hb=b4e1f08a735dfe56cdecb4337276a94d7da494a3;hp=0307b8e58cf18f877af45d2440f046f2aba3d293;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/cache.c b/avahi-core/cache.c
index 0307b8e..174fceb 100644
--- a/avahi-core/cache.c
+++ b/avahi-core/cache.c
@@ -27,6 +27,9 @@
 
 #include "util.h"
 #include "cache.h"
+#include "log.h"
+
+#define AVAHI_MAX_CACHE_ENTRIES 200
 
 static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
     AvahiCacheEntry *t;
@@ -34,7 +37,7 @@ static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
     g_assert(c);
     g_assert(e);
 
-/*     g_message("removing from cache: %p %p", c, e); */
+/*     avahi_log_debug("removing from cache: %p %p", c, e); */
 
     /* Remove from hash table */
     t = g_hash_table_lookup(c->hash_table, e->record->key);
@@ -50,11 +53,13 @@ static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
     if (e->time_event)
         avahi_time_event_queue_remove(c->server->time_event_queue, e->time_event);
 
-    avahi_subscription_notify(c->server, c->interface, e->record, AVAHI_SUBSCRIPTION_REMOVE);
+    avahi_browser_notify(c->server, c->interface, e->record, AVAHI_BROWSER_REMOVE);
 
     avahi_record_unref(e->record);
     
     g_free(e);
+
+    g_assert(c->n_entries-- >= 1);
 }
 
 AvahiCache *avahi_cache_new(AvahiServer *server, AvahiInterface *iface) {
@@ -67,6 +72,7 @@ AvahiCache *avahi_cache_new(AvahiServer *server, AvahiInterface *iface) {
     c->hash_table = g_hash_table_new((GHashFunc) avahi_key_hash, (GEqualFunc) avahi_key_equal);
 
     AVAHI_LLIST_HEAD_INIT(AvahiCacheEntry, c->entries);
+    c->n_entries = 0;
     
     return c;
 }
@@ -76,6 +82,7 @@ void avahi_cache_free(AvahiCache *c) {
 
     while (c->entries)
         remove_entry(c, c->entries);
+    g_assert(c->n_entries == 0);
     
     g_hash_table_destroy(c->hash_table);
     
@@ -145,13 +152,16 @@ static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, guint percent);
 
 static void elapse_func(AvahiTimeEvent *t, void *userdata) {
     AvahiCacheEntry *e = userdata;
+/*     gchar *txt; */
     
     g_assert(t);
     g_assert(e);
 
+/*     txt = avahi_record_to_string(e->record); */
+
     if (e->state == AVAHI_CACHE_FINAL) {
         remove_entry(e->cache, e);
-        g_message("Removing entry from cache due to expiration");
+/*         avahi_log_debug("Removing entry from cache due to expiration (%s)", txt); */
     } else {
         guint percent = 0;
     
@@ -181,15 +191,17 @@ static void elapse_func(AvahiTimeEvent *t, void *userdata) {
 
         g_assert(percent > 0);
 
-        g_message("Requesting cache entry update at %i%%.", percent);
-
         /* Request a cache update, if we are subscribed to this entry */
-        if (avahi_is_subscribed(e->cache->server, e->record->key))
+        if (avahi_is_subscribed(e->cache->server, 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, TRUE);
+        }
 
         /* Check again later */
         next_expiry(e->cache, e, percent);
     }
+
+/*     g_free(txt); */
 }
 
 static void update_time_event(AvahiCache *c, AvahiCacheEntry *e) {
@@ -203,87 +215,106 @@ static void update_time_event(AvahiCache *c, AvahiCacheEntry *e) {
 }
 
 static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, guint percent) {
-    gulong usec;
-
     g_assert(c);
     g_assert(e);
     g_assert(percent > 0 && percent <= 100);
+    AvahiUsec usec;
+/*     gchar *txt; */
 
-    e->expiry = e->timestamp;
-
-    usec = e->record->ttl * 10000;
+    usec = ((AvahiUsec) e->record->ttl) * 10000;
 
     /* 2% jitter */
-    usec = g_random_int_range(usec*percent, usec*(percent+2));
+    usec = (AvahiUsec) g_random_double_range((gdouble) (usec*percent), (gdouble) (usec*(percent+2)));
+/*     g_message("next expiry: %lli (%s)", usec / 1000000, txt = avahi_record_to_string(e->record)); */
+/*     g_free(txt); */
+    
+    e->expiry = e->timestamp;
+    avahi_timeval_add(&e->expiry, usec);
+    
+/*     g_message("wake up in +%lu seconds", e->expiry.tv_sec - e->timestamp.tv_sec); */
     
-    g_time_val_add(&e->expiry, usec);
     update_time_event(c, e);
 }
 
-void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean unique, const AvahiAddress *a) {
-    AvahiCacheEntry *e, *t;
-    gchar *txt;
+static void expire_in_one_second(AvahiCache *c, AvahiCacheEntry *e) {
+    g_assert(c);
+    g_assert(e);
+    
+    e->state = AVAHI_CACHE_FINAL;
+    g_get_current_time(&e->expiry);
+    avahi_timeval_add(&e->expiry, 1000000); /* 1s */
+    update_time_event(c, e);
+}
+
+void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean cache_flush, const AvahiAddress *a) {
+/*     gchar *txt; */
     
     g_assert(c);
     g_assert(r && r->ref >= 1);
 
-    g_message("cache update: %s", (txt = avahi_record_to_string(r)));
-    g_free(txt);
+/*     txt = avahi_record_to_string(r); */
 
     if (r->ttl == 0) {
-
         /* This is a goodbye request */
 
-        if ((e = avahi_cache_lookup_record(c, r))) {
+        AvahiCacheEntry *e;
 
-            e->state = AVAHI_CACHE_FINAL;
-            g_get_current_time(&e->timestamp);
-            e->expiry = e->timestamp;
-            g_time_val_add(&e->expiry, 1000000); /* 1s */
-            update_time_event(c, e);
-        }
+        if ((e = avahi_cache_lookup_record(c, r)))
+            expire_in_one_second(c, e);
 
     } else {
+        AvahiCacheEntry *e = NULL, *first;
+        GTimeVal now;
+
+        g_get_current_time(&now);
 
         /* This is an update request */
 
-        if ((t = e = avahi_cache_lookup_key(c, r->key))) {
-        
-            if (unique) {
-                
-                /* For unique records, remove all entries but one */
-                while (e->by_key_next)
-                    remove_entry(c, e->by_key_next);
-                
-            } else {
-                
-                /* For non-unique record, look for exactly the same entry */
-                for (; e; e = e->by_key_next)
-                    if (avahi_record_equal_no_ttl(e->record, r))
-                        break;
+        if ((first = avahi_cache_lookup_key(c, r->key))) {
+            
+            if (cache_flush) {
+
+                /* For unique entries drop all entries older than one second */
+                for (e = first; e; e = e->by_key_next) {
+                    AvahiUsec t;
+
+                    t = avahi_timeval_diff(&now, &e->timestamp);
+
+                    if (t > 1000000)
+                        expire_in_one_second(c, e);
+                }
             }
+                
+            /* Look for exactly the same entry */
+            for (e = first; e; e = e->by_key_next)
+                if (avahi_record_equal_no_ttl(e->record, r))
+                    break;
         }
     
         if (e) {
             
-/*         g_message("found matching cache entry"); */
-            
-            /* We are the first in the linked list so let's replace the hash table key with the new one */
+/*             avahi_log_debug("found matching cache entry");  */
+
+            /* We need to update the hash table key if we replace the
+             * record */
             if (e->by_key_prev == NULL)
                 g_hash_table_replace(c->hash_table, r->key, e);
             
-            /* Notify subscribers */
-            if (!avahi_record_equal_no_ttl(e->record, r))
-                avahi_subscription_notify(c->server, c->interface, r, AVAHI_SUBSCRIPTION_CHANGE);    
-            
             /* Update the record */
             avahi_record_unref(e->record);
             e->record = avahi_record_ref(r);
+
+/*             avahi_log_debug("cache: updating %s", txt);   */
             
         } else {
             /* No entry found, therefore we create a new one */
             
-/*         g_message("couldn't find matching cache entry"); */
+/*             avahi_log_debug("cache: couldn't find matching cache entry for %s", txt);   */
+
+            if (c->n_entries >= AVAHI_MAX_CACHE_ENTRIES)
+                return;
+
+            c->n_entries++;
             
             e = g_new(AvahiCacheEntry, 1);
             e->cache = c;
@@ -291,73 +322,64 @@ void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean unique, const Av
             e->record = avahi_record_ref(r);
 
             /* Append to hash table */
-            AVAHI_LLIST_PREPEND(AvahiCacheEntry, by_key, t, e);
-            g_hash_table_replace(c->hash_table, e->record->key, t);
+            AVAHI_LLIST_PREPEND(AvahiCacheEntry, by_key, first, e);
+            g_hash_table_replace(c->hash_table, e->record->key, first);
 
             /* Append to linked list */
             AVAHI_LLIST_PREPEND(AvahiCacheEntry, entry, c->entries, e);
 
             /* Notify subscribers */
-            avahi_subscription_notify(c->server, c->interface, e->record, AVAHI_SUBSCRIPTION_NEW);
+            avahi_browser_notify(c->server, c->interface, e->record, AVAHI_BROWSER_NEW);
         } 
         
         e->origin = *a;
-        g_get_current_time(&e->timestamp);
+        e->timestamp = now;
         next_expiry(c, e, 80);
         e->state = AVAHI_CACHE_VALID;
+        e->cache_flush = cache_flush;
     }
-}
-
-static gpointer drop_key_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, gpointer userdata) {
-    g_assert(c);
-    g_assert(pattern);
-    g_assert(e);
-
-    remove_entry(c, e);
-    return NULL;
-}
 
-void avahi_cache_drop_key(AvahiCache *c, AvahiKey *k) {
-    g_assert(c);
-    g_assert(k);
-
-    avahi_cache_walk(c, k, drop_key_callback, NULL);
+/*     g_free(txt);  */
 }
 
-void avahi_cache_drop_record(AvahiCache *c, AvahiRecord *r) {
-    AvahiCacheEntry *e;
-    
-    g_assert(c);
-    g_assert(r);
-
-    if ((e = avahi_cache_lookup_record(c, r))) 
-        remove_entry(c, e);
-}
+struct dump_data {
+    AvahiDumpCallback callback;
+    gpointer userdata;
+};
 
-static void func(gpointer key, gpointer data, gpointer userdata) {
+static void dump_callback(gpointer key, gpointer data, gpointer userdata) {
     AvahiCacheEntry *e = data;
     AvahiKey *k = key;
-    gchar *t;
+    struct dump_data *dump_data = userdata;
 
     g_assert(k);
     g_assert(e);
-    
-    t = avahi_record_to_string(e->record);
-    fprintf((FILE*) userdata, "%s\n", t);
-    g_free(t);
+    g_assert(data);
+
+    for (; e; e = e->by_key_next) {
+        gchar *t = avahi_record_to_string(e->record);
+        dump_data->callback(t, dump_data->userdata);
+        g_free(t);
+    }
 }
 
-void avahi_cache_dump(AvahiCache *c, FILE *f) {
+void avahi_cache_dump(AvahiCache *c, AvahiDumpCallback callback, gpointer userdata) {
+    struct dump_data data;
+
     g_assert(c);
-    g_assert(f);
+    g_assert(callback);
 
-    fprintf(f, ";;; CACHE DUMP FOLLOWS ;;;\n");
-    g_hash_table_foreach(c->hash_table, func, f);
+    callback(";;; CACHE DUMP FOLLOWS ;;;", userdata);
+
+    data.callback = callback;
+    data.userdata = userdata;
+
+    g_hash_table_foreach(c->hash_table, dump_callback, &data);
 }
 
 gboolean avahi_cache_entry_half_ttl(AvahiCache *c, AvahiCacheEntry *e) {
     GTimeVal now;
-    guint age;
+    AvahiUsec age;
     
     g_assert(c);
     g_assert(e);
@@ -366,7 +388,14 @@ gboolean avahi_cache_entry_half_ttl(AvahiCache *c, AvahiCacheEntry *e) {
 
     age = avahi_timeval_diff(&now, &e->timestamp)/1000000;
 
-    g_message("age: %u, ttl/2: %u", age, e->record->ttl);
+/*     avahi_log_debug("age: %lli, ttl/2: %u", age, e->record->ttl);  */
     
     return age >= e->record->ttl/2;
 }
+
+void avahi_cache_flush(AvahiCache *c) {
+    g_assert(c);
+
+    while (c->entries)
+        remove_entry(c, c->entries);
+}