- updated Debian initscript to use libdeamon features (-k/-D/-r).

[catta] / avahi-core / socket.c

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index a2264ce74c203c9dc2d4eae708adedb7884ad7fc..8f3d89689ce190fbca21cd1469ec05d736ec0a2a 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -39,6 +39,7 @@
 #include "dns.h"
 #include "util.h"
 #include "socket.h"
+#include "log.h"
 
 static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) {
     g_assert(ret_sa);
@@ -94,7 +95,7 @@ int avahi_mdns_mcast_join_ipv4 (int index, int fd) {
     mreq.imr_ifindex = index;
  
     if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-        g_warning("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
         return -1;
     } 
 
@@ -112,7 +113,7 @@ int avahi_mdns_mcast_join_ipv6 (int index, int fd) {
     mreq6.ipv6mr_interface = index;
 
     if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
-        g_warning("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
         return -1;
     }
 
@@ -130,7 +131,7 @@ int avahi_mdns_mcast_leave_ipv4 (int index, int fd) {
     mreq.imr_ifindex = index;
  
     if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-        g_warning("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
         return -1;
     }
 
@@ -148,75 +149,110 @@ int avahi_mdns_mcast_leave_ipv6 (int index, int fd) {
     mreq6.ipv6mr_interface = index;
 
     if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
-        g_warning("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
         return -1;
     }
 
     return 0;
 }
 
+static gint bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
+    gint yes;
+    
+    g_assert(fd >= 0);
+    g_assert(sa);
+    g_assert(l > 0);
+    
+    if (bind(fd, sa, l) < 0) {
+
+        if (errno != EADDRINUSE) {
+            avahi_log_warn("bind() failed: %s\n", strerror(errno));
+            return -1;
+        }
+            
+        avahi_log_warn("*** WARNING: Detected another %s mDNS stack running on this host. This makes mDNS unreliable and is thus not recommended. ***",
+                       sa->sa_family == AF_INET ? "IPv4" : "IPv6");
+
+        /* Try again, this time with SO_REUSEADDR set */
+        yes = 1;
+        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+            avahi_log_warn("SO_REUSEADDR failed: %s\n", strerror(errno));
+            return -1;
+        }
+
+        if (bind(fd, sa, l) < 0) {
+            avahi_log_warn("bind() failed: %s\n", strerror(errno));
+            return -1;
+        }
+    } else {
+
+        /* We enable SO_REUSEADDR afterwards, to make sure that the
+         * user may run other mDNS implementations if he really
+         * wants. */
+        
+        yes = 1;
+        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+            avahi_log_warn("SO_REUSEADDR failed: %s\n", strerror(errno));
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
 gint avahi_open_socket_ipv4(void) {
     struct sockaddr_in local;
     int fd = -1, ttl, yes;
         
     if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        g_warning("socket() failed: %s\n", strerror(errno));
+        avahi_log_warn("socket() failed: %s\n", strerror(errno));
         goto fail;
     }
     
     ttl = 255;
     if (setsockopt(fd, SOL_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) {
-        g_warning("IP_MULTICAST_TTL failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_MULTICAST_TTL failed: %s\n", strerror(errno));
         goto fail;
     }
 
     ttl = 255;
     if (setsockopt(fd, SOL_IP, IP_TTL, &ttl, sizeof(ttl)) < 0) {
-        g_warning("IP_TTL failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_TTL failed: %s\n", strerror(errno));
         goto fail;
     }
     
-    yes = 1;
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
-        g_warning("SO_REUSEADDR failed: %s\n", strerror(errno));
-        goto fail;
-    }
-
     yes = 1;
     if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
-        g_warning("IP_MULTICAST_LOOP failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_MULTICAST_LOOP failed: %s\n", strerror(errno));
         goto fail;
     }
-
     
     memset(&local, 0, sizeof(local));
     local.sin_family = AF_INET;
     local.sin_port = htons(AVAHI_MDNS_PORT);
-    
-    if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
-        g_warning("bind() failed: %s\n", strerror(errno));
+
+    if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0)
         goto fail;
-    }
 
     yes = 1;
     if (setsockopt(fd, SOL_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
-        g_warning("IP_RECVTTL failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_RECVTTL failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) {
-        g_warning("IP_PKTINFO failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_PKTINFO failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_cloexec(fd) < 0) {
-        g_warning("FD_CLOEXEC failed: %s\n", strerror(errno));
+        avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_nonblock(fd) < 0) {
-        g_warning("O_NONBLOCK failed: %s\n", strerror(errno));
+        avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno));
         goto fail;
     }
 
@@ -236,37 +272,31 @@ gint avahi_open_socket_ipv6(void) {
     mdns_mcast_group_ipv6(&sa);
         
     if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-        g_warning("socket() failed: %s\n", strerror(errno));
+        avahi_log_warn("socket() failed: %s\n", strerror(errno));
         goto fail;
     }
     
     ttl = 255;
     if (setsockopt(fd, SOL_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0) {
-        g_warning("IPV6_MULTICAST_HOPS failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_MULTICAST_HOPS failed: %s\n", strerror(errno));
         goto fail;
     }
 
     ttl = 255;
     if (setsockopt(fd, SOL_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)) < 0) {
-        g_warning("IPV6_UNICAST_HOPS failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_UNICAST_HOPS failed: %s\n", strerror(errno));
         goto fail;
     }
     
-    yes = 1;
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
-        g_warning("SO_REUSEADDR failed: %s\n", strerror(errno));
-        goto fail;
-    }
-
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_V6ONLY failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_V6ONLY failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_MULTICAST_LOOP failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s\n", strerror(errno));
         goto fail;
     }
 
