X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fwide-area.c;h=9dd1e73ff8ac6dfbcd14c1e4fe3c5b9080ec2d41;hb=3073103812f0ea376582eb0ff1479945a847b361;hp=a66a68243fa11ed5eff6a33470b1ed511c5a01b2;hpb=8185ec8431c51946095d3f11e80545e3519f67cf;p=catta

diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index a66a682..9dd1e73 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -29,15 +29,17 @@
 #include <stdlib.h>
 
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+#include <avahi-common/timeval.h>
 
-#include "server.h"
+#include "internal.h"
 #include "browse.h"
 #include "socket.h"
 #include "log.h"
 #include "hashmap.h"
 #include "wide-area.h"
 
-#define MAX_CACHE_ENTRIES 500
+#define CACHE_ENTRIES_MAX 500
 
 typedef struct AvahiWideAreaCacheEntry AvahiWideAreaCacheEntry;
 
@@ -95,7 +97,7 @@ struct AvahiWideAreaLookupEngine {
 
     int cleanup_dead;
 
-    AvahiAddress dns_servers[AVAHI_MAX_WIDE_AREA_SERVERS];
+    AvahiAddress dns_servers[AVAHI_WIDE_AREA_SERVERS_MAX];
     unsigned n_dns_servers;
     unsigned current_dns_server;
 };
@@ -117,33 +119,34 @@ static AvahiWideAreaLookup* find_lookup(AvahiWideAreaLookupEngine *e, uint16_t i
     return l;
 }
 
-static int send_to_dns_server(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p) {
+static int send_to_dns_server(AvahiWideAreaLookup *l, AvahiDnsPacket *p) {
     AvahiAddress *a;
     
-    assert(e);
+    assert(l);
     assert(p);
 
-    if (e->n_dns_servers <= 0)
+    if (l->engine->n_dns_servers <= 0)
         return -1;
 
-    assert(e->current_dns_server < e->n_dns_servers);
+    assert(l->engine->current_dns_server < l->engine->n_dns_servers);
 
-    a = &e->dns_servers[e->current_dns_server];
+    a = &l->engine->dns_servers[l->engine->current_dns_server];
+    l->dns_server_used = *a;
     
     if (a->proto == AVAHI_PROTO_INET) {
 
-        if (e->fd_ipv4 < 0)
+        if (l->engine->fd_ipv4 < 0)
             return -1;
         
-        return avahi_send_dns_packet_ipv4(e->fd_ipv4, AVAHI_IF_UNSPEC, p, &a->data.ipv4, AVAHI_DNS_PORT);
+        return avahi_send_dns_packet_ipv4(l->engine->fd_ipv4, AVAHI_IF_UNSPEC, p, &a->data.ipv4, AVAHI_DNS_PORT);
         
     } else {
         assert(a->proto == AVAHI_PROTO_INET6);
 
-        if (e->fd_ipv6 < 0)
+        if (l->engine->fd_ipv6 < 0)
             return -1;
         
-        return avahi_send_dns_packet_ipv6(e->fd_ipv6, AVAHI_IF_UNSPEC, p, &a->data.ipv6, AVAHI_DNS_PORT);
+        return avahi_send_dns_packet_ipv6(l->engine->fd_ipv6, AVAHI_IF_UNSPEC, p, &a->data.ipv6, AVAHI_DNS_PORT);
     }
 }
 
@@ -173,13 +176,14 @@ static void sender_timeout_callback(AvahiTimeEvent *e, void *userdata) {
     
     if (l->n_send >= 6) {
         avahi_log_warn(__FILE__": Query timed out.");
+        avahi_server_set_errno(l->engine->server, AVAHI_ERR_TIMEOUT);
         l->callback(l->engine, AVAHI_BROWSER_FAILURE, AVAHI_LOOKUP_RESULT_WIDE_AREA, NULL, l->userdata);
         avahi_wide_area_lookup_free(l);
         return;
     }
 
     assert(l->packet);
-    send_to_dns_server(l->engine, l->packet);
+    send_to_dns_server(l, l->packet);
     l->n_send++;
 
     avahi_time_event_update(e, avahi_elapse_time(&tv, 1000, 0));
@@ -228,7 +232,7 @@ AvahiWideAreaLookup *avahi_wide_area_lookup_new(
     
     avahi_dns_packet_set_field(l->packet, AVAHI_DNS_FIELD_QDCOUNT, 1);
 
-    if (send_to_dns_server(e, l->packet) < 0) {
+    if (send_to_dns_server(l, l->packet) < 0) {
         avahi_log_error(__FILE__": Failed to send packet.");
         avahi_dns_packet_free(l->packet);
         avahi_key_unref(l->key);
@@ -412,7 +416,7 @@ static void add_to_cache(AvahiWideAreaLookupEngine *e, AvahiRecord *r) {
         is_new = 1;
 
         /* Enforce cache size */
-        if (e->cache_n_entries >= MAX_CACHE_ENTRIES)
+        if (e->cache_n_entries >= CACHE_ENTRIES_MAX)
             /* Eventually we should improve the caching algorithm here */
             goto finish;
         
@@ -447,33 +451,60 @@ finish:
         run_callbacks(e, r);
 }
 
+static int map_dns_error(uint16_t error) {
+    static const int table[16] = {
+        AVAHI_OK,
+        AVAHI_ERR_DNS_FORMERR,
+        AVAHI_ERR_DNS_SERVFAIL,
+        AVAHI_ERR_DNS_NXDOMAIN,
+        AVAHI_ERR_DNS_NOTIMP,
+        AVAHI_ERR_DNS_REFUSED,
+        AVAHI_ERR_DNS_YXDOMAIN,
+        AVAHI_ERR_DNS_YXRRSET,
+        AVAHI_ERR_DNS_NXRRSET,
+        AVAHI_ERR_DNS_NOTAUTH,
+        AVAHI_ERR_DNS_NOTZONE,
+        AVAHI_ERR_INVALID_DNS_ERROR,
+        AVAHI_ERR_INVALID_DNS_ERROR,
+        AVAHI_ERR_INVALID_DNS_ERROR,
+        AVAHI_ERR_INVALID_DNS_ERROR,
+        AVAHI_ERR_INVALID_DNS_ERROR
+    };
+
+    assert(error <= 15);
+
+    return table[error];
+}
+
 static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, AvahiAddress *a) {
     AvahiWideAreaLookup *l = NULL;
     int i, r;
+
+    AvahiBrowserEvent final_event = AVAHI_BROWSER_ALL_FOR_NOW;
     
     assert(e);
     assert(p);
 
+    /* Some superficial validity tests */
     if (avahi_dns_packet_check_valid(p) < 0 || avahi_dns_packet_is_query(p)) {
         avahi_log_warn(__FILE__": Ignoring invalid response for wide area datagram.");
         goto finish;
     }
 
-/*     avahi_log_debug(__FILE__": Recieving unicast packet %u", avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)); */
-    
-    if (!(l = find_lookup(e, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)))) {
-/*         avahi_log_warn(__FILE__": Got response for query we didn't send."); */
+    /* Look for the lookup that issued this query */
+    if (!(l = find_lookup(e, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID))) || l->dead)
         goto finish;
-    }
-
 
-    if ((r = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & 15) != 0) {
-/*         avahi_log_debug(__FILE__": Response failed for wide area datagram: %i", r); */
+    /* Check whether this a packet indicating a failure */
+    if ((r = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & 15) != 0 ||
+        avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
 
+        avahi_server_set_errno(e->server, r == 0 ? AVAHI_ERR_NOT_FOUND : map_dns_error(r));
         /* Tell the user about the failure */
-        if (l->callback)
-            l->callback(e, r == 3 ? AVAHI_BROWSER_NOT_FOUND : AVAHI_BROWSER_FAILURE, AVAHI_LOOKUP_RESULT_WIDE_AREA, NULL, l->userdata);
-        goto finish;
+        final_event = AVAHI_BROWSER_FAILURE;
+
+        /* We go on here, since some of the records contained in the
+           reply might be interesting in some way */
     }
 
     /* Skip over the question */
@@ -482,12 +513,15 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, Avahi
         
         if (!(k = avahi_dns_packet_consume_key(p, NULL))) {
             avahi_log_warn(__FILE__": Wide area response packet too short.");
+            avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET);
+            final_event = AVAHI_BROWSER_FAILURE;
             goto finish;
         }
 
         avahi_key_unref(k);
     }
 
+    /* Process responses */
     for (i = (int) avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) +
              (int) avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) +
              (int) avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ARCOUNT); i > 0; i--) {
@@ -496,21 +530,23 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, Avahi
 
         if (!(rr = avahi_dns_packet_consume_record(p, NULL))) {
             avahi_log_warn(__FILE__": Wide area response packet too short (2).");
+            avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET);
+            final_event = AVAHI_BROWSER_FAILURE;
             goto finish;
         }
 
         add_to_cache(e, rr);
