X-Git-Url: http://git.meshlink.io/?p=catta;a=blobdiff_plain;f=src%2Fcache.c;h=f4203ebffe8efed0dec35a1f6e526345b3b4ee78;hp=0fcc5a3aabc99a71f66f45d55ea3cf69abcb00b9;hb=2c550daf4ac6a6aab7f21047c037b4dd53c57fa6;hpb=37d19f15523b6fe4d1fef2329abe421221b3d4b3

diff --git a/src/cache.c b/src/cache.c
index 0fcc5a3..f4203eb 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,18 +1,18 @@
 /***
-  This file is part of avahi.
+  This file is part of catta.
 
-  avahi is free software; you can redistribute it and/or modify it
+  catta is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
 
-  avahi is distributed in the hope that it will be useful, but WITHOUT
+  catta is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
+  License along with catta; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,64 +25,64 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <avahi/timeval.h>
-#include <avahi/malloc.h>
-#include <avahi/log.h>
+#include <catta/timeval.h>
+#include <catta/malloc.h>
+#include <catta/log.h>
 
 #include "cache.h"
 #include "rr-util.h"
 
-static void remove_entry(AvahiCache *c, AvahiCacheEntry *e) {
-    AvahiCacheEntry *t;
+static void remove_entry(CattaCache *c, CattaCacheEntry *e) {
+    CattaCacheEntry *t;
 
     assert(c);
     assert(e);
 
-/*     avahi_log_debug("removing from cache: %p %p", c, e); */
+/*     catta_log_debug("removing from cache: %p %p", c, e); */
 
     /* Remove from hash table */
-    t = avahi_hashmap_lookup(c->hashmap, e->record->key);
-    AVAHI_LLIST_REMOVE(AvahiCacheEntry, by_key, t, e);
+    t = catta_hashmap_lookup(c->hashmap, e->record->key);
+    CATTA_LLIST_REMOVE(CattaCacheEntry, by_key, t, e);
     if (t)
-        avahi_hashmap_replace(c->hashmap, t->record->key, t);
+        catta_hashmap_replace(c->hashmap, t->record->key, t);
     else
-        avahi_hashmap_remove(c->hashmap, e->record->key);
+        catta_hashmap_remove(c->hashmap, e->record->key);
 
     /* Remove from linked list */
-    AVAHI_LLIST_REMOVE(AvahiCacheEntry, entry, c->entries, e);
+    CATTA_LLIST_REMOVE(CattaCacheEntry, entry, c->entries, e);
 
     if (e->time_event)
-        avahi_time_event_free(e->time_event);
+        catta_time_event_free(e->time_event);
 
-    avahi_multicast_lookup_engine_notify(c->server->multicast_lookup_engine, c->interface, e->record, AVAHI_BROWSER_REMOVE);
+    catta_multicast_lookup_engine_notify(c->server->multicast_lookup_engine, c->interface, e->record, CATTA_BROWSER_REMOVE);
 
-    avahi_record_unref(e->record);
+    catta_record_unref(e->record);
 
-    avahi_free(e);
+    catta_free(e);
 
     assert(c->n_entries >= 1);
     --c->n_entries;
 }
 