@@ -274,30 +304,28 @@ gint avahi_open_socket_ipv6(void) {
     local.sin6_family = AF_INET6;
     local.sin6_port = htons(AVAHI_MDNS_PORT);
     
-    if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
-        g_warning("bind() failed: %s\n", strerror(errno));
+    if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0)
         goto fail;
-    }
 
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_HOPLIMIT failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_HOPLIMIT failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_PKTINFO failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_PKTINFO failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_cloexec(fd) < 0) {
-        g_warning("FD_CLOEXEC failed: %s\n", strerror(errno));
+        avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_nonblock(fd) < 0) {
-        g_warning("O_NONBLOCK failed: %s\n", strerror(errno));
+        avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno));
         goto fail;
     }
 
@@ -320,7 +348,7 @@ static gint sendmsg_loop(gint fd, struct msghdr *msg, gint flags) {
             break;
         
         if (errno != EAGAIN) {
-            g_message("sendmsg() failed: %s\n", strerror(errno));
+            avahi_log_debug("sendmsg() failed: %s\n", strerror(errno));
             return -1;
         }
         
@@ -424,13 +452,19 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
     ssize_t l;
     struct cmsghdr *cmsg;
     gboolean found_ttl = FALSE, found_iface = FALSE;
+    guint ms;
 
     g_assert(fd >= 0);
     g_assert(ret_sa);
     g_assert(ret_iface);
     g_assert(ret_ttl);
 
-    p = avahi_dns_packet_new(0);
+    if (ioctl(fd, FIONREAD, &ms) < 0) {
+        avahi_log_warn("ioctl(): %s", strerror(errno));
+        goto fail;
+    }
+
+    p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
 
     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
     io.iov_len = p->max_size;
@@ -445,7 +479,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
     msg.msg_flags = 0;
     
     if ((l = recvmsg(fd, &msg, 0)) < 0) {
-        g_warning("recvmsg(): %s\n", strerror(errno));
+        avahi_log_warn("recvmsg(): %s", strerror(errno));
         goto fail;
     }
 
@@ -482,7 +516,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
         }
     }
 
-/*     g_message("ttl=%u iface=%i", *ret_ttl, *ret_iface); */
+/*     avahi_log_debug("ttl=%u iface=%i", *ret_ttl, *ret_iface); */
 
     g_assert(found_iface);
     g_assert(found_ttl);
@@ -502,6 +536,8 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa,
     struct iovec io;
     uint8_t aux[64];
     ssize_t l;
+    guint ms;
+    
     struct cmsghdr *cmsg;
     gboolean found_ttl = FALSE, found_iface = FALSE;
 
@@ -510,7 +546,12 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa,
     g_assert(ret_iface);
     g_assert(ret_ttl);
 
-    p = avahi_dns_packet_new(0);
+    if (ioctl(fd, FIONREAD, &ms) < 0) {
+        avahi_log_warn("ioctl(): %s", strerror(errno));
+        goto fail;
+    }
+    
+    p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
 
     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
     io.iov_len = p->max_size;
@@ -524,8 +565,10 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa,
     msg.msg_controllen = sizeof(aux);
     msg.msg_flags = 0;
     
-    if ((l = recvmsg(fd, &msg, 0)) < 0)
+    if ((l = recvmsg(fd, &msg, 0)) < 0) {
+        avahi_log_warn("recvmsg(): %s", strerror(errno));
         goto fail;
+    }
 
     p->size = (size_t) l;
     
@@ -560,7 +603,7 @@ gint avahi_open_legacy_unicast_socket_ipv4(void) {
     int fd = -1, yes;
         
     if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        g_warning("socket() failed: %s\n", strerror(errno));
+        avahi_log_warn("socket() failed: %s\n", strerror(errno));
         goto fail;
     }
     
@@ -568,29 +611,29 @@ gint avahi_open_legacy_unicast_socket_ipv4(void) {
     local.sin_family = AF_INET;
     
     if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
-        g_warning("bind() failed: %s\n", strerror(errno));
+        avahi_log_warn("bind() failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
-        g_warning("IP_RECVTTL failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_RECVTTL failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) {
-        g_warning("IP_PKTINFO failed: %s\n", strerror(errno));
+        avahi_log_warn("IP_PKTINFO failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_cloexec(fd) < 0) {
-        g_warning("FD_CLOEXEC failed: %s\n", strerror(errno));
+        avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_nonblock(fd) < 0) {
-        g_warning("O_NONBLOCK failed: %s\n", strerror(errno));
+        avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno));
         goto fail;
     }
 
@@ -608,7 +651,7 @@ gint avahi_open_legacy_unicast_socket_ipv6(void) {
     int fd = -1, yes;
         
     if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-        g_warning("socket() failed: %s\n", strerror(errno));
+        avahi_log_warn("socket() failed: %s\n", strerror(errno));
         goto fail;
     }
     
@@ -616,29 +659,29 @@ gint avahi_open_legacy_unicast_socket_ipv6(void) {
     local.sin_family = AF_INET;
     
     if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
-        g_warning("bind() failed: %s\n", strerror(errno));
+        avahi_log_warn("bind() failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_HOPLIMIT failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_HOPLIMIT failed: %s\n", strerror(errno));
         goto fail;
     }
 
     yes = 1;
     if (setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
-        g_warning("IPV6_PKTINFO failed: %s\n", strerror(errno));
+        avahi_log_warn("IPV6_PKTINFO failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_cloexec(fd) < 0) {
-        g_warning("FD_CLOEXEC failed: %s\n", strerror(errno));
+        avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno));
         goto fail;
     }
     
     if (avahi_set_nonblock(fd) < 0) {
-        g_warning("O_NONBLOCK failed: %s\n", strerror(errno));
+        avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno));
         goto fail;
     }