X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fsocket.c;h=4146d5ad593e5d3d05dc8265192a147c539f390f;hb=2b3957724d8b6c570e425de10eda81c606690c07;hp=cdfe4793b6b90ea2a0bbe98aa09571b3e179c209;hpb=cfbfc17a70c353264ec26dd66228d16e31b08e77;p=catta

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index cdfe479..4146d5a 100644
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -451,7 +451,11 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) {
             break;
 
         if (errno != EAGAIN) {
-            avahi_log_debug("sendmsg() failed: %s", strerror(errno));
+            char where[64];
+            struct sockaddr_in *sin = msg->msg_name;
+
+            inet_ntop(sin->sin_family, &sin->sin_addr, where, sizeof(where));
+            avahi_log_debug("sendmsg() to %s failed: %s", where, strerror(errno));
             return -1;
         }
 
@@ -476,7 +480,7 @@ int avahi_send_dns_packet_ipv4(
 #ifdef IP_PKTINFO
     struct cmsghdr *cmsg;
     size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
-#elif defined(IP_SENDSRCADDR)
+#elif !defined(IP_MULTICAST_IF) && defined(IP_SENDSRCADDR)
     struct cmsghdr *cmsg;
     size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
 #endif
@@ -525,6 +529,14 @@ int avahi_send_dns_packet_ipv4(
         if (src_address)
             pkti->ipi_spec_dst.s_addr = src_address->address;
     }
+#elif defined(IP_MULTICAST_IF)
+    if (src_address) {
+        struct in_addr any = { INADDR_ANY };
+        if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, src_address ? &src_address->address : &any, sizeof(struct in_addr)) < 0) {
+            avahi_log_warn("IP_MULTICAST_IF failed: %s", strerror(errno));
+            return -1;
+        }
+    }
 #elif defined(IP_SENDSRCADDR)
     if (src_address) {
         struct in_addr *addr;
@@ -541,14 +553,6 @@ int avahi_send_dns_packet_ipv4(
         addr = (struct in_addr *)CMSG_DATA(cmsg);
         addr->s_addr =  src_address->address;
     }
-#elif defined(IP_MULTICAST_IF)
-    {
-        struct in_addr any = { INADDR_ANY };
-        if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, src_address ? (const void*) &src_address->address : (const void*) &any, sizeof(struct in_addr)) < 0) {
-            avahi_log_warn("IP_MULTICAST_IF failed: %s", strerror(errno));
-            return -1;
-        }
-    }
 #elif defined(__GNUC__)
 #warning "FIXME: We need some code to set the outgoing interface/local address here if IP_PKTINFO/IP_MULTICAST_IF is not available"
 #endif