remove some more unneeded checks

[catta] / avahi-core / socket.c

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index cdfe4793b6b90ea2a0bbe98aa09571b3e179c209..17ab6e553b0074b1f2c608b11e94d2ca76049641 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -450,8 +448,15 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) {
         if (sendmsg(fd, msg, flags) >= 0)
             break;
 
+        if (errno == EINTR)
+            continue;
+
         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 +481,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 +530,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 +554,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
@@ -674,10 +679,14 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
         goto fail;
     }
 
-    if (sa.sin_addr.s_addr == INADDR_ANY) {
+    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
+     * fail after having read them. */
+    if (!ms)
+        goto fail;
+
+    if (sa.sin_addr.s_addr == INADDR_ANY)
         /* Linux 2.4 behaves very strangely sometimes! */
         goto fail;
-    }
 
     assert(!(msg.msg_flags & MSG_CTRUNC));
     assert(!(msg.msg_flags & MSG_TRUNC));
@@ -717,7 +726,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
                 case IP_PKTINFO: {
                     struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
 
-                    if (ret_iface)
+                    if (ret_iface && i->ipi_ifindex > 0)
                         *ret_iface = (int) i->ipi_ifindex;
 
                     if (ret_dst_address)
@@ -733,12 +742,16 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
                 case IP_RECVIF: {
                     struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg);
 
-                    if (ret_iface)
+                    if (ret_iface) {
 #ifdef __sun
-                        *ret_iface = *(uint_t*) sdl;
+                        if (*(uint_t*) sdl > 0)
+                            *ret_iface = *(uint_t*) sdl;
 #else
-                        *ret_iface = (int) sdl->sdl_index;
+
+                        if (sdl->sdl_index > 0)
+                            *ret_iface = (int) sdl->sdl_index;
 #endif
+                    }
 
                     break;
                 }
@@ -754,7 +767,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
 #endif
 
                 default:
-                    avahi_log_warn("Unhandled cmsg_type : %d", cmsg->cmsg_type);
+                    avahi_log_warn("Unhandled cmsg_type: %d", cmsg->cmsg_type);
                     break;
             }
         }
@@ -828,6 +841,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
         goto fail;
     }
 
+    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
+     * fail after having read them. */
+    if (!ms)
+        goto fail;
+
     assert(!(msg.msg_flags & MSG_CTRUNC));
     assert(!(msg.msg_flags & MSG_TRUNC));
 
@@ -860,7 +878,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
                 case IPV6_PKTINFO: {
                     struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg);
 
-                    if (ret_iface)
+                    if (ret_iface && i->ipi6_ifindex > 0)
                         *ret_iface = i->ipi6_ifindex;
 
                     if (ret_dst_address)
@@ -871,7 +889,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
                 }
 
                 default:
-                    avahi_log_warn("Unhandled cmsg_type : %d", cmsg->cmsg_type);
+                    avahi_log_warn("Unhandled cmsg_type: %d", cmsg->cmsg_type);
                     break;
             }
         }