X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=d9c334126bfd48766c06ef2c7736f7cbcd6db5d3;hb=bb421d3a4e8e9bbf99c340f5559e6fd76dac5196;hp=2cfd43569b51fab43fb7e1cb1fd7df9ce16dec47;hpb=f334deaf9d630782be3f7f535265ff7488162f85;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 2cfd435..d9c3341 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -23,134 +23,220 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
+#include <avahi-common/domain.h>
+#include <avahi-common/timeval.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
 #include "browse.h"
-#include "util.h"
+#include "log.h"
 
-struct AvahiHostNameResolver {
+#define TIMEOUT_MSEC 1000
+
+struct AvahiSHostNameResolver {
     AvahiServer *server;
-    gchar *host_name;
+    char *host_name;
     
-    AvahiRecordBrowser *record_browser_a;
-    AvahiRecordBrowser *record_browser_aaaa;
+    AvahiSRecordBrowser *record_browser_a;
+    AvahiSRecordBrowser *record_browser_aaaa;
+
+    AvahiSHostNameResolverCallback callback;
+    void* userdata;
 
-    AvahiHostNameResolverCallback callback;
-    gpointer userdata;
+    AvahiRecord *address_record;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 
     AvahiTimeEvent *time_event;
 
-    AVAHI_LLIST_FIELDS(AvahiHostNameResolver, resolver);
+    AVAHI_LLIST_FIELDS(AvahiSHostNameResolver, resolver);
 };
 
-static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, AvahiResolverEvent event, AvahiRecord *record) {
-    AvahiAddress a;
-    
-    g_assert(r);
+static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
+    assert(r);
 
-    if (r->record_browser_a) {
-        avahi_record_browser_free(r->record_browser_a);
-        r->record_browser_a = NULL;
+    if (r->time_event) {
+        avahi_time_event_free(r->time_event);
+        r->time_event = NULL;
     }
 
-    if (r->record_browser_aaaa) {
-        avahi_record_browser_free(r->record_browser_aaaa);
-        r->record_browser_aaaa = NULL;
-    }
- 
-    avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
-    r->time_event = NULL;
-
-    if (record) {
-        switch (record->key->type) {
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+        r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_TIMEOUT, r->host_name, NULL, r->userdata);
+    else {
+        AvahiAddress a;
+    
+        assert(event == AVAHI_RESOLVER_FOUND);
+        assert(r->address_record);
+    
+        switch (r->address_record->key->type) {
             case AVAHI_DNS_TYPE_A:
-                a.family = AF_INET;
-                a.data.ipv4 = record->data.a.address;
+                a.family = AVAHI_PROTO_INET;
+                a.data.ipv4 = r->address_record->data.a.address;
                 break;
                 
             case AVAHI_DNS_TYPE_AAAA:
-                a.family = AF_INET6;
-                a.data.ipv6 = record->data.aaaa.address;
+                a.family = AVAHI_PROTO_INET6;
+                a.data.ipv6 = r->address_record->data.aaaa.address;
                 break;
                 
             default:
-                g_assert(FALSE);
+                abort();
         }
-    }
 
-    r->callback(r, interface, protocol, event, record ? record->key->name : r->host_name, record ? &a : NULL, r->userdata);
+        r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_FOUND, r->address_record->key->name, &a, r->userdata);
+    }
 }
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
-    AvahiHostNameResolver *r = userdata;
+static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
+    AvahiSHostNameResolver *r = userdata;
+    
+    assert(e);
+    assert(r);
+
+    finish(r, AVAHI_RESOLVER_TIMEOUT);
+}
 
