* Update configure.ac to check for the availabilty of more functions

[catta] / avahi-core / cache.c

diff --git a/avahi-core/cache.c b/avahi-core/cache.c
index 433f5a8faa1220d92d11debcf3d8b0638a2559e9..865950f65bb464240bf29f3db41c3b8d593f09d7 100644 (file)
--- a/avahi-core/cache.c
+++ b/avahi-core/cache.c
@@ -28,13 +28,15 @@
 #include "util.h"
 #include "cache.h"
 
+#define AVAHI_MAX_CACHE_ENTRIES 200
+
 static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
     AvahiCacheEntry *t;
 
     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);
@@ -55,6 +57,8 @@ static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
     avahi_record_unref(e->record);
     
     g_free(e);
+
+    g_assert(c->n_entries-- >= 1);
 }
 
 AvahiCache *avahi_cache_new(AvahiServer *server, AvahiInterface *iface) {
@@ -67,6 +71,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 +81,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);
     
@@ -151,7 +157,7 @@ static void elapse_func(AvahiTimeEvent *t, void *userdata) {
 
     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"); */
     } else {
         guint percent = 0;
     
@@ -183,7 +189,7 @@ static void elapse_func(AvahiTimeEvent *t, void *userdata) {
 
         /* Request a cache update, if we are subscribed to this entry */
         if (avahi_is_subscribed(e->cache->server, e->cache->interface, e->record->key)) {
-/*             g_message("Requesting cache entry update at %i%%.", percent); */
+/*             avahi_log_debug("Requesting cache entry update at %i%%.", percent); */
             avahi_interface_post_query(e->cache->interface, e->record->key, TRUE);
         }
 
@@ -236,7 +242,7 @@ void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean cache_flush, con
     g_assert(c);
     g_assert(r && r->ref >= 1);
 
-/*     g_message("cache update: %s", (txt = avahi_record_to_string(r))); */
+/*     avahi_log_debug("cache update: %s", (txt = avahi_record_to_string(r))); */
 /*     g_free(txt); */
 
     if (r->ttl == 0) {
@@ -278,7 +284,7 @@ void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean cache_flush, con
     
         if (e) {
             
-/*             g_message("found matching cache entry");  */
+/*             avahi_log_debug("found matching cache entry");  */
 
             /* We need to update the hash table key if we replace the
              * record */
@@ -292,7 +298,12 @@ void avahi_cache_update(AvahiCache *c, AvahiRecord *r, gboolean cache_flush, con
         } else {
             /* No entry found, therefore we create a new one */
             
-/*             g_message("couldn't find matching cache entry");  */
+/*             avahi_log_debug("couldn't find matching cache entry");  */
+
+            if (c->n_entries >= AVAHI_MAX_CACHE_ENTRIES)
+                return;
+
+            c->n_entries++;
             
             e = g_new(AvahiCacheEntry, 1);
             e->cache = c;
@@ -351,7 +362,7 @@ 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: %u, ttl/2: %u", age, e->record->ttl); */
     
     return age >= e->record->ttl/2;
 }