X-Git-Url: http://git.meshlink.io/?p=catta;a=blobdiff_plain;f=src%2Fresolve-address.c;h=48dba8d0da488eb4e4f97c1c6ddbc5597ce399be;hp=f24bee95753fdfbfc6a0dedd4577e76fceca4b95;hb=2c550daf4ac6a6aab7f21047c037b4dd53c57fa6;hpb=37d19f15523b6fe4d1fef2329abe421221b3d4b3

diff --git a/src/resolve-address.c b/src/resolve-address.c
index f24bee9..48dba8d 100644
--- a/src/resolve-address.c
+++ b/src/resolve-address.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.
 ***/
@@ -23,144 +23,144 @@
 
 #include <stdlib.h>
 
-#include <avahi/timeval.h>
-#include <avahi/malloc.h>
-#include <avahi/error.h>
-#include <avahi/domain.h>
+#include <catta/timeval.h>
+#include <catta/malloc.h>
+#include <catta/error.h>
+#include <catta/domain.h>
 
 #include "browse.h"
 
 #define TIMEOUT_MSEC 5000
 
-struct AvahiSAddressResolver {
-    AvahiServer *server;
-    AvahiAddress address;
+struct CattaSAddressResolver {
+    CattaServer *server;
+    CattaAddress address;
 
-    AvahiSRecordBrowser *record_browser;
+    CattaSRecordBrowser *record_browser;
 
-    AvahiSAddressResolverCallback callback;
+    CattaSAddressResolverCallback callback;
     void* userdata;
 
-    AvahiRecord *ptr_record;
-    AvahiIfIndex interface;
-    AvahiProtocol protocol;
-    AvahiLookupResultFlags flags;
+    CattaRecord *ptr_record;
+    CattaIfIndex interface;
+    CattaProtocol protocol;
+    CattaLookupResultFlags flags;
 
     int retry_with_multicast;
-    AvahiKey *key;
+    CattaKey *key;
 
-    AvahiTimeEvent *time_event;
+    CattaTimeEvent *time_event;
 
-    AVAHI_LLIST_FIELDS(AvahiSAddressResolver, resolver);
+    CATTA_LLIST_FIELDS(CattaSAddressResolver, resolver);
 };
 
-static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
+static void finish(CattaSAddressResolver *r, CattaResolverEvent event) {
     assert(r);
 
     if (r->time_event) {
-        avahi_time_event_free(r->time_event);
+        catta_time_event_free(r->time_event);
         r->time_event = NULL;
     }
 
     switch (event) {
-        case AVAHI_RESOLVER_FAILURE:
+        case CATTA_RESOLVER_FAILURE:
             r->callback(r, r->interface, r->protocol, event, &r->address, NULL, r->flags, r->userdata);
             break;
 
-        case AVAHI_RESOLVER_FOUND:
+        case CATTA_RESOLVER_FOUND:
             assert(r->ptr_record);
             r->callback(r, r->interface, r->protocol, event, &r->address, r->ptr_record->data.ptr.name, r->flags, r->userdata);
             break;
     }
 }
 
-static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
-    AvahiSAddressResolver *r = userdata;
+static void time_event_callback(CattaTimeEvent *e, void *userdata) {
+    CattaSAddressResolver *r = userdata;
 
     assert(e);
     assert(r);
 
-    avahi_server_set_errno(r->server, AVAHI_ERR_TIMEOUT);
-    finish(r, AVAHI_RESOLVER_FAILURE);
+    catta_server_set_errno(r->server, CATTA_ERR_TIMEOUT);
+    finish(r, CATTA_RESOLVER_FAILURE);
 }
 
-static void start_timeout(AvahiSAddressResolver *r) {
+static void start_timeout(CattaSAddressResolver *r) {
     struct timeval tv;
     assert(r);
 
     if (r->time_event)
         return;
 
-    avahi_elapse_time(&tv, TIMEOUT_MSEC, 0);
-    r->time_event = avahi_time_event_new(r->server->time_event_queue, &tv, time_event_callback, r);
+    catta_elapse_time(&tv, TIMEOUT_MSEC, 0);
+    r->time_event = catta_time_event_new(r->server->time_event_queue, &tv, time_event_callback, r);
 }
 
 static void record_browser_callback(
-    AvahiSRecordBrowser*rr,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiBrowserEvent event,
-    AvahiRecord *record,
-    AvahiLookupResultFlags flags,
+    CattaSRecordBrowser*rr,
+    CattaIfIndex interface,
+    CattaProtocol protocol,
+    CattaBrowserEvent event,
+    CattaRecord *record,
+    CattaLookupResultFlags flags,
     void* userdata) {
 
-    AvahiSAddressResolver *r = userdata;
+    CattaSAddressResolver *r = userdata;
 
     assert(rr);
     assert(r);
 
     switch (event) {
-        case AVAHI_BROWSER_NEW:
+        case CATTA_BROWSER_NEW:
             assert(record);
-            assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+            assert(record->key->type == CATTA_DNS_TYPE_PTR);
 
             if (r->interface > 0 && interface != r->interface)
                 return;
 
-            if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
+            if (r->protocol != CATTA_PROTO_UNSPEC && protocol != r->protocol)
                 return;
 
             if (r->interface <= 0)
                 r->interface = interface;
 
-            if (r->protocol == AVAHI_PROTO_UNSPEC)
+            if (r->protocol == CATTA_PROTO_UNSPEC)
                 r->protocol = protocol;
 
             if (!r->ptr_record) {
-                r->ptr_record = avahi_record_ref(record);
+                r->ptr_record = catta_record_ref(record);
                 r->flags = flags;
 
-                finish(r, AVAHI_RESOLVER_FOUND);
+                finish(r, CATTA_RESOLVER_FOUND);
             }
             break;
 
-        case AVAHI_BROWSER_REMOVE:
+        case CATTA_BROWSER_REMOVE:
             assert(record);
-            assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+            assert(record->key->type == CATTA_DNS_TYPE_PTR);
 
-            if (r->ptr_record && avahi_record_equal_no_ttl(record, r->ptr_record)) {
-                avahi_record_unref(r->ptr_record);
+            if (r->ptr_record && catta_record_equal_no_ttl(record, r->ptr_record)) {
+                catta_record_unref(r->ptr_record);
                 r->ptr_record = NULL;
                 r->flags = flags;
 
                 /** Look for a replacement */
-                avahi_s_record_browser_restart(r->record_browser);
+                catta_s_record_browser_restart(r->record_browser);
                 start_timeout(r);
             }
 
             break;
 
-        case AVAHI_BROWSER_CACHE_EXHAUSTED:
-        case AVAHI_BROWSER_ALL_FOR_NOW:
+        case CATTA_BROWSER_CACHE_EXHAUSTED:
+        case CATTA_BROWSER_ALL_FOR_NOW:
             break;
 
-        case AVAHI_BROWSER_FAILURE:
+        case CATTA_BROWSER_FAILURE:
 
             if (r->retry_with_multicast) {
                 r->retry_with_multicast = 0;
 
-                avahi_s_record_browser_free(r->record_browser);
-                r->record_browser = avahi_s_record_browser_new(r->server, r->interface, r->protocol, r->key, AVAHI_LOOKUP_USE_MULTICAST, record_browser_callback, r);
+                catta_s_record_browser_free(r->record_browser);
+                r->record_browser = catta_s_record_browser_new(r->server, r->interface, r->protocol, r->key, CATTA_LOOKUP_USE_MULTICAST, record_browser_callback, r);
 
                 if (r->record_browser) {
                     start_timeout(r);
@@ -169,43 +169,43 @@ static void record_browser_callback(
             }
 
             r->flags = flags;
-            finish(r, AVAHI_RESOLVER_FAILURE);
+            finish(r, CATTA_RESOLVER_FAILURE);
             break;
     }
 }
 
-AvahiSAddressResolver *avahi_s_address_resolver_new(
-    AvahiServer *server,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    const AvahiAddress *address,
-    AvahiLookupFlags flags,
-    AvahiSAddressResolverCallback callback,
+CattaSAddressResolver *catta_s_address_resolver_new(
+    CattaServer *server,
+    CattaIfIndex interface,
+    CattaProtocol protocol,
+    const CattaAddress *address,
+    CattaLookupFlags flags,
+    CattaSAddressResolverCallback callback,
     void* userdata) {
 
-    AvahiSAddressResolver *r;
-    AvahiKey *k;
-    char n[AVAHI_DOMAIN_NAME_MAX];
+    CattaSAddressResolver *r;
+    CattaKey *k;
+    char n[CATTA_DOMAIN_NAME_MAX];
 
     assert(server);
     assert(address);
     assert(callback);
 
-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE);
-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, address->proto == AVAHI_PROTO_INET || address->proto == AVAHI_PROTO_INET6, AVAHI_ERR_INVALID_PROTOCOL);
-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
+    CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_IF_VALID(interface), CATTA_ERR_INVALID_INTERFACE);
+    CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_PROTO_VALID(protocol), CATTA_ERR_INVALID_PROTOCOL);
+    CATTA_CHECK_VALIDITY_RETURN_NULL(server, address->proto == CATTA_PROTO_INET || address->proto == CATTA_PROTO_INET6, CATTA_ERR_INVALID_PROTOCOL);
+    CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_FLAGS_VALID(flags, CATTA_LOOKUP_USE_WIDE_AREA|CATTA_LOOKUP_USE_MULTICAST), CATTA_ERR_INVALID_FLAGS);
 
-    avahi_reverse_lookup_name(address, n, sizeof(n));
+    catta_reverse_lookup_name(address, n, sizeof(n));
 
-    if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) {
-        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+    if (!(k = catta_key_new(n, CATTA_DNS_CLASS_IN, CATTA_DNS_TYPE_PTR))) {
+        catta_server_set_errno(server, CATTA_ERR_NO_MEMORY);
         return NULL;
     }
 
-    if (!(r = avahi_new(AvahiSAddressResolver, 1))) {
-        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
-        avahi_key_unref(k);
+    if (!(r = catta_new(CattaSAddressResolver, 1))) {
+        catta_server_set_errno(server, CATTA_ERR_NO_MEMORY);
+        catta_key_unref(k);
         return NULL;
     }
 
@@ -221,24 +221,24 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     r->key = k;
 
     r->record_browser = NULL;
-    AVAHI_LLIST_PREPEND(AvahiSAddressResolver, resolver, server->address_resolvers, r);
+    CATTA_LLIST_PREPEND(CattaSAddressResolver, resolver, server->address_resolvers, r);
 
     r->time_event = NULL;
 
-    if (!(flags & (AVAHI_LOOKUP_USE_MULTICAST|AVAHI_LOOKUP_USE_WIDE_AREA))) {
+    if (!(flags & (CATTA_LOOKUP_USE_MULTICAST|CATTA_LOOKUP_USE_WIDE_AREA))) {
 
-        if (!server->wide_area_lookup_engine || !avahi_wide_area_has_servers(server->wide_area_lookup_engine))
-            flags |= AVAHI_LOOKUP_USE_MULTICAST;
+        if (!server->wide_area_lookup_engine || !catta_wide_area_has_servers(server->wide_area_lookup_engine))
+            flags |= CATTA_LOOKUP_USE_MULTICAST;
         else {
-            flags |= AVAHI_LOOKUP_USE_WIDE_AREA;
+            flags |= CATTA_LOOKUP_USE_WIDE_AREA;
             r->retry_with_multicast = 1;
         }
     }
 
-    r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r);
+    r->record_browser = catta_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r);
 
     if (!r->record_browser) {
-        avahi_s_address_resolver_free(r);
+        catta_s_address_resolver_free(r);
         return NULL;
     }
 
@@ -247,22 +247,22 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     return r;
 }
 
-void avahi_s_address_resolver_free(AvahiSAddressResolver *r) {
+void catta_s_address_resolver_free(CattaSAddressResolver *r) {
     assert(r);
 
-    AVAHI_LLIST_REMOVE(AvahiSAddressResolver, resolver, r->server->address_resolvers, r);
+    CATTA_LLIST_REMOVE(CattaSAddressResolver, resolver, r->server->address_resolvers, r);
 
     if (r->record_browser)
-        avahi_s_record_browser_free(r->record_browser);
+        catta_s_record_browser_free(r->record_browser);
 
     if (r->time_event)
-        avahi_time_event_free(r->time_event);
+        catta_time_event_free(r->time_event);
 
     if (r->ptr_record)
-        avahi_record_unref(r->ptr_record);
+        catta_record_unref(r->ptr_record);
 
     if (r->key)
-        avahi_key_unref(r->key);
+        catta_key_unref(r->key);
 
-    avahi_free(r);
+    catta_free(r);
 }