-AvahiCache *avahi_cache_new(AvahiServer *server, AvahiInterface *iface) {
-    AvahiCache *c;
+CattaCache *catta_cache_new(CattaServer *server, CattaInterface *iface) {
+    CattaCache *c;
     assert(server);
 
-    if (!(c = avahi_new(AvahiCache, 1))) {
-        avahi_log_error(__FILE__": Out of memory.");
+    if (!(c = catta_new(CattaCache, 1))) {
+        catta_log_error(__FILE__": Out of memory.");
         return NULL; /* OOM */
     }
 
     c->server = server;
     c->interface = iface;
 
-    if (!(c->hashmap = avahi_hashmap_new((AvahiHashFunc) avahi_key_hash, (AvahiEqualFunc) avahi_key_equal, NULL, NULL))) {
-        avahi_log_error(__FILE__": Out of memory.");
-        avahi_free(c);
+    if (!(c->hashmap = catta_hashmap_new((CattaHashFunc) catta_key_hash, (CattaEqualFunc) catta_key_equal, NULL, NULL))) {
+        catta_log_error(__FILE__": Out of memory.");
+        catta_free(c);
         return NULL; /* OOM */
     }
 
-    AVAHI_LLIST_HEAD_INIT(AvahiCacheEntry, c->entries);
+    CATTA_LLIST_HEAD_INIT(CattaCacheEntry, c->entries);
     c->n_entries = 0;
 
     c->last_rand_timestamp = 0;
@@ -90,47 +90,47 @@ AvahiCache *avahi_cache_new(AvahiServer *server, AvahiInterface *iface) {
     return c;
 }
 
-void avahi_cache_free(AvahiCache *c) {
+void catta_cache_free(CattaCache *c) {
     assert(c);
 
     while (c->entries)
         remove_entry(c, c->entries);
     assert(c->n_entries == 0);
 
-    avahi_hashmap_free(c->hashmap);
+    catta_hashmap_free(c->hashmap);
 
-    avahi_free(c);
+    catta_free(c);
 }
 
-static AvahiCacheEntry *lookup_key(AvahiCache *c, AvahiKey *k) {
+static CattaCacheEntry *lookup_key(CattaCache *c, CattaKey *k) {
     assert(c);
     assert(k);
 
-    assert(!avahi_key_is_pattern(k));
+    assert(!catta_key_is_pattern(k));
 
-    return avahi_hashmap_lookup(c->hashmap, k);
+    return catta_hashmap_lookup(c->hashmap, k);
 }
 
-void* avahi_cache_walk(AvahiCache *c, AvahiKey *pattern, AvahiCacheWalkCallback cb, void* userdata) {
+void* catta_cache_walk(CattaCache *c, CattaKey *pattern, CattaCacheWalkCallback cb, void* userdata) {
     void* ret;
 
     assert(c);
     assert(pattern);
     assert(cb);
 
-    if (avahi_key_is_pattern(pattern)) {
-        AvahiCacheEntry *e, *n;
+    if (catta_key_is_pattern(pattern)) {
+        CattaCacheEntry *e, *n;
 
         for (e = c->entries; e; e = n) {
             n = e->entry_next;
 
-            if (avahi_key_pattern_match(pattern, e->record->key))
+            if (catta_key_pattern_match(pattern, e->record->key))
                 if ((ret = cb(c, pattern, e, userdata)))
                     return ret;
         }
 
     } else {
-        AvahiCacheEntry *e, *n;
+        CattaCacheEntry *e, *n;
 
         for (e = lookup_key(c, pattern); e; e = n) {
             n = e->by_key_next;
@@ -143,66 +143,66 @@ void* avahi_cache_walk(AvahiCache *c, AvahiKey *pattern, AvahiCacheWalkCallback
     return NULL;
 }
 
-static void* lookup_record_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void *userdata) {
+static void* lookup_record_callback(CattaCache *c, CattaKey *pattern, CattaCacheEntry *e, void *userdata) {
     assert(c);
     assert(pattern);
     assert(e);
 
-    if (avahi_record_equal_no_ttl(e->record, userdata))
+    if (catta_record_equal_no_ttl(e->record, userdata))
         return e;
 
     return NULL;
 }
 
-static AvahiCacheEntry *lookup_record(AvahiCache *c, AvahiRecord *r) {
+static CattaCacheEntry *lookup_record(CattaCache *c, CattaRecord *r) {
     assert(c);
     assert(r);
 
-    return avahi_cache_walk(c, r->key, lookup_record_callback, r);
+    return catta_cache_walk(c, r->key, lookup_record_callback, r);
 }
 
-static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, unsigned percent);
+static void next_expiry(CattaCache *c, CattaCacheEntry *e, unsigned percent);
 
-static void elapse_func(AvahiTimeEvent *t, void *userdata) {
-    AvahiCacheEntry *e = userdata;
+static void elapse_func(CattaTimeEvent *t, void *userdata) {
+    CattaCacheEntry *e = userdata;
 /*     char *txt; */
     unsigned percent = 0;
 
     assert(t);
     assert(e);
 
-/*     txt = avahi_record_to_string(e->record); */
+/*     txt = catta_record_to_string(e->record); */
 
     switch (e->state) {
 
-        case AVAHI_CACHE_EXPIRY_FINAL:
-        case AVAHI_CACHE_POOF_FINAL:
-        case AVAHI_CACHE_GOODBYE_FINAL:
-        case AVAHI_CACHE_REPLACE_FINAL:
+        case CATTA_CACHE_EXPIRY_FINAL:
+        case CATTA_CACHE_POOF_FINAL:
+        case CATTA_CACHE_GOODBYE_FINAL:
+        case CATTA_CACHE_REPLACE_FINAL:
 
             remove_entry(e->cache, e);
 
             e = NULL;
-/*         avahi_log_debug("Removing entry from cache due to expiration (%s)", txt); */
+/*         catta_log_debug("Removing entry from cache due to expiration (%s)", txt); */
             break;
 
-        case AVAHI_CACHE_VALID:
-        case AVAHI_CACHE_POOF:
-            e->state = AVAHI_CACHE_EXPIRY1;
+        case CATTA_CACHE_VALID:
+        case CATTA_CACHE_POOF:
+            e->state = CATTA_CACHE_EXPIRY1;
             percent = 85;
             break;
 
-        case AVAHI_CACHE_EXPIRY1:
-            e->state = AVAHI_CACHE_EXPIRY2;
+        case CATTA_CACHE_EXPIRY1:
+            e->state = CATTA_CACHE_EXPIRY2;
             percent = 90;
             break;
-        case AVAHI_CACHE_EXPIRY2:
-            e->state = AVAHI_CACHE_EXPIRY3;
+        case CATTA_CACHE_EXPIRY2:
+            e->state = CATTA_CACHE_EXPIRY3;
             percent = 95;
             break;
 
-        case AVAHI_CACHE_EXPIRY3:
-            e->state = AVAHI_CACHE_EXPIRY_FINAL;
+        case CATTA_CACHE_EXPIRY3:
+            e->state = CATTA_CACHE_EXPIRY_FINAL;
             percent = 100;
             break;
     }
@@ -212,36 +212,36 @@ static void elapse_func(AvahiTimeEvent *t, void *userdata) {
         assert(percent > 0);
 
         /* 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);
+        if (catta_querier_shall_refresh_cache(e->cache->interface, e->record->key))
+            catta_interface_post_query(e->cache->interface, e->record->key, 0, NULL);
 
         /* Check again later */
         next_expiry(e->cache, e, percent);
 
     }
 
-/*     avahi_free(txt); */
+/*     catta_free(txt); */
 }
 
-static void update_time_event(AvahiCache *c, AvahiCacheEntry *e) {
+static void update_time_event(CattaCache *c, CattaCacheEntry *e) {
     assert(c);
     assert(e);
 
     if (e->time_event)
-        avahi_time_event_update(e->time_event, &e->expiry);
+        catta_time_event_update(e->time_event, &e->expiry);
     else
-        e->time_event = avahi_time_event_new(c->server->time_event_queue, &e->expiry, elapse_func, e);
+        e->time_event = catta_time_event_new(c->server->time_event_queue, &e->expiry, elapse_func, e);
 }
 
-static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, unsigned percent) {
-    AvahiUsec usec, left, right;
+static void next_expiry(CattaCache *c, CattaCacheEntry *e, unsigned percent) {
+    CattaUsec usec, left, right;
     time_t now;
 
     assert(c);
     assert(e);
     assert(percent > 0 && percent <= 100);
 
-    usec = (AvahiUsec) e->record->ttl * 10000;
+    usec = (CattaUsec) e->record->ttl * 10000;
 
     left = usec * percent;
     right = usec * (percent+2); /* 2% jitter */
@@ -253,44 +253,44 @@ static void next_expiry(AvahiCache *c, AvahiCacheEntry *e, unsigned percent) {
         c->last_rand_timestamp = now;
     }
 
-    usec = left + (AvahiUsec) ((double) (right-left) * c->last_rand / (RAND_MAX+1.0));
+    usec = left + (CattaUsec) ((double) (right-left) * c->last_rand / (RAND_MAX+1.0));
 
     e->expiry = e->timestamp;
-    avahi_timeval_add(&e->expiry, usec);
+    catta_timeval_add(&e->expiry, usec);
 
 /*     g_message("wake up in +%lu seconds", e->expiry.tv_sec - e->timestamp.tv_sec); */
 
     update_time_event(c, e);
 }
 
-static void expire_in_one_second(AvahiCache *c, AvahiCacheEntry *e, AvahiCacheEntryState state) {
+static void expire_in_one_second(CattaCache *c, CattaCacheEntry *e, CattaCacheEntryState state) {
     assert(c);
     assert(e);
 
     e->state = state;
     gettimeofday(&e->expiry, NULL);
-    avahi_timeval_add(&e->expiry, 1000000); /* 1s */
+    catta_timeval_add(&e->expiry, 1000000); /* 1s */
     update_time_event(c, e);
 }
 
-void avahi_cache_update(AvahiCache *c, AvahiRecord *r, int cache_flush, const AvahiAddress *a) {
+void catta_cache_update(CattaCache *c, CattaRecord *r, int cache_flush, const CattaAddress *a) {
 /*     char *txt; */
 
     assert(c);
     assert(r && r->ref >= 1);
 
-/*     txt = avahi_record_to_string(r); */
+/*     txt = catta_record_to_string(r); */
 
     if (r->ttl == 0) {
         /* This is a goodbye request */
 
-        AvahiCacheEntry *e;
+        CattaCacheEntry *e;
 
         if ((e = lookup_record(c, r)))
-            expire_in_one_second(c, e, AVAHI_CACHE_GOODBYE_FINAL);
+            expire_in_one_second(c, e, CATTA_CACHE_GOODBYE_FINAL);
 
     } else {
-        AvahiCacheEntry *e = NULL, *first;
+        CattaCacheEntry *e = NULL, *first;
         struct timeval now;
 
         gettimeofday(&now, NULL);
@@ -303,84 +303,84 @@ void avahi_cache_update(AvahiCache *c, AvahiRecord *r, int cache_flush, const Av
 
                 /* For unique entries drop all entries older than one second */
                 for (e = first; e; e = e->by_key_next) {
-                    AvahiUsec t;
+                    CattaUsec t;
 
-                    t = avahi_timeval_diff(&now, &e->timestamp);
+                    t = catta_timeval_diff(&now, &e->timestamp);
 
                     if (t > 1000000)
-                        expire_in_one_second(c, e, AVAHI_CACHE_REPLACE_FINAL);
+                        expire_in_one_second(c, e, CATTA_CACHE_REPLACE_FINAL);
                 }
             }
 
             /* Look for exactly the same entry */
             for (e = first; e; e = e->by_key_next)
-                if (avahi_record_equal_no_ttl(e->record, r))
+                if (catta_record_equal_no_ttl(e->record, r))
                     break;
         }
 
         if (e) {
 
-/*             avahi_log_debug("found matching cache entry");  */
+/*             catta_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)
-                avahi_hashmap_replace(c->hashmap, r->key, e);
+                catta_hashmap_replace(c->hashmap, r->key, e);
 
             /* Update the record */
-            avahi_record_unref(e->record);
-            e->record = avahi_record_ref(r);
+            catta_record_unref(e->record);
+            e->record = catta_record_ref(r);
 
-/*             avahi_log_debug("cache: updating %s", txt);   */
+/*             catta_log_debug("cache: updating %s", txt);   */
 
         } else {
             /* No entry found, therefore we create a new one */
 
-/*             avahi_log_debug("cache: couldn't find matching cache entry for %s", txt);   */
+/*             catta_log_debug("cache: couldn't find matching cache entry for %s", txt);   */
 
             if (c->n_entries >= c->server->config.n_cache_entries_max)
                 return;
 
-            if (!(e = avahi_new(AvahiCacheEntry, 1))) {
-                avahi_log_error(__FILE__": Out of memory");
+            if (!(e = catta_new(CattaCacheEntry, 1))) {
+                catta_log_error(__FILE__": Out of memory");
                 return;
             }
 
             e->cache = c;
             e->time_event = NULL;
-            e->record = avahi_record_ref(r);
+            e->record = catta_record_ref(r);
 
             /* Append to hash table */
-            AVAHI_LLIST_PREPEND(AvahiCacheEntry, by_key, first, e);
-            avahi_hashmap_replace(c->hashmap, e->record->key, first);
+            CATTA_LLIST_PREPEND(CattaCacheEntry, by_key, first, e);
+            catta_hashmap_replace(c->hashmap, e->record->key, first);
 
             /* Append to linked list */
-            AVAHI_LLIST_PREPEND(AvahiCacheEntry, entry, c->entries, e);
+            CATTA_LLIST_PREPEND(CattaCacheEntry, entry, c->entries, e);
 
             c->n_entries++;
 
             /* Notify subscribers */
-            avahi_multicast_lookup_engine_notify(c->server->multicast_lookup_engine, c->interface, e->record, AVAHI_BROWSER_NEW);
+            catta_multicast_lookup_engine_notify(c->server->multicast_lookup_engine, c->interface, e->record, CATTA_BROWSER_NEW);
         }
 
         e->origin = *a;
         e->timestamp = now;
         next_expiry(c, e, 80);
-        e->state = AVAHI_CACHE_VALID;
+        e->state = CATTA_CACHE_VALID;
         e->cache_flush = cache_flush;
     }
 
-/*     avahi_free(txt);  */
+/*     catta_free(txt);  */
 }
 
 struct dump_data {
-    AvahiDumpCallback callback;
+    CattaDumpCallback callback;
     void* userdata;
 };
 
 static void dump_callback(void* key, void* data, void* userdata) {
-    AvahiCacheEntry *e = data;
-    AvahiKey *k = key;
+    CattaCacheEntry *e = data;
+    CattaKey *k = key;
     struct dump_data *dump_data = userdata;
 
     assert(k);
@@ -390,15 +390,15 @@ static void dump_callback(void* key, void* data, void* userdata) {
     for (; e; e = e->by_key_next) {
         char *t;
 
-        if (!(t = avahi_record_to_string(e->record)))
+        if (!(t = catta_record_to_string(e->record)))
             continue; /* OOM */
 
         dump_data->callback(t, dump_data->userdata);
-        avahi_free(t);
+        catta_free(t);
     }
 }
 
-int avahi_cache_dump(AvahiCache *c, AvahiDumpCallback callback, void* userdata) {
+int catta_cache_dump(CattaCache *c, CattaDumpCallback callback, void* userdata) {
     struct dump_data data;
 
     assert(c);
@@ -409,12 +409,12 @@ int avahi_cache_dump(AvahiCache *c, AvahiDumpCallback callback, void* userdata)
     data.callback = callback;
     data.userdata = userdata;
 
-    avahi_hashmap_foreach(c->hashmap, dump_callback, &data);
+    catta_hashmap_foreach(c->hashmap, dump_callback, &data);
 
     return 0;
 }
 
-int avahi_cache_entry_half_ttl(AvahiCache *c, AvahiCacheEntry *e) {
+int catta_cache_entry_half_ttl(CattaCache *c, CattaCacheEntry *e) {
     struct timeval now;
     unsigned age;
 
@@ -423,14 +423,14 @@ int avahi_cache_entry_half_ttl(AvahiCache *c, AvahiCacheEntry *e) {
 
     gettimeofday(&now, NULL);
 
-    age = (unsigned) (avahi_timeval_diff(&now, &e->timestamp)/1000000);
+    age = (unsigned) (catta_timeval_diff(&now, &e->timestamp)/1000000);
 
-/*     avahi_log_debug("age: %lli, ttl/2: %u", age, e->record->ttl);  */
+/*     catta_log_debug("age: %lli, ttl/2: %u", age, e->record->ttl);  */
 
     return age >= e->record->ttl/2;
 }
 
-void avahi_cache_flush(AvahiCache *c) {
+void catta_cache_flush(CattaCache *c) {
     assert(c);
 
     while (c->entries)
@@ -439,8 +439,8 @@ void avahi_cache_flush(AvahiCache *c) {
 
 /*** Passive observation of failure ***/
 
-static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void *userdata) {
-    AvahiAddress *a = userdata;
+static void* start_poof_callback(CattaCache *c, CattaKey *pattern, CattaCacheEntry *e, void *userdata) {
+    CattaAddress *a = userdata;
     struct timeval now;
 
     assert(c);
@@ -451,20 +451,20 @@ static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEnt
     gettimeofday(&now, NULL);
 
     switch (e->state) {
-        case AVAHI_CACHE_VALID:
+        case CATTA_CACHE_VALID:
 
             /* The entry was perfectly valid till, now, so let's enter
              * POOF mode */
 
-            e->state = AVAHI_CACHE_POOF;
+            e->state = CATTA_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)
+        case CATTA_CACHE_POOF:
+            if (catta_timeval_diff(&now, &e->poof_timestamp) < 1000000)
               break;
 
             e->poof_timestamp = now;
@@ -474,7 +474,7 @@ static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEnt
             /* This is the 4th time we got no response, so let's
              * fucking remove this entry. */
             if (e->poof_num > 3)
-              expire_in_one_second(c, e, AVAHI_CACHE_POOF_FINAL);
+              expire_in_one_second(c, e, CATTA_CACHE_POOF_FINAL);
             break;
 
         default:
@@ -484,15 +484,15 @@ static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEnt
     return NULL;
 }
 
-void avahi_cache_start_poof(AvahiCache *c, AvahiKey *key, const AvahiAddress *a) {
+void catta_cache_start_poof(CattaCache *c, CattaKey *key, const CattaAddress *a) {
     assert(c);
     assert(key);
 
-    avahi_cache_walk(c, key, start_poof_callback, (void*) a);
+    catta_cache_walk(c, key, start_poof_callback, (void*) a);
 }
 
-void avahi_cache_stop_poof(AvahiCache *c, AvahiRecord *record, const AvahiAddress *a) {
-    AvahiCacheEntry *e;
+void catta_cache_stop_poof(CattaCache *c, CattaRecord *record, const CattaAddress *a) {
+    CattaCacheEntry *e;
 
     assert(c);
     assert(record);
@@ -505,9 +505,9 @@ void avahi_cache_stop_poof(AvahiCache *c, AvahiRecord *record, const AvahiAddres
        record. If the matching cache entry is in POOF state and the
        query address is the same, we put it back into valid mode */
 
-    if (e->state == AVAHI_CACHE_POOF || e->state == AVAHI_CACHE_POOF_FINAL)
-        if (avahi_address_cmp(a, &e->poof_address) == 0) {
-            e->state = AVAHI_CACHE_VALID;
+    if (e->state == CATTA_CACHE_POOF || e->state == CATTA_CACHE_POOF_FINAL)
+        if (catta_address_cmp(a, &e->poof_address) == 0) {
+            e->state = CATTA_CACHE_VALID;
             next_expiry(c, e, 80);
         }
 }