X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-address.c;h=a278beebbb6c99d7938d6f7dd38395c7db9173dc;hb=6f52cdcefd71fc72e11abab06fc8db01621725bb;hp=661982d4989c267e37e3e3ab23272c58647b0536;hpb=bb14e0a8aa3173c8a6d80b1a9c8b300a452ee9f1;p=catta

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index 661982d..a278bee 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"
 
@@ -108,7 +111,6 @@ static void record_browser_callback(
     assert(rr);
     assert(r);
 
-
     switch (event) {
         case AVAHI_BROWSER_NEW: 
             assert(record);
@@ -185,7 +187,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     
     AvahiSAddressResolver *r;
     AvahiKey *k;
-    char *n;
+    char n[AVAHI_DOMAIN_NAME_MAX];
 
     assert(server);
     assert(address);
@@ -203,20 +205,9 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
         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_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;
     }