X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=59dc3cf611b8b3e52bed9c7a07030ced93deae86;hb=78a76e3d5f1d9cc81fd901b8e0263483a7c707d0;hp=6315dbb7b38b4cf7c61b5bdf6ef270b1694b9711;hpb=d1dd07145bb3db5c6fd77c55aea762eb79ab3b5c;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 6315dbb..59dc3cf 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -89,8 +89,6 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
 
         }
             
-        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);
@@ -104,7 +102,8 @@ static void time_event_callback(AvahiTimeEvent *e, void *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) {
@@ -188,7 +187,6 @@ static void record_browser_callback(
             break;
 
         case AVAHI_BROWSER_FAILURE:
-        case AVAHI_BROWSER_NOT_FOUND:
 
             /* Stop browsers */
             
@@ -200,7 +198,7 @@ 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;
     }
 }
@@ -222,22 +220,11 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
     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);
@@ -261,7 +248,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);