-    g_assert(rr);
-    g_assert(record);
-    g_assert(r);
+static void start_timeout(AvahiSHostNameResolver *r) {
+    struct timeval tv;
+    assert(r);
 
-    if (!(event == AVAHI_BROWSER_NEW))
+    if (r->time_event)
         return;
-    
-    g_assert(record->key->type == AVAHI_DNS_TYPE_A || record->key->type == AVAHI_DNS_TYPE_AAAA);
-    finish(r, interface, protocol, AVAHI_RESOLVER_FOUND, record);
+
+    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 time_event_callback(AvahiTimeEvent *e, void *userdata) {
-    AvahiHostNameResolver *r = userdata;
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+    AvahiSHostNameResolver *r = userdata;
+
+    assert(rr);
+    assert(record);
+    assert(r);
+
+    assert(record->key->type == AVAHI_DNS_TYPE_A || record->key->type == AVAHI_DNS_TYPE_AAAA);
     
-    g_assert(e);
-    g_assert(r);
+    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->address_record) {
+            r->address_record = avahi_record_ref(record);
+            
+            finish(r, AVAHI_RESOLVER_FOUND);
+        }
+    } else {
+
+        assert(event == AVAHI_BROWSER_REMOVE);
 
-    finish(r, -1, AF_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
+        if (r->address_record && avahi_record_equal_no_ttl(record, r->address_record)) {
+            avahi_record_unref(r->address_record);
+            r->address_record = NULL;
+
+            /** Look for a replacement */
+            if (r->record_browser_aaaa)
+                avahi_s_record_browser_restart(r->record_browser_aaaa);
+            if (r->record_browser_a)
+                avahi_s_record_browser_restart(r->record_browser_a);
+
+            start_timeout(r);
+        }
+    }
 }
 
-AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
-    AvahiHostNameResolver *r;
+AvahiSHostNameResolver *avahi_s_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *host_name, AvahiProtocol aprotocol, AvahiSHostNameResolverCallback callback, void* userdata) {
+    AvahiSHostNameResolver *r;
     AvahiKey *k;
-    GTimeVal tv;
     
-    g_assert(server);
-    g_assert(host_name);
-    g_assert(callback);
+    assert(server);
+    assert(host_name);
+    assert(callback);
 
-    g_assert(aprotocol == AF_UNSPEC || aprotocol == AF_INET || aprotocol == AF_INET6);
+    assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
 
-    r = g_new(AvahiHostNameResolver, 1);
+    if (!avahi_is_valid_domain_name(host_name)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME);
+        return NULL;
+    }
+    
+    if (!(r = avahi_new(AvahiSHostNameResolver, 1))) {
+        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+        return NULL;
+    }
+    
     r->server = server;
     r->host_name = avahi_normalize_name(host_name);
     r->callback = callback;
     r->userdata = userdata;
+    r->address_record = NULL;
+    r->interface = interface;
+    r->protocol = protocol;
 
     r->record_browser_a = r->record_browser_aaaa = NULL;
-        
-    avahi_elapse_time(&tv, 1000, 0);
-    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
 
-    AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+    r->time_event = NULL;
+    start_timeout(r);
+
+    AVAHI_LLIST_PREPEND(AvahiSHostNameResolver, resolver, server->host_name_resolvers, r);
+
+    r->record_browser_aaaa = r->record_browser_a = NULL;
     
-    if (aprotocol == AF_INET || aprotocol == AF_UNSPEC) {
+    if (aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
-        r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+        r->record_browser_a = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
+
+        if (!r->record_browser_a)
+            goto fail;
     } 
 
-    if (aprotocol == AF_INET6 || aprotocol == AF_UNSPEC) {
+    if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
-        r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+        r->record_browser_aaaa = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
+
+        if (!r->record_browser_aaaa)
+            goto fail;
     }
-    
+
+    assert(r->record_browser_aaaa || r->record_browser_a);
+
     return r;
+
+fail:
+    avahi_s_host_name_resolver_free(r);
+    return NULL;
 }
 
-void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {
-    g_assert(r);
+void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r) {
+    assert(r);
 
-    AVAHI_LLIST_REMOVE(AvahiHostNameResolver, resolver, r->server->host_name_resolvers, r);
+    AVAHI_LLIST_REMOVE(AvahiSHostNameResolver, resolver, r->server->host_name_resolvers, r);
 
     if (r->record_browser_a)
-        avahi_record_browser_free(r->record_browser_a);
+        avahi_s_record_browser_free(r->record_browser_a);
+
     if (r->record_browser_aaaa)
-        avahi_record_browser_free(r->record_browser_aaaa);
+        avahi_s_record_browser_free(r->record_browser_aaaa);
+
+    if (r->time_event)
+        avahi_time_event_free(r->time_event);
+
+    if (r->address_record)
+        avahi_record_unref(r->address_record);
     
-    g_free(r->host_name);
-    g_free(r);
+    avahi_free(r->host_name);
+    avahi_free(r);
 }