-/* $Id$ */
-
/***
This file is part of avahi.
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;
}
#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
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;
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
goto fail;
}
+ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
+ if (!ms)
+ goto fail;
+
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
goto fail;
}
+ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
+ if (!ms)
+ goto fail;
+
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);