X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-address.c;h=18c862c1cc9639a987080f40c7cfa756f5700439;hb=b6306c88b9279d8194afa85a6497c39531b3bfa9;hp=cba30ac17fc5426a9180187b4df66609c5718b4b;hpb=ff4f6bf87626cdc1674e0c0c52c3692212c61116;p=catta

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index cba30ac..18c862c 100644
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -23,68 +23,188 @@
 #include <config.h>
 #endif
 
-#include "resolve.h"
-#include "util.h"
+#include <avahi-common/timeval.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
-struct AvahiAddressResolver {
+#include "browse.h"
+
+#define TIMEOUT_MSEC 1000
+
+struct AvahiSAddressResolver {
     AvahiServer *server;
     AvahiAddress address;
     
-    AvahiRecordResolver *record_resolver;
+    AvahiSRecordBrowser *record_browser;
+
+    AvahiSAddressResolverCallback callback;
+    void* userdata;
 
-    AvahiAddressResolverCallback callback;
-    gpointer userdata;
+    AvahiRecord *ptr_record;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 
-    AVAHI_LLIST_FIELDS(AvahiAddressResolver, resolver);
+    AvahiTimeEvent *time_event;
+
+    AVAHI_LLIST_FIELDS(AvahiSAddressResolver, resolver);
 };
 
-static void record_resolver_callback(AvahiRecordResolver*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
-    AvahiAddressResolver *r = userdata;
+static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
+    assert(r);
+    
+    if (r->time_event) {
+        avahi_time_event_free(r->time_event);
+        r->time_event = NULL;
+    }
 
-    g_assert(rr);
-    g_assert(record);
-    g_assert(r);
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+        r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_TIMEOUT, &r->address, NULL, r->userdata);
+    else {
 
-    r->callback(r, interface, protocol, event, &r->address, record->data.ptr.name, r->userdata);
+        assert(event == AVAHI_RESOLVER_FOUND);
+        assert(r->ptr_record);
+
+        r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_FOUND, &r->address, r->ptr_record->data.ptr.name, r->userdata);
+    }
 }
 
-AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, gint interface, guchar protocol, const AvahiAddress *address, AvahiAddressResolverCallback callback, gpointer userdata) {
-    AvahiAddressResolver *r;
+static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
+    AvahiSAddressResolver *r = userdata;
+    
+    assert(e);
+    assert(r);
+
+    finish(r, AVAHI_RESOLVER_TIMEOUT);
+}
+
+static void start_timeout(AvahiSAddressResolver *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);
+}
+
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+    AvahiSAddressResolver *r = userdata;
+
+    assert(rr);
+    assert(record);
+    assert(r);
+
+    assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+
+    if (event == AVAHI_BROWSER_NEW) {
+
+        if (r->interface > 0 && interface != r->interface)
+            return;
+        
+        if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
+            return;
+        
+        if (r->interface <= 0)
+            r->interface = interface;
+        
+        if (r->protocol == AVAHI_PROTO_UNSPEC)
+            r->protocol = protocol;
+        
+        if (!r->ptr_record) {
+            r->ptr_record = avahi_record_ref(record);
+
+            finish(r, AVAHI_RESOLVER_FOUND);
+        }
+
+    } else {
+        
+        assert(event == AVAHI_BROWSER_REMOVE);
+        
+        if (r->ptr_record && avahi_record_equal_no_ttl(record, r->ptr_record)) {
+            avahi_record_unref(r->ptr_record);
+            r->ptr_record = NULL;
+
+            /** Look for a replacement */
+            avahi_s_record_browser_restart(r->record_browser);
+            start_timeout(r);
+        }
+    }
+}
+
+AvahiSAddressResolver *avahi_s_address_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const AvahiAddress *address, AvahiSAddressResolverCallback callback, void* userdata) {
+    AvahiSAddressResolver *r;
     AvahiKey *k;
-    gchar *n;
+    char *n;
 
-    g_assert(server);
-    g_assert(address);
-    g_assert(callback);
+    assert(server);
+    assert(address);
+    assert(callback);
 
-    g_assert(address->family == AF_INET || address->family == AF_INET6);
+    assert(address->family == AVAHI_PROTO_INET || address->family == AVAHI_PROTO_INET6);
 
-    r = g_new(AvahiAddressResolver, 1);
+    if (address->family == AVAHI_PROTO_INET)
+        n = avahi_reverse_lookup_name_ipv4(&address->data.ipv4);
+    else 
+        n = avahi_reverse_lookup_name_ipv6_arpa(&address->data.ipv6);
+
+    if (!n) {
+        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+        return NULL;
+    }
+
+    k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
+    avahi_free(n);
+
+    if (!k) {
+        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+        return NULL;
+    }
+
+    if (!(r = avahi_new(AvahiSAddressResolver, 1))) {
+        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+        avahi_key_unref(k);
+        return NULL;
+    }
+    
     r->server = server;
     r->address = *address;
     r->callback = callback;
     r->userdata = userdata;
+    r->ptr_record = NULL;
+    r->interface = interface;
+    r->protocol = protocol;
 
-    if (address->family == AF_INET)
-        n = avahi_reverse_lookup_name_ipv4(&address->data.ipv4);
-    else 
-        n = avahi_reverse_lookup_name_ipv6_arpa(&address->data.ipv6);
-    
-    k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
-    g_free(n);
+    r->record_browser = NULL;
+    AVAHI_LLIST_PREPEND(AvahiSAddressResolver, resolver, server->address_resolvers, r);
+
+    r->time_event = NULL;
+    start_timeout(r);
     
-    r->record_resolver = avahi_record_resolver_new(server, interface, protocol, k, record_resolver_callback, r);
+    r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
 
-    AVAHI_LLIST_PREPEND(AvahiAddressResolver, resolver, server->address_resolvers, r);
+    if (!r->record_browser) {
+        avahi_s_address_resolver_free(r);
+        return NULL;
+    }
     
     return r;
 }
 
-void avahi_address_resolver_free(AvahiAddressResolver *r) {
-    g_assert(r);
+void avahi_s_address_resolver_free(AvahiSAddressResolver *r) {
+    assert(r);
 
-    AVAHI_LLIST_REMOVE(AvahiAddressResolver, resolver, r->server->address_resolvers, r);
-    avahi_record_resolver_free(r->record_resolver);
-    g_free(r);
+    AVAHI_LLIST_REMOVE(AvahiSAddressResolver, resolver, r->server->address_resolvers, r);
+
+    if (r->record_browser)
+        avahi_s_record_browser_free(r->record_browser);
+
+    if (r->time_event)
+        avahi_time_event_free(r->time_event);
+
+    if (r->ptr_record)
+        avahi_record_unref(r->ptr_record);
+    
+    avahi_free(r);
 }