X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fsocket.c;h=cd5241df8d3aa9334152d8b5b01999c66da0f777;hb=5e6703337b90bccb1713ef9cb1aa5f029d75698f;hp=a91a7403ee1aec1b2844b5ca9a6e864b22e75489;hpb=3daec6014638cccfe205529f829bb6ef6e9383db;p=catta diff --git a/avahi-core/socket.c b/avahi-core/socket.c index a91a740..cd5241d 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -27,16 +27,19 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include #include +#include +#include +#include +#include +#include +#include + #ifdef IP_RECVIF #include #endif @@ -45,6 +48,7 @@ #include "fdutil.h" #include "socket.h" #include "log.h" +#include "addr-util.h" /* this is a portability hack */ #ifndef IPV6_ADD_MEMBERSHIP @@ -99,122 +103,78 @@ static void ipv6_address_to_sockaddr(struct sockaddr_in6 *ret_sa, const AvahiIPv memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address)); } -int avahi_mdns_mcast_join_ipv4(int fd, int idx) { -/* FIXME: sebest : we must factorize this part of the code */ - struct sockaddr_in sa; +int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *a, int idx, int join) { #ifdef HAVE_STRUCT_IP_MREQN - struct ip_mreqn mreq; - - memset(&mreq, 0, sizeof(mreq)); - mreq.imr_ifindex = idx; + struct ip_mreqn mreq; #else - struct ip_mreq mreq; - struct ifreq ifreq; - - memset(&mreq, 0, sizeof(mreq)); - - if ((!if_indextoname(idx, ifreq.ifr_name))) { - avahi_log_warn("if_indextoname failed: %s", strerror(errno)); - return -1; - } + struct ip_mreq mreq; +#endif + struct sockaddr_in sa; - if (ioctl(fd, SIOCGIFADDR, &ifreq) < 0) { - avahi_log_warn("SIOCGIFADDR failed: %s", strerror(errno)); - return -1; - } + assert(fd >= 0); + assert(idx >= 0); + assert(a); - memcpy(&mreq.imr_interface, - &((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr, - sizeof(struct in_addr)); + memset(&mreq, 0, sizeof(mreq)); +#ifdef HAVE_STRUCT_IP_MREQN + mreq.imr_ifindex = idx; + mreq.imr_address.s_addr = a->address; +#else + mreq.imr_interface.s_addr = a->address; #endif - mdns_mcast_group_ipv4 (&sa); + mdns_mcast_group_ipv4(&sa); mreq.imr_multiaddr = sa.sin_addr; - if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { - avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { + avahi_log_warn("%s failed: %s", join ? "IP_ADD_MEMBERSHIP" : "IP_DROP_MEMBERSHIP", strerror(errno)); return -1; } return 0; } -int avahi_mdns_mcast_join_ipv6(int fd, int idx) { +int avahi_mdns_mcast_join_ipv6(int fd, const AvahiIPv6Address *a, int idx, int join) { struct ipv6_mreq mreq6; struct sockaddr_in6 sa6; - mdns_mcast_group_ipv6 (&sa6); + assert(fd >= 0); + assert(idx >= 0); + assert(a); memset(&mreq6, 0, sizeof(mreq6)); + mdns_mcast_group_ipv6 (&sa6); mreq6.ipv6mr_multiaddr = sa6.sin6_addr; mreq6.ipv6mr_interface = idx; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, join ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { + avahi_log_warn("%s failed: %s", join ? "IPV6_ADD_MEMBERSHIP" : "IPV6_DROP_MEMBERSHIP", strerror(errno)); return -1; } return 0; } -int avahi_mdns_mcast_leave_ipv4(int fd, int idx) { -/* FIXME: sebest : we must factorize this part of the code */ - struct sockaddr_in sa; -#ifdef HAVE_STRUCT_IP_MREQN - struct ip_mreqn mreq; - - memset(&mreq, 0, sizeof(mreq)); - mreq.imr_ifindex = idx; -#else - struct ip_mreq mreq; - struct ifreq ifreq; - - memset(&mreq, 0, sizeof(mreq)); - - if ((!if_indextoname(idx, ifreq.ifr_name))) { - avahi_log_warn("if_indextoname failed: %s", strerror(errno)); - return -1; - } - - if (ioctl(fd, SIOCGIFADDR, &ifreq) < 0) { - avahi_log_warn("SIOCGIFADDR failed: %s", strerror(errno)); - return -1; - } - - memcpy(&mreq.imr_interface, - &((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr, - sizeof(struct in_addr)); -#endif - mdns_mcast_group_ipv4 (&sa); - mreq.imr_multiaddr = sa.sin_addr; - - if (setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { - avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s", strerror(errno)); +static int reuseaddr(int fd) { + int yes; + + yes = 1; + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) { + avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno)); return -1; } - - return 0; -} - -int avahi_mdns_mcast_leave_ipv6(int fd, int idx) { - struct ipv6_mreq mreq6; - struct sockaddr_in6 sa6; - - mdns_mcast_group_ipv6 (&sa6); - - memset(&mreq6, 0, sizeof(mreq6)); - mreq6.ipv6mr_multiaddr = sa6.sin6_addr; - mreq6.ipv6mr_interface = idx; - - if (setsockopt(fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s", strerror(errno)); + +#ifdef SO_REUSEPORT + yes = 1; + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno)); return -1; } - +#endif + return 0; } static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { - int yes; assert(fd >= 0); assert(sa); @@ -231,12 +191,9 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { 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", strerror(errno)); + if (reuseaddr(fd) < 0) return -1; - } - + if (bind(fd, sa, l) < 0) { avahi_log_warn("bind() failed: %s", strerror(errno)); return -1; @@ -247,49 +204,103 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { * 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", strerror(errno)); + if (reuseaddr(fd) < 0) return -1; - } } return 0; } -static int ip_pktinfo (int fd, int yes) -{ - int ret = -1; - +static int ipv4_pktinfo(int fd) { + int yes; + #ifdef IP_PKTINFO - if ((ret = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes))) < 0) { + yes = 1; + if (setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_PKTINFO failed: %s", strerror(errno)); + return -1; } #else + #ifdef IP_RECVINTERFACE - if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof (yes))) < 0) { + yes = 1; + if (setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVINTERFACE failed: %s", strerror(errno)); + return -1; } -#else -#ifdef IP_RECVIF - if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof (yes))) < 0) { +#elif defined(IP_RECVIF) + yes = 1; + if (setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVIF failed: %s", strerror(errno)); + return -1; } -#endif /* IP_RECVIF */ -#endif /* IP_RECVINTERFACE */ -#if defined (IP_RECVDSTADDR) /* && !defined(solaris) */ - if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof (yes))) < 0) { +#endif + +#ifdef IP_RECVDSTADDR + yes = 1; + if (setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVDSTADDR failed: %s", strerror(errno)); + return -1; } -#endif /* IP_RECVDSTADDR */ +#endif + #endif /* IP_PKTINFO */ - return (ret); +#ifdef IP_RECVTTL + yes = 1; + if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno)); + return -1; + } +#endif + + return 0; +} + +static int ipv6_pktinfo(int fd) { + int yes; + +#ifdef IPV6_RECVPKTINFO + yes = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno)); + return -1; + } +#elif defined(IPV6_PKTINFO) + yes = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno)); + return -1; + } +#endif + +#ifdef IPV6_RECVHOPS + yes = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno)); + return -1; + } +#elif defined(IPV6_RECVHOPLIMIT) + yes = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno)); + return -1; + } +#elif defined(IPV6_HOPLIMIT) + yes = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno)); + return -1; + } +#endif + + return 0; } int avahi_open_socket_ipv4(int no_reuse) { struct sockaddr_in local; - int fd = -1, ttl, yes, r; + int fd = -1, r, ittl; + uint8_t ttl, cyes; if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { avahi_log_warn("socket() failed: %s", strerror(errno)); @@ -302,14 +313,14 @@ int avahi_open_socket_ipv4(int no_reuse) { goto fail; } - ttl = 255; - if (setsockopt(fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) < 0) { + ittl = 255; + if (setsockopt(fd, IPPROTO_IP, IP_TTL, &ittl, sizeof(ittl)) < 0) { avahi_log_warn("IP_TTL failed: %s", strerror(errno)); goto fail; } - yes = 1; - if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { + cyes = 1; + if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &cyes, sizeof(cyes)) < 0) { avahi_log_warn("IP_MULTICAST_LOOP failed: %s", strerror(errno)); goto fail; } @@ -326,16 +337,8 @@ int avahi_open_socket_ipv4(int no_reuse) { if (r < 0) goto fail; - yes = 1; - if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno)); - goto fail; - } - - yes = 1; - if (ip_pktinfo (fd, yes) < 0) { + if (ipv4_pktinfo (fd) < 0) goto fail; - } if (avahi_set_cloexec(fd) < 0) { avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); @@ -358,7 +361,8 @@ fail: int avahi_open_socket_ipv6(int no_reuse) { struct sockaddr_in6 sa, local; - int fd = -1, ttl, yes, r; + int fd = -1, yes, r; + int ttl; mdns_mcast_group_ipv6(&sa); @@ -403,39 +407,8 @@ int avahi_open_socket_ipv6(int no_reuse) { if (r < 0) goto fail; -#ifdef IPV6_RECVHOPS - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_RECVHOPLIMIT - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_HOPLIMIT - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno)); - goto fail; - } -#endif - -#ifdef IPV6_RECVPKTINFO - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_PKTINFO - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno)); + if (ipv6_pktinfo(fd) < 0) goto fail; - } -#endif if (avahi_set_cloexec(fd) < 0) { avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); @@ -477,28 +450,27 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) { return 0; } -int avahi_send_dns_packet_ipv4(int fd, int interface, AvahiDnsPacket *p, const AvahiIPv4Address *a, uint16_t port) { +int avahi_send_dns_packet_ipv4(int fd, AvahiIfIndex interface, AvahiDnsPacket *p, const AvahiIPv4Address *src_address, const AvahiIPv4Address *dst_address, uint16_t dst_port) { struct sockaddr_in sa; struct msghdr msg; struct iovec io; - struct cmsghdr *cmsg; #ifdef IP_PKTINFO - uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)]; -#elif IP_RECVIF - uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct sockaddr_dl)]; -#elif IP_RECVINTERFACE - uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(u_short)]; + struct cmsghdr *cmsg; + uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))]; +#elif defined(IP_SENDSRCADDR) + struct cmsghdr *cmsg; + uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))]; #endif assert(fd >= 0); assert(p); assert(avahi_dns_packet_check_valid(p) >= 0); - assert(!a || port > 0); + assert(!dst_address || dst_port > 0); - if (!a) + if (!dst_address) mdns_mcast_group_ipv4(&sa); else - ipv4_address_to_sockaddr(&sa, a, port); + ipv4_address_to_sockaddr(&sa, dst_address, dst_port); memset(&io, 0, sizeof(io)); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -510,69 +482,82 @@ int avahi_send_dns_packet_ipv4(int fd, int interface, AvahiDnsPacket *p, const A msg.msg_iov = &io; msg.msg_iovlen = 1; msg.msg_flags = 0; + msg.msg_control = NULL; + msg.msg_controllen = 0; - if (interface >= 0) { +#ifdef IP_PKTINFO + if (interface > 0 || src_address) { + struct in_pktinfo *pkti; memset(cmsg_data, 0, sizeof(cmsg_data)); cmsg = (struct cmsghdr*) cmsg_data; - cmsg->cmsg_len = sizeof(cmsg_data); + cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); cmsg->cmsg_level = IPPROTO_IP; -#ifdef IP_PKTINFO - { - struct in_pktinfo *pkti; + cmsg->cmsg_type = IP_PKTINFO; - cmsg->cmsg_type = IP_PKTINFO; - pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr)); - pkti->ipi_ifindex = interface; - } -#elif IP_RECVIF - { - struct sockaddr_dl *sdl; + pkti = (struct in_pktinfo*) CMSG_DATA(cmsg); - cmsg->cmsg_type = IP_RECVIF; - sdl = (struct sockaddr_dl*) (cmsg_data + sizeof(struct cmsghdr)); - sdl->sdl_index = interface; - } -#elif IP_RECVINTERFACE - { - u_short *i; + if (interface > 0) + pkti->ipi_ifindex = interface; + + if (src_address) + pkti->ipi_spec_dst.s_addr = src_address->address; - cmsg->cmsg_type = IP_RECVINTERFACE; - i = (u_short *) (cmsg_data + sizeof(struct cmsghdr)); - memcpy(&i, CMSG_DATA (cmsg), sizeof(u_short)); - } -#endif msg.msg_control = cmsg_data; msg.msg_controllen = sizeof(cmsg_data); - } else { - msg.msg_control = NULL; - msg.msg_controllen = 0; } +#elif defined(IP_SENDSRCADDR) + if (src_address) { + struct in_addr *addr; + + memset(cmsg_data, 0, sizeof(cmsg_data)); + cmsg = (struct cmsghdr*) cmsg_data; + cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr)); + cmsg->cmsg_level = IPPROTO_IP; + cmsg->cmsg_type = IP_SENDSRCADDR; + + addr = (struct in_addr *)CMSG_DATA(cmsg); + addr->s_addr = src_address->address; + + msg.msg_control = cmsg_data; + msg.msg_controllen = sizeof(cmsg_data); + } +#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 return sendmsg_loop(fd, &msg, 0); } -int avahi_send_dns_packet_ipv6(int fd, int interface, AvahiDnsPacket *p, const AvahiIPv6Address *a, uint16_t port) { +int avahi_send_dns_packet_ipv6(int fd, AvahiIfIndex interface, AvahiDnsPacket *p, const AvahiIPv6Address *src_address, const AvahiIPv6Address *dst_address, uint16_t dst_port) { struct sockaddr_in6 sa; struct msghdr msg; struct iovec io; struct cmsghdr *cmsg; - uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in6_pktinfo)]; + uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))]; assert(fd >= 0); assert(p); assert(avahi_dns_packet_check_valid(p) >= 0); + assert(!dst_address || dst_port > 0); - if (!a) + if (!dst_address) mdns_mcast_group_ipv6(&sa); else - ipv6_address_to_sockaddr(&sa, a, port); + ipv6_address_to_sockaddr(&sa, dst_address, dst_port); memset(&io, 0, sizeof(io)); io.iov_base = AVAHI_DNS_PACKET_DATA(p); io.iov_len = p->size; - memset(&msg, 0, sizeof(msg)); msg.msg_name = &sa; msg.msg_namelen = sizeof(sa); @@ -580,17 +565,22 @@ int avahi_send_dns_packet_ipv6(int fd, int interface, AvahiDnsPacket *p, const A msg.msg_iovlen = 1; msg.msg_flags = 0; - if (interface >= 0) { + if (interface > 0 || src_address) { struct in6_pktinfo *pkti; memset(cmsg_data, 0, sizeof(cmsg_data)); cmsg = (struct cmsghdr*) cmsg_data; - cmsg->cmsg_len = sizeof(cmsg_data); + cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo)); cmsg->cmsg_level = IPPROTO_IPV6; cmsg->cmsg_type = IPV6_PKTINFO; - pkti = (struct in6_pktinfo*) (cmsg_data + sizeof(struct cmsghdr)); - pkti->ipi6_ifindex = interface; + pkti = (struct in6_pktinfo*) CMSG_DATA(cmsg); + + if (interface > 0) + pkti->ipi6_ifindex = interface; + + if (src_address) + memcpy(&pkti->ipi6_addr, src_address->address, sizeof(src_address->address)); msg.msg_control = cmsg_data; msg.msg_controllen = sizeof(cmsg_data); @@ -602,15 +592,16 @@ int avahi_send_dns_packet_ipv6(int fd, int interface, AvahiDnsPacket *p, const A return sendmsg_loop(fd, &msg, 0); } -AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, AvahiIPv4Address *ret_dest_address, int *ret_iface, uint8_t* ret_ttl) { +AvahiDnsPacket *avahi_recv_dns_packet_ipv4(int fd, AvahiIPv4Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv4Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl) { AvahiDnsPacket *p= NULL; struct msghdr msg; struct iovec io; uint8_t aux[1024]; ssize_t l; struct cmsghdr *cmsg; - int found_ttl = 0, found_iface = 0, found_addr = 0; + int found_addr = 0; int ms; + struct sockaddr_in sa; assert(fd >= 0); @@ -625,13 +616,8 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A io.iov_len = p->max_size; memset(&msg, 0, sizeof(msg)); - if (ret_sa) { - msg.msg_name = ret_sa; - msg.msg_namelen = sizeof(struct sockaddr_in); - } else { - msg.msg_name = NULL; - msg.msg_namelen = 0; - } + msg.msg_name = &sa; + msg.msg_namelen = sizeof(sa); msg.msg_iov = &io; msg.msg_iovlen = 1; msg.msg_control = aux; @@ -643,73 +629,89 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A goto fail; } - if (ret_sa && ret_sa->sin_addr.s_addr == INADDR_ANY) { + if (sa.sin_addr.s_addr == INADDR_ANY) { /* Linux 2.4 behaves very strangely sometimes! */ - - /*avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l); */ goto fail; } - + assert(!(msg.msg_flags & MSG_CTRUNC)); assert(!(msg.msg_flags & MSG_TRUNC)); + p->size = (size_t) l; + if (ret_src_port) + *ret_src_port = avahi_port_from_sockaddr((struct sockaddr*) &sa); + + if (ret_src_address) { + AvahiAddress a; + avahi_address_from_sockaddr((struct sockaddr*) &sa, &a); + *ret_src_address = a.data.ipv4; + } + if (ret_ttl) - *ret_ttl = 0; + *ret_ttl = 255; + if (ret_iface) + *ret_iface = AVAHI_IF_UNSPEC; + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - + if (cmsg->cmsg_level == IPPROTO_IP) { - switch (cmsg->cmsg_type) { + + switch (cmsg->cmsg_type) { #ifdef IP_RECVTTL - case IP_RECVTTL: + case IP_RECVTTL: #endif - case IP_TTL: - if (ret_ttl) - *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); - found_ttl = 1; - break; + case IP_TTL: + if (ret_ttl) + *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); + + break; + #ifdef IP_PKTINFO - case IP_PKTINFO: - { - struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg); - - if (ret_iface) - *ret_iface = (int) i->ipi_ifindex; - - if (ret_dest_address) - ret_dest_address->address = i->ipi_addr.s_addr; - found_addr = found_iface = 1; - } - break; -#elif IP_RECVIF - case IP_RECVIF: - { - struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg); - - if (ret_iface) - *ret_iface = (int) sdl->sdl_index; - found_iface = 1; - } - break; -#endif + case IP_PKTINFO: { + struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg); + + if (ret_iface) + *ret_iface = (int) i->ipi_ifindex; + + if (ret_dst_address) + ret_dst_address->address = i->ipi_addr.s_addr; + + found_addr = 1; + + break; + } +#endif + +#ifdef IP_RECVIF + case IP_RECVIF: { + struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg); + + if (ret_iface) + *ret_iface = (int) sdl->sdl_index; + + break; + } +#endif + #ifdef IP_RECVDSTADDR - case IP_RECVDSTADDR: - if (ret_dest_address) - memcpy (&ret_dest_address->address, CMSG_DATA (cmsg), 4); - found_addr = 1; - break; + case IP_RECVDSTADDR: + if (ret_dst_address) + memcpy(&ret_dst_address->address, CMSG_DATA (cmsg), 4); + + found_addr = 1; + break; #endif - default: - avahi_log_warn("Unhandled cmsg_type : %d",cmsg->cmsg_type); - break; - } + + default: + avahi_log_warn("Unhandled cmsg_type : %d", cmsg->cmsg_type); + break; + } } } - assert(found_iface); assert(found_addr); - assert(found_ttl); return p; @@ -720,16 +722,16 @@ fail: return NULL; } -AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa, AvahiIPv6Address *ret_dest_address, int *ret_iface, uint8_t* ret_ttl) { +AvahiDnsPacket *avahi_recv_dns_packet_ipv6(int fd, AvahiIPv6Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv6Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl) { AvahiDnsPacket *p = NULL; struct msghdr msg; struct iovec io; uint8_t aux[64]; ssize_t l; int ms; - struct cmsghdr *cmsg; int found_ttl = 0, found_iface = 0; + struct sockaddr_in6 sa; assert(fd >= 0); @@ -744,13 +746,8 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa, io.iov_len = p->max_size; memset(&msg, 0, sizeof(msg)); - if (ret_sa) { - msg.msg_name = ret_sa; - msg.msg_namelen = sizeof(struct sockaddr_in6); - } else { - msg.msg_name = NULL; - msg.msg_namelen = 0; - } + msg.msg_name = (struct sockaddr*) &sa; + msg.msg_namelen = sizeof(sa); msg.msg_iov = &io; msg.msg_iovlen = 1; @@ -763,29 +760,52 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa, goto fail; } + assert(!(msg.msg_flags & MSG_CTRUNC)); + assert(!(msg.msg_flags & MSG_TRUNC)); + p->size = (size_t) l; - if (ret_ttl) - *ret_ttl = 0; + if (ret_src_port) + *ret_src_port = avahi_port_from_sockaddr((struct sockaddr*) &sa); + + if (ret_src_address) { + AvahiAddress a; + avahi_address_from_sockaddr((struct sockaddr*) &sa, &a); + *ret_src_address = a.data.ipv6; + } for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) { - if (ret_ttl) - *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); - - found_ttl = 1; - } - - if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) { - struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); + if (cmsg->cmsg_level == IPPROTO_IPV6) { + + switch (cmsg->cmsg_type) { + + case IPV6_HOPLIMIT: - if (ret_iface) - *ret_iface = i->ipi6_ifindex; + if (ret_ttl) + *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); - if (ret_dest_address) - memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16); - found_iface = 1; + found_ttl = 1; + + break; + + case IPV6_PKTINFO: { + struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); + + if (ret_iface) + *ret_iface = i->ipi6_ifindex; + + if (ret_dst_address) + memcpy(ret_dst_address->address, i->ipi6_addr.s6_addr, 16); + + found_iface = 1; + break; + } + + default: + avahi_log_warn("Unhandled cmsg_type : %d", cmsg->cmsg_type); + break; + } } } @@ -803,7 +823,7 @@ fail: int avahi_open_unicast_socket_ipv4(void) { struct sockaddr_in local; - int fd = -1, yes; + int fd = -1; if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { avahi_log_warn("socket() failed: %s", strerror(errno)); @@ -818,14 +838,7 @@ int avahi_open_unicast_socket_ipv4(void) { goto fail; } - yes = 1; - if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno)); - goto fail; - } - - yes = 1; - if (ip_pktinfo (fd, yes) < 0) { + if (ipv4_pktinfo(fd) < 0) { goto fail; } @@ -850,7 +863,7 @@ fail: int avahi_open_unicast_socket_ipv6(void) { struct sockaddr_in6 local; - int fd = -1, yes; + int fd = -1; if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { avahi_log_warn("socket() failed: %s", strerror(errno)); @@ -865,39 +878,8 @@ int avahi_open_unicast_socket_ipv6(void) { goto fail; } -#ifdef IPV6_RECVHOPS - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_RECVHOPLIMIT - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_HOPLIMIT - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno)); - goto fail; - } -#endif - -#ifdef IPV6_RECVPKTINFO - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno)); - goto fail; - } -#elif IPV6_PKTINFO - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno)); + if (ipv6_pktinfo(fd) < 0) goto fail; - } -#endif if (avahi_set_cloexec(fd) < 0) { avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));