X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-address.c;h=25d21ace6e4f49be625c65cfae3c2f5eb5a2159a;hb=a2fd5b8ed02be912fcb71cdec1c9233692d6c615;hp=4fb588e9fe6cf82124c18d6d7e64bdf5af0c7534;hpb=1ffedb586bd2fb6daa3970304fac7c5b415cd38f;p=catta

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index 4fb588e..25d21ac 100644
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -23,9 +23,12 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
+#include <avahi-common/domain.h>
 
 #include "browse.h"
 
@@ -62,8 +65,6 @@ static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
     }
 
     switch (event) {
-        case AVAHI_RESOLVER_NOT_FOUND:
-        case AVAHI_RESOLVER_TIMEOUT:
         case AVAHI_RESOLVER_FAILURE:
             r->callback(r, r->interface, r->protocol, event, &r->address, NULL, r->flags, r->userdata);
             break;
@@ -81,7 +82,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(AvahiSAddressResolver *r) {
@@ -109,7 +111,6 @@ static void record_browser_callback(
     assert(rr);
     assert(r);
 
-
     switch (event) {
         case AVAHI_BROWSER_NEW: 
             assert(record);
@@ -155,7 +156,7 @@ static void record_browser_callback(
         case AVAHI_BROWSER_ALL_FOR_NOW:
             break;
 
-        case AVAHI_BROWSER_NOT_FOUND:
+        case AVAHI_BROWSER_FAILURE:
 
             if (r->retry_with_multicast) {
                 r->retry_with_multicast = 0;
@@ -169,12 +170,9 @@ static void record_browser_callback(
                 }
             }
 
-            /* Fallthrough */
-
-        case AVAHI_BROWSER_FAILURE:
             r->flags = flags;
-            finish(r, event == AVAHI_BROWSER_NOT_FOUND ? AVAHI_RESOLVER_NOT_FOUND : AVAHI_RESOLVER_FAILURE);
-
+            finish(r, AVAHI_RESOLVER_FAILURE);
+            break;
     }
 }
 
@@ -189,38 +187,20 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     
     AvahiSAddressResolver *r;
     AvahiKey *k;
-    char *n;
+    char n[AVAHI_DOMAIN_NAME_MAX];
 
     assert(server);
     assert(address);
     assert(callback);
 
-    assert(address->proto == AVAHI_PROTO_INET || address->proto == AVAHI_PROTO_INET6);
-
-    if (!AVAHI_IF_VALID(interface)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE);
-        return NULL;
-    }
-
-    if (!AVAHI_VALID_FLAGS(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS);
-        return NULL;
-    }
-
-    if (address->proto == 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);
+    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, address->proto == AVAHI_PROTO_INET || address->proto == AVAHI_PROTO_INET6, 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);
+    
+    avahi_reverse_lookup_name(address, n, sizeof(n));
 
-    if (!k) {
+    if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) {
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
         return NULL;
     }