Avoid using AC_CHECK_FILE when cross-compiling

[catta] / avahi-core / wide-area.c

diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index f191074554c01bb9630b7d4c6e6f5988ff46a883..add81c7e920efb67e81f38fd61bc4881f9e2deb6 100644 (file)
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <netinet/in.h>
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
@@ -140,7 +141,7 @@ static int send_to_dns_server(AvahiWideAreaLookup *l, AvahiDnsPacket *p) {
         if (l->engine->fd_ipv4 < 0)
             return -1;
         
-        return avahi_send_dns_packet_ipv4(l->engine->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, NULL, &a->data.ipv4, AVAHI_DNS_PORT);
         
     } else {
         assert(a->proto == AVAHI_PROTO_INET6);
@@ -148,7 +149,7 @@ static int send_to_dns_server(AvahiWideAreaLookup *l, AvahiDnsPacket *p) {
         if (l->engine->fd_ipv6 < 0)
             return -1;
         
-        return avahi_send_dns_packet_ipv6(l->engine->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, NULL, &a->data.ipv6, AVAHI_DNS_PORT);
     }
 }
 
@@ -161,6 +162,17 @@ static void next_dns_server(AvahiWideAreaLookupEngine *e) {
         e->current_dns_server = 0;
 }
 
+static void lookup_stop(AvahiWideAreaLookup *l) {
+    assert(l);
+    
+    l->callback = NULL;
+
+    if (l->time_event) {
+        avahi_time_event_free(l->time_event);
+        l->time_event = NULL;
+    }
+}
+
 static void sender_timeout_callback(AvahiTimeEvent *e, void *userdata) {
     AvahiWideAreaLookup *l = userdata;
     struct timeval tv;
@@ -180,7 +192,7 @@ static void sender_timeout_callback(AvahiTimeEvent *e, void *userdata) {
         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);
+        lookup_stop(l);
         return;
     }
 
@@ -259,17 +271,6 @@ AvahiWideAreaLookup *avahi_wide_area_lookup_new(
     return l;
 }
 
-static void lookup_stop(AvahiWideAreaLookup *l) {
-    assert(l);
-    
-    l->callback = NULL;
-
-    if (l->time_event) {
-        avahi_time_event_free(l->time_event);
-        l->time_event = NULL;
-    }
-}
-
 static void lookup_destroy(AvahiWideAreaLookup *l) {
     AvahiWideAreaLookup *t;
     assert(l);
@@ -478,7 +479,7 @@ static int map_dns_error(uint16_t error) {
     return table[error];
 }
 
-static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, AvahiAddress *a) {
+static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p) {
     AvahiWideAreaLookup *l = NULL;
     int i, r;
 
@@ -514,7 +515,7 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, Avahi
         AvahiKey *k;
         
         if (!(k = avahi_dns_packet_consume_key(p, NULL))) {
-            avahi_log_warn(__FILE__": Wide area response packet too short.");
+            avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)");
             avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET);
             final_event = AVAHI_BROWSER_FAILURE;
             goto finish;
@@ -531,7 +532,7 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, Avahi
         AvahiRecord *rr;
 
         if (!(rr = avahi_dns_packet_consume_record(p, NULL))) {
-            avahi_log_warn(__FILE__": Wide area response packet too short (2).");
+            avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)");
             avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET);
             final_event = AVAHI_BROWSER_FAILURE;
             goto finish;
@@ -553,25 +554,17 @@ finish:
 
 static void socket_event(AVAHI_GCC_UNUSED AvahiWatch *w, int fd, AVAHI_GCC_UNUSED AvahiWatchEvent events, void *userdata) {
     AvahiWideAreaLookupEngine *e = userdata;
-    AvahiAddress a;
     AvahiDnsPacket *p = NULL;
     
-    if (fd == e->fd_ipv4) {
-        struct sockaddr_in sa;
-            
-        if ((p = avahi_recv_dns_packet_ipv4(e->fd_ipv4, &sa, NULL, NULL, NULL)))
-            avahi_address_from_sockaddr((struct sockaddr*) &sa, &a);
-            
-    } else if (fd == e->fd_ipv6) {
-        struct sockaddr_in6 sa6;
-        
-        if ((p = avahi_recv_dns_packet_ipv6(e->fd_ipv6, &sa6, NULL, NULL, NULL)))
-            avahi_address_from_sockaddr((struct sockaddr*) &sa6, &a);
-
+    if (fd == e->fd_ipv4)
+        p = avahi_recv_dns_packet_ipv4(e->fd_ipv4, NULL, NULL, NULL, NULL, NULL);
+    else {
+        assert(fd == e->fd_ipv6);
+        p = avahi_recv_dns_packet_ipv6(e->fd_ipv6, NULL, NULL, NULL, NULL, NULL);
     }
 
     if (p) {
-        handle_packet(e, p, &a);
+        handle_packet(e, p);
         avahi_dns_packet_free(p);
     }
 }
@@ -586,8 +579,8 @@ AvahiWideAreaLookupEngine *avahi_wide_area_engine_new(AvahiServer *s) {
     e->cleanup_dead = 0;
 
     /* Create sockets */
-    e->fd_ipv4 = avahi_open_unicast_socket_ipv4();
-    e->fd_ipv6 = avahi_open_unicast_socket_ipv6();
+    e->fd_ipv4 = s->config.use_ipv4 ? avahi_open_unicast_socket_ipv4() : -1;
+    e->fd_ipv6 = s->config.use_ipv6 ? avahi_open_unicast_socket_ipv6() : -1;
 
     if (e->fd_ipv4 < 0 && e->fd_ipv6 < 0) {
         avahi_log_error(__FILE__": Failed to create wide area sockets: %s", strerror(errno));
@@ -603,6 +596,9 @@ AvahiWideAreaLookupEngine *avahi_wide_area_engine_new(AvahiServer *s) {
     }
 
     /* Create watches */
+
+    e->watch_ipv4 = e->watch_ipv6 = NULL;
+    
     if (e->fd_ipv4 >= 0)
         e->watch_ipv4 = s->poll_api->watch_new(e->server->poll_api, e->fd_ipv4, AVAHI_WATCH_IN, socket_event, e);
     if (e->fd_ipv6 >= 0)