X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Frr.c;h=eeab99a208cd1196a0310344557cdc192e536317;hb=2c550daf4ac6a6aab7f21047c037b4dd53c57fa6;hp=efab1ce6846aecd3b1116c01397e6969a9ed042c;hpb=37d19f15523b6fe4d1fef2329abe421221b3d4b3;p=catta

diff --git a/src/rr.c b/src/rr.c
index efab1ce..eeab99a 100644
--- a/src/rr.c
+++ b/src/rr.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.
 ***/
@@ -28,30 +28,30 @@
 #include <arpa/inet.h>
 #include <assert.h>
 
-#include <avahi/domain.h>
-#include <avahi/malloc.h>
-#include <avahi/defs.h>
+#include <catta/domain.h>
+#include <catta/malloc.h>
+#include <catta/defs.h>
 
-#include <avahi/rr.h>
-#include <avahi/log.h>
+#include <catta/rr.h>
+#include <catta/log.h>
 #include "util.h"
 #include "hashmap.h"
 #include "domain-util.h"
 #include "rr-util.h"
 #include "addr-util.h"
 
-AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
-    AvahiKey *k;
+CattaKey *catta_key_new(const char *name, uint16_t class, uint16_t type) {
+    CattaKey *k;
     assert(name);
 
-    if (!(k = avahi_new(AvahiKey, 1))) {
-        avahi_log_error("avahi_new() failed.");
+    if (!(k = catta_new(CattaKey, 1))) {
+        catta_log_error("catta_new() failed.");
         return NULL;
     }
 
-    if (!(k->name = avahi_normalize_name_strdup(name))) {
-        avahi_log_error("avahi_normalize_name() failed.");
-        avahi_free(k);
+    if (!(k->name = catta_normalize_name_strdup(name))) {
+        catta_log_error("catta_normalize_name() failed.");
+        catta_free(k);
         return NULL;
     }
 
@@ -62,19 +62,19 @@ AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
     return k;
 }
 
-AvahiKey *avahi_key_new_cname(AvahiKey *key) {
+CattaKey *catta_key_new_cname(CattaKey *key) {
     assert(key);
 
-    if (key->clazz != AVAHI_DNS_CLASS_IN)
+    if (key->clazz != CATTA_DNS_CLASS_IN)
         return NULL;
 
-    if (key->type == AVAHI_DNS_TYPE_CNAME)
+    if (key->type == CATTA_DNS_TYPE_CNAME)
         return NULL;
 
-    return avahi_key_new(key->name, key->clazz, AVAHI_DNS_TYPE_CNAME);
+    return catta_key_new(key->name, key->clazz, CATTA_DNS_TYPE_CNAME);
 }
 
-AvahiKey *avahi_key_ref(AvahiKey *k) {
+CattaKey *catta_key_ref(CattaKey *k) {
     assert(k);
     assert(k->ref >= 1);
 
@@ -83,59 +83,59 @@ AvahiKey *avahi_key_ref(AvahiKey *k) {
     return k;
 }
 
-void avahi_key_unref(AvahiKey *k) {
+void catta_key_unref(CattaKey *k) {
     assert(k);
     assert(k->ref >= 1);
 
     if ((--k->ref) <= 0) {
-        avahi_free(k->name);
-        avahi_free(k);
+        catta_free(k->name);
+        catta_free(k);
     }
 }
 
-AvahiRecord *avahi_record_new(AvahiKey *k, uint32_t ttl) {
-    AvahiRecord *r;
+CattaRecord *catta_record_new(CattaKey *k, uint32_t ttl) {
+    CattaRecord *r;
 
     assert(k);
 
-    if (!(r = avahi_new(AvahiRecord, 1))) {
-        avahi_log_error("avahi_new() failed.");
+    if (!(r = catta_new(CattaRecord, 1))) {
+        catta_log_error("catta_new() failed.");
         return NULL;
     }
 
     r->ref = 1;
-    r->key = avahi_key_ref(k);
+    r->key = catta_key_ref(k);
 
     memset(&r->data, 0, sizeof(r->data));
 
-    r->ttl = ttl != (uint32_t) -1 ? ttl : AVAHI_DEFAULT_TTL;
+    r->ttl = ttl != (uint32_t) -1 ? ttl : CATTA_DEFAULT_TTL;
 
     return r;
 }
 
-AvahiRecord *avahi_record_new_full(const char *name, uint16_t class, uint16_t type, uint32_t ttl) {
-    AvahiRecord *r;
-    AvahiKey *k;
+CattaRecord *catta_record_new_full(const char *name, uint16_t class, uint16_t type, uint32_t ttl) {
+    CattaRecord *r;
+    CattaKey *k;
 
     assert(name);
 
-    if (!(k = avahi_key_new(name, class, type))) {
-        avahi_log_error("avahi_key_new() failed.");
+    if (!(k = catta_key_new(name, class, type))) {
+        catta_log_error("catta_key_new() failed.");
         return NULL;
     }
 
-    r = avahi_record_new(k, ttl);
-    avahi_key_unref(k);
+    r = catta_record_new(k, ttl);
+    catta_key_unref(k);
 
     if (!r) {
-        avahi_log_error("avahi_record_new() failed.");
+        catta_log_error("catta_record_new() failed.");
         return NULL;
     }
 
     return r;
 }
 
-AvahiRecord *avahi_record_ref(AvahiRecord *r) {
+CattaRecord *catta_record_ref(CattaRecord *r) {
     assert(r);
     assert(r->ref >= 1);
 
@@ -143,87 +143,87 @@ AvahiRecord *avahi_record_ref(AvahiRecord *r) {
     return r;
 }
 
-void avahi_record_unref(AvahiRecord *r) {
+void catta_record_unref(CattaRecord *r) {
     assert(r);
     assert(r->ref >= 1);
 
     if ((--r->ref) <= 0) {
         switch (r->key->type) {
 
-            case AVAHI_DNS_TYPE_SRV:
-                avahi_free(r->data.srv.name);
+            case CATTA_DNS_TYPE_SRV:
+                catta_free(r->data.srv.name);
                 break;
 
-            case AVAHI_DNS_TYPE_PTR:
-            case AVAHI_DNS_TYPE_CNAME:
-            case AVAHI_DNS_TYPE_NS:
-                avahi_free(r->data.ptr.name);
+            case CATTA_DNS_TYPE_PTR:
+            case CATTA_DNS_TYPE_CNAME:
+            case CATTA_DNS_TYPE_NS:
+                catta_free(r->data.ptr.name);
                 break;
 
-            case AVAHI_DNS_TYPE_HINFO:
-                avahi_free(r->data.hinfo.cpu);
-                avahi_free(r->data.hinfo.os);
+            case CATTA_DNS_TYPE_HINFO:
+                catta_free(r->data.hinfo.cpu);
+                catta_free(r->data.hinfo.os);
                 break;
 
-            case AVAHI_DNS_TYPE_TXT:
-                avahi_string_list_free(r->data.txt.string_list);
+            case CATTA_DNS_TYPE_TXT:
+                catta_string_list_free(r->data.txt.string_list);
                 break;
 
-            case AVAHI_DNS_TYPE_A:
-            case AVAHI_DNS_TYPE_AAAA:
+            case CATTA_DNS_TYPE_A:
+            case CATTA_DNS_TYPE_AAAA:
                 break;
 
             default:
-                avahi_free(r->data.generic.data);
+                catta_free(r->data.generic.data);
         }
 
-        avahi_key_unref(r->key);
-        avahi_free(r);
+        catta_key_unref(r->key);
+        catta_free(r);
     }
 }
 
-const char *avahi_dns_class_to_string(uint16_t class) {
-    if (class & AVAHI_DNS_CACHE_FLUSH)
+const char *catta_dns_class_to_string(uint16_t class) {
+    if (class & CATTA_DNS_CACHE_FLUSH)
         return "FLUSH";
 
     switch (class) {
-        case AVAHI_DNS_CLASS_IN:
+        case CATTA_DNS_CLASS_IN:
             return "IN";
-        case AVAHI_DNS_CLASS_ANY:
+        case CATTA_DNS_CLASS_ANY:
             return "ANY";
         default:
             return NULL;
     }
 }
 
-const char *avahi_dns_type_to_string(uint16_t type) {
+const char *catta_dns_type_to_string(uint16_t type) {
     switch (type) {
-        case AVAHI_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_CNAME:
             return "CNAME";
-        case AVAHI_DNS_TYPE_A:
+        case CATTA_DNS_TYPE_A:
             return "A";
-        case AVAHI_DNS_TYPE_AAAA:
+        case CATTA_DNS_TYPE_AAAA:
             return "AAAA";
-        case AVAHI_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_PTR:
             return "PTR";
-        case AVAHI_DNS_TYPE_HINFO:
+        case CATTA_DNS_TYPE_HINFO:
             return "HINFO";
-        case AVAHI_DNS_TYPE_TXT:
+        case CATTA_DNS_TYPE_TXT:
             return "TXT";
-        case AVAHI_DNS_TYPE_SRV:
+        case CATTA_DNS_TYPE_SRV:
             return "SRV";
-        case AVAHI_DNS_TYPE_ANY:
+        case CATTA_DNS_TYPE_ANY:
             return "ANY";
-        case AVAHI_DNS_TYPE_SOA:
+        case CATTA_DNS_TYPE_SOA:
             return "SOA";
-        case AVAHI_DNS_TYPE_NS:
+        case CATTA_DNS_TYPE_NS:
             return "NS";
         default:
             return NULL;
     }
 }
 
-char *avahi_key_to_string(const AvahiKey *k) {
+char *catta_key_to_string(const CattaKey *k) {
     char class[16], type[16];
     const char *c, *t;
 
@@ -232,20 +232,20 @@ char *avahi_key_to_string(const AvahiKey *k) {
 
     /* According to RFC3597 */
 
-    if (!(c = avahi_dns_class_to_string(k->clazz))) {
+    if (!(c = catta_dns_class_to_string(k->clazz))) {
         snprintf(class, sizeof(class), "CLASS%u", k->clazz);
         c = class;
     }
 
-    if (!(t = avahi_dns_type_to_string(k->type))) {
+    if (!(t = catta_dns_type_to_string(k->type))) {
         snprintf(type, sizeof(type), "TYPE%u", k->type);
         t = type;
     }
 
-    return avahi_strdup_printf("%s\t%s\t%s", k->name, c, t);
+    return catta_strdup_printf("%s\t%s\t%s", k->name, c, t);
 }
 
-char *avahi_record_to_string(const AvahiRecord *r) {
+char *catta_record_to_string(const CattaRecord *r) {
     char *p, *s;
     char buf[1024], *t = NULL, *d = NULL;
 
@@ -253,31 +253,31 @@ char *avahi_record_to_string(const AvahiRecord *r) {
     assert(r->ref >= 1);
 
     switch (r->key->type) {
-        case AVAHI_DNS_TYPE_A:
+        case CATTA_DNS_TYPE_A:
             inet_ntop(AF_INET, &r->data.a.address.address, t = buf, sizeof(buf));
             break;
 
-        case AVAHI_DNS_TYPE_AAAA:
+        case CATTA_DNS_TYPE_AAAA:
             inet_ntop(AF_INET6, &r->data.aaaa.address.address, t = buf, sizeof(buf));
             break;
 
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
 
             t = r->data.ptr.name;
             break;
 
-        case AVAHI_DNS_TYPE_TXT:
-            t = d = avahi_string_list_to_string(r->data.txt.string_list);
+        case CATTA_DNS_TYPE_TXT:
+            t = d = catta_string_list_to_string(r->data.txt.string_list);
             break;
 
-        case AVAHI_DNS_TYPE_HINFO:
+        case CATTA_DNS_TYPE_HINFO:
 
             snprintf(t = buf, sizeof(buf), "\"%s\" \"%s\"", r->data.hinfo.cpu, r->data.hinfo.os);
             break;
 
-        case AVAHI_DNS_TYPE_SRV:
+        case CATTA_DNS_TYPE_SRV:
 
             snprintf(t = buf, sizeof(buf), "%u %u %u %s",
                      r->data.srv.priority,
@@ -312,88 +312,88 @@ char *avahi_record_to_string(const AvahiRecord *r) {
         }
     }
 
-    p = avahi_key_to_string(r->key);
-    s = avahi_strdup_printf("%s %s ; ttl=%u", p, t, r->ttl);
-    avahi_free(p);
-    avahi_free(d);
+    p = catta_key_to_string(r->key);
+    s = catta_strdup_printf("%s %s ; ttl=%u", p, t, r->ttl);
+    catta_free(p);
+    catta_free(d);
 
     return s;
 }
 
-int avahi_key_equal(const AvahiKey *a, const AvahiKey *b) {
+int catta_key_equal(const CattaKey *a, const CattaKey *b) {
     assert(a);
     assert(b);
 
     if (a == b)
         return 1;
 
-    return avahi_domain_equal(a->name, b->name) &&
+    return catta_domain_equal(a->name, b->name) &&
         a->type == b->type &&
         a->clazz == b->clazz;
 }
 
-int avahi_key_pattern_match(const AvahiKey *pattern, const AvahiKey *k) {
+int catta_key_pattern_match(const CattaKey *pattern, const CattaKey *k) {
     assert(pattern);
     assert(k);
 
-    assert(!avahi_key_is_pattern(k));
+    assert(!catta_key_is_pattern(k));
 
     if (pattern == k)
         return 1;
 
-    return avahi_domain_equal(pattern->name, k->name) &&
-        (pattern->type == k->type || pattern->type == AVAHI_DNS_TYPE_ANY) &&
-        (pattern->clazz == k->clazz || pattern->clazz == AVAHI_DNS_CLASS_ANY);
+    return catta_domain_equal(pattern->name, k->name) &&
+        (pattern->type == k->type || pattern->type == CATTA_DNS_TYPE_ANY) &&
+        (pattern->clazz == k->clazz || pattern->clazz == CATTA_DNS_CLASS_ANY);
 }
 
-int avahi_key_is_pattern(const AvahiKey *k) {
+int catta_key_is_pattern(const CattaKey *k) {
     assert(k);
 
     return
-        k->type == AVAHI_DNS_TYPE_ANY ||
-        k->clazz == AVAHI_DNS_CLASS_ANY;
+        k->type == CATTA_DNS_TYPE_ANY ||
+        k->clazz == CATTA_DNS_CLASS_ANY;
 }
 
-unsigned avahi_key_hash(const AvahiKey *k) {
+unsigned catta_key_hash(const CattaKey *k) {
     assert(k);
 
     return
-        avahi_domain_hash(k->name) +
+        catta_domain_hash(k->name) +
         k->type +
         k->clazz;
 }
 
-static int rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
+static int rdata_equal(const CattaRecord *a, const CattaRecord *b) {
     assert(a);
     assert(b);
     assert(a->key->type == b->key->type);
 
     switch (a->key->type) {
-        case AVAHI_DNS_TYPE_SRV:
+        case CATTA_DNS_TYPE_SRV:
             return
                 a->data.srv.priority == b->data.srv.priority &&
                 a->data.srv.weight == b->data.srv.weight &&
                 a->data.srv.port == b->data.srv.port &&
-                avahi_domain_equal(a->data.srv.name, b->data.srv.name);
+                catta_domain_equal(a->data.srv.name, b->data.srv.name);
 
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
-            return avahi_domain_equal(a->data.ptr.name, b->data.ptr.name);
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
+            return catta_domain_equal(a->data.ptr.name, b->data.ptr.name);
 
-        case AVAHI_DNS_TYPE_HINFO:
+        case CATTA_DNS_TYPE_HINFO:
             return
                 !strcmp(a->data.hinfo.cpu, b->data.hinfo.cpu) &&
                 !strcmp(a->data.hinfo.os, b->data.hinfo.os);
 
-        case AVAHI_DNS_TYPE_TXT:
-            return avahi_string_list_equal(a->data.txt.string_list, b->data.txt.string_list);
+        case CATTA_DNS_TYPE_TXT:
+            return catta_string_list_equal(a->data.txt.string_list, b->data.txt.string_list);
 
-        case AVAHI_DNS_TYPE_A:
-            return memcmp(&a->data.a.address, &b->data.a.address, sizeof(AvahiIPv4Address)) == 0;
+        case CATTA_DNS_TYPE_A:
+            return memcmp(&a->data.a.address, &b->data.a.address, sizeof(CattaIPv4Address)) == 0;
 
-        case AVAHI_DNS_TYPE_AAAA:
-            return memcmp(&a->data.aaaa.address, &b->data.aaaa.address, sizeof(AvahiIPv6Address)) == 0;
+        case CATTA_DNS_TYPE_AAAA:
+            return memcmp(&a->data.aaaa.address, &b->data.aaaa.address, sizeof(CattaIPv6Address)) == 0;
 
         default:
             return a->data.generic.size == b->data.generic.size &&
@@ -402,7 +402,7 @@ static int rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
 
 }
 
-int avahi_record_equal_no_ttl(const AvahiRecord *a, const AvahiRecord *b) {
+int catta_record_equal_no_ttl(const CattaRecord *a, const CattaRecord *b) {
     assert(a);
     assert(b);
 
@@ -410,63 +410,63 @@ int avahi_record_equal_no_ttl(const AvahiRecord *a, const AvahiRecord *b) {
         return 1;
 
     return
-        avahi_key_equal(a->key, b->key) &&
+        catta_key_equal(a->key, b->key) &&
         rdata_equal(a, b);
 }
 
 
-AvahiRecord *avahi_record_copy(AvahiRecord *r) {
-    AvahiRecord *copy;
+CattaRecord *catta_record_copy(CattaRecord *r) {
+    CattaRecord *copy;
 
-    if (!(copy = avahi_new(AvahiRecord, 1))) {
-        avahi_log_error("avahi_new() failed.");
+    if (!(copy = catta_new(CattaRecord, 1))) {
+        catta_log_error("catta_new() failed.");
         return NULL;
     }
 
     copy->ref = 1;
-    copy->key = avahi_key_ref(r->key);
+    copy->key = catta_key_ref(r->key);
     copy->ttl = r->ttl;
 
     switch (r->key->type) {
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
-            if (!(copy->data.ptr.name = avahi_strdup(r->data.ptr.name)))
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
+            if (!(copy->data.ptr.name = catta_strdup(r->data.ptr.name)))
                 goto fail;
             break;
 
-        case AVAHI_DNS_TYPE_SRV:
+        case CATTA_DNS_TYPE_SRV:
             copy->data.srv.priority = r->data.srv.priority;
             copy->data.srv.weight = r->data.srv.weight;
             copy->data.srv.port = r->data.srv.port;
-            if (!(copy->data.srv.name = avahi_strdup(r->data.srv.name)))
+            if (!(copy->data.srv.name = catta_strdup(r->data.srv.name)))
                 goto fail;
             break;
 
-        case AVAHI_DNS_TYPE_HINFO:
-            if (!(copy->data.hinfo.os = avahi_strdup(r->data.hinfo.os)))
+        case CATTA_DNS_TYPE_HINFO:
+            if (!(copy->data.hinfo.os = catta_strdup(r->data.hinfo.os)))
                 goto fail;
 
-            if (!(copy->data.hinfo.cpu = avahi_strdup(r->data.hinfo.cpu))) {
-                avahi_free(r->data.hinfo.os);
+            if (!(copy->data.hinfo.cpu = catta_strdup(r->data.hinfo.cpu))) {
+                catta_free(r->data.hinfo.os);
                 goto fail;
             }
             break;
 
-        case AVAHI_DNS_TYPE_TXT:
-            copy->data.txt.string_list = avahi_string_list_copy(r->data.txt.string_list);
+        case CATTA_DNS_TYPE_TXT:
+            copy->data.txt.string_list = catta_string_list_copy(r->data.txt.string_list);
             break;
 
-        case AVAHI_DNS_TYPE_A:
+        case CATTA_DNS_TYPE_A:
             copy->data.a.address = r->data.a.address;
             break;
 
-        case AVAHI_DNS_TYPE_AAAA:
+        case CATTA_DNS_TYPE_AAAA:
             copy->data.aaaa.address = r->data.aaaa.address;
             break;
 
         default:
-            if (!(copy->data.generic.data = avahi_memdup(r->data.generic.data, r->data.generic.size)))
+            if (!(copy->data.generic.data = catta_memdup(r->data.generic.data, r->data.generic.size)))
                 goto fail;
             copy->data.generic.size = r->data.generic.size;
             break;
@@ -476,52 +476,52 @@ AvahiRecord *avahi_record_copy(AvahiRecord *r) {
     return copy;
 
 fail:
-    avahi_log_error("Failed to allocate memory");
+    catta_log_error("Failed to allocate memory");
 
-    avahi_key_unref(copy->key);
-    avahi_free(copy);
+    catta_key_unref(copy->key);
+    catta_free(copy);
 
     return NULL;
 }
 
 
-size_t avahi_key_get_estimate_size(AvahiKey *k) {
+size_t catta_key_get_estimate_size(CattaKey *k) {
     assert(k);
 
     return strlen(k->name)+1+4;
 }
 
-size_t avahi_record_get_estimate_size(AvahiRecord *r) {
+size_t catta_record_get_estimate_size(CattaRecord *r) {
     size_t n;
     assert(r);
 
-    n = avahi_key_get_estimate_size(r->key) + 4 + 2;
+    n = catta_key_get_estimate_size(r->key) + 4 + 2;
 
     switch (r->key->type) {
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
             n += strlen(r->data.ptr.name) + 1;
             break;
 
-        case AVAHI_DNS_TYPE_SRV:
+        case CATTA_DNS_TYPE_SRV:
             n += 6 + strlen(r->data.srv.name) + 1;
             break;
 
-        case AVAHI_DNS_TYPE_HINFO:
+        case CATTA_DNS_TYPE_HINFO:
             n += strlen(r->data.hinfo.os) + 1 + strlen(r->data.hinfo.cpu) + 1;
             break;
 
-        case AVAHI_DNS_TYPE_TXT:
-            n += avahi_string_list_serialize(r->data.txt.string_list, NULL, 0);
+        case CATTA_DNS_TYPE_TXT:
+            n += catta_string_list_serialize(r->data.txt.string_list, NULL, 0);
             break;
 
-        case AVAHI_DNS_TYPE_A:
-            n += sizeof(AvahiIPv4Address);
+        case CATTA_DNS_TYPE_A:
+            n += sizeof(CattaIPv4Address);
             break;
 
-        case AVAHI_DNS_TYPE_AAAA:
-            n += sizeof(AvahiIPv6Address);
+        case CATTA_DNS_TYPE_AAAA:
+            n += sizeof(CattaIPv6Address);
             break;
 
         default:
@@ -552,18 +552,18 @@ static int uint16_cmp(uint16_t a, uint16_t b) {
     return a == b ? 0 : (a < b ? -1 : 1);
 }
 
-int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
+int catta_record_lexicographical_compare(CattaRecord *a, CattaRecord *b) {
     int r;
 /*      char *t1, *t2; */
 
     assert(a);
     assert(b);
 
-/*     t1 = avahi_record_to_string(a); */
-/*     t2 = avahi_record_to_string(b); */
+/*     t1 = catta_record_to_string(a); */
+/*     t2 = catta_record_to_string(b); */
 /*     g_message("lexicocmp: %s %s", t1, t2); */
-/*     avahi_free(t1); */
-/*     avahi_free(t2); */
+/*     catta_free(t1); */
+/*     catta_free(t2); */
 
     if (a == b)
         return 0;
@@ -574,21 +574,21 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
 
     switch (a->key->type) {
 
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
-            return avahi_binary_domain_cmp(a->data.ptr.name, b->data.ptr.name);
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
+            return catta_binary_domain_cmp(a->data.ptr.name, b->data.ptr.name);
 
-        case AVAHI_DNS_TYPE_SRV: {
+        case CATTA_DNS_TYPE_SRV: {
             if ((r = uint16_cmp(a->data.srv.priority, b->data.srv.priority)) == 0 &&
                 (r = uint16_cmp(a->data.srv.weight, b->data.srv.weight)) == 0 &&
                 (r = uint16_cmp(a->data.srv.port, b->data.srv.port)) == 0)
-                r = avahi_binary_domain_cmp(a->data.srv.name, b->data.srv.name);
+                r = catta_binary_domain_cmp(a->data.srv.name, b->data.srv.name);
 
             return r;
         }
 
-        case AVAHI_DNS_TYPE_HINFO: {
+        case CATTA_DNS_TYPE_HINFO: {
 
             if ((r = strcmp(a->data.hinfo.cpu, b->data.hinfo.cpu)) ||
                 (r = strcmp(a->data.hinfo.os, b->data.hinfo.os)))
@@ -598,24 +598,24 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
 
         }
 
-        case AVAHI_DNS_TYPE_TXT: {
+        case CATTA_DNS_TYPE_TXT: {
 
             uint8_t *ma = NULL, *mb = NULL;
             size_t asize, bsize;
 
-            asize = avahi_string_list_serialize(a->data.txt.string_list, NULL, 0);
-            bsize = avahi_string_list_serialize(b->data.txt.string_list, NULL, 0);
+            asize = catta_string_list_serialize(a->data.txt.string_list, NULL, 0);
+            bsize = catta_string_list_serialize(b->data.txt.string_list, NULL, 0);
 
-            if (asize > 0 && !(ma = avahi_new(uint8_t, asize)))
+            if (asize > 0 && !(ma = catta_new(uint8_t, asize)))
                 goto fail;
 
-            if (bsize > 0 && !(mb = avahi_new(uint8_t, bsize))) {
-                avahi_free(ma);
+            if (bsize > 0 && !(mb = catta_new(uint8_t, bsize))) {
+                catta_free(ma);
                 goto fail;
             }
 
-            avahi_string_list_serialize(a->data.txt.string_list, ma, asize);
-            avahi_string_list_serialize(b->data.txt.string_list, mb, bsize);
+            catta_string_list_serialize(a->data.txt.string_list, ma, asize);
+            catta_string_list_serialize(b->data.txt.string_list, mb, bsize);
 
             if (asize && bsize)
                 r = lexicographical_memcmp(ma, asize, mb, bsize);
@@ -626,17 +626,17 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
             else
                 r = 0;
 
-            avahi_free(ma);
-            avahi_free(mb);
+            catta_free(ma);
+            catta_free(mb);
 
             return r;
         }
 
-        case AVAHI_DNS_TYPE_A:
-            return memcmp(&a->data.a.address, &b->data.a.address, sizeof(AvahiIPv4Address));
+        case CATTA_DNS_TYPE_A:
+            return memcmp(&a->data.a.address, &b->data.a.address, sizeof(CattaIPv4Address));
 
-        case AVAHI_DNS_TYPE_AAAA:
-            return memcmp(&a->data.aaaa.address, &b->data.aaaa.address, sizeof(AvahiIPv6Address));
+        case CATTA_DNS_TYPE_AAAA:
+            return memcmp(&a->data.aaaa.address, &b->data.aaaa.address, sizeof(CattaIPv6Address));
 
         default:
             return lexicographical_memcmp(a->data.generic.data, a->data.generic.size,
@@ -645,49 +645,49 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
 
 
 fail:
-    avahi_log_error(__FILE__": Out of memory");
+    catta_log_error(__FILE__": Out of memory");
     return -1; /* or whatever ... */
 }
 
-int avahi_record_is_goodbye(AvahiRecord *r) {
+int catta_record_is_goodbye(CattaRecord *r) {
     assert(r);
 
     return r->ttl == 0;
 }
 
-int avahi_key_is_valid(AvahiKey *k) {
+int catta_key_is_valid(CattaKey *k) {
     assert(k);
 
-    if (!avahi_is_valid_domain_name(k->name))
+    if (!catta_is_valid_domain_name(k->name))
         return 0;
 
     return 1;
 }
 
-int avahi_record_is_valid(AvahiRecord *r) {
+int catta_record_is_valid(CattaRecord *r) {
     assert(r);
 
-    if (!avahi_key_is_valid(r->key))
+    if (!catta_key_is_valid(r->key))
         return 0;
 
     switch (r->key->type) {
 
-        case AVAHI_DNS_TYPE_PTR:
-        case AVAHI_DNS_TYPE_CNAME:
-        case AVAHI_DNS_TYPE_NS:
-            return avahi_is_valid_domain_name(r->data.ptr.name);
+        case CATTA_DNS_TYPE_PTR:
+        case CATTA_DNS_TYPE_CNAME:
+        case CATTA_DNS_TYPE_NS:
+            return catta_is_valid_domain_name(r->data.ptr.name);
 
-        case AVAHI_DNS_TYPE_SRV:
-            return avahi_is_valid_domain_name(r->data.srv.name);
+        case CATTA_DNS_TYPE_SRV:
+            return catta_is_valid_domain_name(r->data.srv.name);
 
-        case AVAHI_DNS_TYPE_HINFO:
+        case CATTA_DNS_TYPE_HINFO:
             return
                 strlen(r->data.hinfo.os) <= 255 &&
                 strlen(r->data.hinfo.cpu) <= 255;
 
-        case AVAHI_DNS_TYPE_TXT: {
+        case CATTA_DNS_TYPE_TXT: {
 
-            AvahiStringList *strlst;
+            CattaStringList *strlst;
 
             for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next)
                 if (strlst->size > 255 || strlst->size <= 0)
@@ -700,17 +700,17 @@ int avahi_record_is_valid(AvahiRecord *r) {
     return 1;
 }
 
-static AvahiAddress *get_address(const AvahiRecord *r, AvahiAddress *a) {
+static CattaAddress *get_address(const CattaRecord *r, CattaAddress *a) {
     assert(r);
 
     switch (r->key->type) {
-        case AVAHI_DNS_TYPE_A:
-            a->proto = AVAHI_PROTO_INET;
+        case CATTA_DNS_TYPE_A:
+            a->proto = CATTA_PROTO_INET;
             a->data.ipv4 = r->data.a.address;
             break;
 
-        case AVAHI_DNS_TYPE_AAAA:
-            a->proto = AVAHI_PROTO_INET6;
+        case CATTA_DNS_TYPE_AAAA:
+            a->proto = CATTA_PROTO_INET6;
             a->data.ipv6 = r->data.aaaa.address;
             break;
 
@@ -721,13 +721,13 @@ static AvahiAddress *get_address(const AvahiRecord *r, AvahiAddress *a) {
     return a;
 }
 
-int avahi_record_is_link_local_address(const AvahiRecord *r) {
-    AvahiAddress a;
+int catta_record_is_link_local_address(const CattaRecord *r) {
+    CattaAddress a;
 
     assert(r);
 
     if (!get_address(r, &a))
         return 0;
 
-    return avahi_address_is_link_local(&a);
+    return catta_address_is_link_local(&a);
 }