X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-core%2Fresolve-host-name.c;h=08f209b62676083ea8503066a47fa0c082855b9e;hb=530fbb59abafb970ef1dd8f61571b13fb0918b23;hp=6315dbb7b38b4cf7c61b5bdf6ef270b1694b9711;hpb=d1dd07145bb3db5c6fd77c55aea762eb79ab3b5c;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 6315dbb..08f209b 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi 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
   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
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -38,7 +36,7 @@
 struct AvahiSHostNameResolver {
     AvahiServer *server;
     char *host_name;
-    
+
     AvahiSRecordBrowser *record_browser_a;
     AvahiSRecordBrowser *record_browser_aaaa;
 
@@ -66,20 +64,20 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
     switch (event) {
         case AVAHI_RESOLVER_FOUND: {
             AvahiAddress a;
-            
+
             assert(r->address_record);
-            
+
             switch (r->address_record->key->type) {
                 case AVAHI_DNS_TYPE_A:
                     a.proto = AVAHI_PROTO_INET;
                     a.data.ipv4 = r->address_record->data.a.address;
                     break;
-                    
+
                 case AVAHI_DNS_TYPE_AAAA:
                     a.proto = AVAHI_PROTO_INET6;
                     a.data.ipv6 = r->address_record->data.aaaa.address;
                     break;
-                    
+
                 default:
                     abort();
             }
@@ -88,11 +86,9 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
             break;
 
         }
-            
-        case AVAHI_RESOLVER_TIMEOUT:
-        case AVAHI_RESOLVER_NOT_FOUND:
+
         case AVAHI_RESOLVER_FAILURE:
-            
+
             r->callback(r, r->interface, r->protocol, event, r->host_name, NULL, r->flags, r->userdata);
             break;
     }
@@ -100,11 +96,12 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
 
 static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
     AvahiSHostNameResolver *r = userdata;
-    
+
     assert(e);
     assert(r);
 
-    finish(r, AVAHI_RESOLVER_TIMEOUT);
+    avahi_server_set_errno(r->server, AVAHI_ERR_TIMEOUT);
+    finish(r, AVAHI_RESOLVER_FAILURE);
 }
 
 static void start_timeout(AvahiSHostNameResolver *r) {
@@ -127,9 +124,9 @@ static void record_browser_callback(
     AvahiRecord *record,
     AvahiLookupResultFlags flags,
     void* userdata) {
-    
+
     AvahiSHostNameResolver *r = userdata;
-    
+
     assert(rr);
     assert(r);
 
@@ -141,20 +138,20 @@ static void record_browser_callback(
 
             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);
                 r->flags = flags;
-                
+
                 finish(r, AVAHI_RESOLVER_FOUND);
             }
 
@@ -170,13 +167,13 @@ static void record_browser_callback(
 
                 r->flags = flags;
 
-                
+
                 /** 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);
             }
 
@@ -188,10 +185,9 @@ static void record_browser_callback(
             break;
 
         case AVAHI_BROWSER_FAILURE:
-        case AVAHI_BROWSER_NOT_FOUND:
 
             /* Stop browsers */
-            
+
             if (r->record_browser_aaaa)
                 avahi_s_record_browser_free(r->record_browser_aaaa);
             if (r->record_browser_a)
@@ -199,8 +195,8 @@ static void record_browser_callback(
 
             r->record_browser_a = r->record_browser_aaaa = NULL;
             r->flags = flags;
-            
-            finish(r, event == AVAHI_BROWSER_FAILURE ? AVAHI_RESOLVER_FAILURE : AVAHI_RESOLVER_NOT_FOUND);
+
+            finish(r, AVAHI_RESOLVER_FAILURE);
             break;
     }
 }
@@ -214,36 +210,25 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
     AvahiLookupFlags flags,
     AvahiSHostNameResolverCallback callback,
     void* userdata) {
-    
+
     AvahiSHostNameResolver *r;
     AvahiKey *k;
-   
+
     assert(server);
     assert(host_name);
     assert(callback);
 
-    assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
-
-    if (!AVAHI_IF_VALID(interface)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE);
-        return NULL;
-    }
-
-    if (!avahi_is_valid_domain_name(host_name)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME);
-        return NULL;
-    }
-
-    if (!AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS);
-        return NULL;
-    }
+    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, avahi_is_valid_fqdn(host_name), AVAHI_ERR_INVALID_HOST_NAME);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(aprotocol), 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);
 
     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_strdup(host_name);
     r->callback = callback;
@@ -261,7 +246,6 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
 
     r->record_browser_aaaa = r->record_browser_a = NULL;
 
-
     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_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r);
@@ -269,7 +253,7 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
 
         if (!r->record_browser_a)
             goto fail;
-    } 
+    }
 
     if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
@@ -283,7 +267,7 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
     assert(r->record_browser_aaaa || r->record_browser_a);
 
     start_timeout(r);
-    
+
     return r;
 
 fail:
@@ -307,7 +291,7 @@ void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r) {
 
     if (r->address_record)
         avahi_record_unref(r->address_record);
-    
+
     avahi_free(r->host_name);
     avahi_free(r);
 }