-
         avahi_record_unref(rr);
     }
 
-    /** Inform the user that this is the last reply */
-    if (l->callback && !l->dead)
-        l->callback(e, AVAHI_BROWSER_ALL_FOR_NOW, AVAHI_LOOKUP_RESULT_WIDE_AREA, NULL, l->userdata);
-    
 finish:
-    if (l)
+    
+    if (l && !l->dead) {
+        if (l->callback)
+            l->callback(e, final_event, AVAHI_LOOKUP_RESULT_WIDE_AREA, NULL, l->userdata);
+
         lookup_stop(l);
+    }
 }
 
 static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) {
@@ -552,7 +588,7 @@ AvahiWideAreaLookupEngine *avahi_wide_area_engine_new(AvahiServer *s) {
     e->fd_ipv6 = avahi_open_unicast_socket_ipv6();
 
     if (e->fd_ipv4 < 0 && e->fd_ipv6 < 0) {
-        avahi_log_error(__FILE__": Failed to create wide area sockets: %s\n", strerror(errno));
+        avahi_log_error(__FILE__": Failed to create wide area sockets: %s", strerror(errno));
 
         if (e->fd_ipv6 >= 0)
             close(e->fd_ipv6);
@@ -622,13 +658,11 @@ void avahi_wide_area_clear_cache(AvahiWideAreaLookupEngine *e) {
     assert(e->cache_n_entries == 0);
 }
 
-
 void avahi_wide_area_set_servers(AvahiWideAreaLookupEngine *e, const AvahiAddress *a, unsigned n) {
     assert(e);
 
-    
     if (a) {
-        for (e->n_dns_servers = 0; n > 0 && e->n_dns_servers < AVAHI_MAX_WIDE_AREA_SERVERS; a++, n--) 
+        for (e->n_dns_servers = 0; n > 0 && e->n_dns_servers < AVAHI_WIDE_AREA_SERVERS_MAX; a++, n--) 
             if ((a->proto == AVAHI_PROTO_INET && e->fd_ipv4 >= 0) || (a->proto == AVAHI_PROTO_INET6 && e->fd_ipv6 >= 0))
                 e->dns_servers[e->n_dns_servers++] = *a;
     } else {