X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=c18722d19dc59b1b09a8749e12b34025387bfc91;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=f29b575f51b8b057c40a6d35a46268e964c5a735;hpb=5d67f2aefcdb84d2938fdc522d1f906ca6616e3d;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index f29b575..c18722d 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -41,7 +41,7 @@ struct AvahiHostNameResolver {
     AVAHI_LLIST_FIELDS(AvahiHostNameResolver, resolver);
 };
 
-static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, AvahiResolverEvent event, AvahiRecord *record) {
+static void finish(AvahiHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) {
     AvahiAddress a;
     
     g_assert(r);
@@ -55,19 +55,21 @@ static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, Av
         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 (r->time_event) {
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+        r->time_event = NULL;
+    }
 
     if (record) {
         switch (record->key->type) {
             case AVAHI_DNS_TYPE_A:
-                a.family = AF_INET;
+                a.family = AVAHI_PROTO_INET;
                 a.data.ipv4 = record->data.a.address;
                 break;
                 
             case AVAHI_DNS_TYPE_AAAA:
-                a.family = AF_INET6;
+                a.family = AVAHI_PROTO_INET6;
                 a.data.ipv6 = record->data.aaaa.address;
                 break;
                 
@@ -79,7 +81,7 @@ static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, Av
     r->callback(r, interface, protocol, event, record ? record->key->name : r->host_name, record ? &a : NULL, r->userdata);
 }
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
     AvahiHostNameResolver *r = userdata;
 
     g_assert(rr);
@@ -99,10 +101,10 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
     g_assert(e);
     g_assert(r);
 
-    finish(r, -1, AF_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
+    finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
 }
 
-AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
+AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
     AvahiHostNameResolver *r;
     AvahiKey *k;
     GTimeVal tv;
@@ -111,8 +113,13 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
     g_assert(host_name);
     g_assert(callback);
 
-    g_assert(aprotocol == AF_UNSPEC || aprotocol == AF_INET || aprotocol == AF_INET6);
+    g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
 
+    if (!avahi_valid_domain_name(host_name)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME);
+        return NULL;
+    }
+    
     r = g_new(AvahiHostNameResolver, 1);
     r->server = server;
     r->host_name = avahi_normalize_name(host_name);
@@ -126,20 +133,33 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
 
     AVAHI_LLIST_PREPEND(AvahiHostNameResolver, 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);
         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);
         avahi_key_unref(k);
+
+        if (!r->record_browser_aaaa)
+            goto fail;
     }
-    
+
+    g_assert(r->record_browser_aaaa || r->record_browser_a);
+
     return r;
+
+fail:
+    avahi_host_name_resolver_free(r);
+    return NULL;
 }
 
 void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {
@@ -149,8 +169,12 @@ void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {
 
     if (r->record_browser_a)
         avahi_record_browser_free(r->record_browser_a);
+
     if (r->record_browser_aaaa)
         avahi_record_browser_free(r->record_browser_aaaa);
+
+    if (r->time_event)
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
     
     g_free(r->host_name);
     g_free(r);