X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fsocket.c;h=a555eafba1a0f039ed22d236ebda045d848af820;hb=709a2ef026cab9424737fa37c40af52da60be59d;hp=ecc137bafa497fdfea14757cc6afb7f6760c83d1;hpb=1ffedb586bd2fb6daa3970304fac7c5b415cd38f;p=catta diff --git a/avahi-core/socket.c b/avahi-core/socket.c index ecc137b..a555eaf 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -42,6 +42,19 @@ #include "socket.h" #include "log.h" +/* this is a portability hack */ +#ifndef IPV6_ADD_MEMBERSHIP +#ifdef IPV6_JOIN_GROUP +#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP +#endif +#endif + +#ifndef IPV6_DROP_MEMBERSHIP +#ifdef IPV6_LEAVE_GROUP +#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP +#endif +#endif + static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) { assert(ret_sa); @@ -92,8 +105,8 @@ int avahi_mdns_mcast_join_ipv4(int fd, int idx) { mreq.imr_multiaddr = sa.sin_addr; mreq.imr_ifindex = idx; - if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { - avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { + avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s", strerror(errno)); return -1; } @@ -110,8 +123,8 @@ int avahi_mdns_mcast_join_ipv6(int fd, int idx) { mreq6.ipv6mr_multiaddr = sa6.sin6_addr; mreq6.ipv6mr_interface = idx; - if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { + avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s", strerror(errno)); return -1; } @@ -128,8 +141,8 @@ int avahi_mdns_mcast_leave_ipv4(int fd, int idx) { mreq.imr_multiaddr = sa.sin_addr; mreq.imr_ifindex = idx; - if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { - avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { + avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s", strerror(errno)); return -1; } @@ -146,8 +159,8 @@ int avahi_mdns_mcast_leave_ipv6(int fd, int idx) { mreq6.ipv6mr_multiaddr = sa6.sin6_addr; mreq6.ipv6mr_interface = idx; - if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { + avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s", strerror(errno)); return -1; } @@ -164,7 +177,7 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { if (bind(fd, sa, l) < 0) { if (errno != EADDRINUSE) { - avahi_log_warn("bind() failed: %s\n", strerror(errno)); + avahi_log_warn("bind() failed: %s", strerror(errno)); return -1; } @@ -174,12 +187,12 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { /* 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)); + avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno)); return -1; } if (bind(fd, sa, l) < 0) { - avahi_log_warn("bind() failed: %s\n", strerror(errno)); + avahi_log_warn("bind() failed: %s", strerror(errno)); return -1; } } else { @@ -190,7 +203,7 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { yes = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) { - avahi_log_warn("SO_REUSEADDR failed: %s\n", strerror(errno)); + avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno)); return -1; } } @@ -198,30 +211,60 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) { return 0; } -int avahi_open_socket_ipv4(void) { +static int ip_pktinfo (int fd, int yes) +{ + int ret = -1; + +#if IP_PKTINFO + if ((ret = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes))) < 0) { + avahi_log_warn("IP_PKTINFO failed: %s", strerror(errno)); + } +#else +#ifdef IP_RECVINTERFACE + if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof (yes))) < 0) { + avahi_log_warn("IP_RECVINTERFACE failed: %s", strerror(errno)); + } +#else +#ifdef IP_RECVIF + if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof (yes))) < 0) { + avahi_log_warn("IP_RECVIF failed: %s", strerror(errno)); + } +#endif /* IP_RECVIF */ +#endif /* IP_RECVINTERFACE */ +#if defined (IP_RECVDSTADDR) /* && !defined(solaris) */ + if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof (yes))) < 0) { + avahi_log_warn("IP_RECVDSTADDR failed: %s", strerror(errno)); + } +#endif /* IP_RECVDSTADDR */ +#endif /* IP_PKTINFO */ + + return (ret); +} + +int avahi_open_socket_ipv4(int no_reuse) { struct sockaddr_in local; - int fd = -1, ttl, yes; + int fd = -1, ttl, yes, r; if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - avahi_log_warn("socket() failed: %s\n", strerror(errno)); + avahi_log_warn("socket() failed: %s", strerror(errno)); goto fail; } ttl = 255; - if (setsockopt(fd, SOL_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) { - avahi_log_warn("IP_MULTICAST_TTL failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) { + avahi_log_warn("IP_MULTICAST_TTL failed: %s", strerror(errno)); goto fail; } ttl = 255; - if (setsockopt(fd, SOL_IP, IP_TTL, &ttl, sizeof(ttl)) < 0) { - avahi_log_warn("IP_TTL failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) < 0) { + avahi_log_warn("IP_TTL failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_MULTICAST_LOOP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IP_MULTICAST_LOOP failed: %s", strerror(errno)); goto fail; } @@ -229,28 +272,32 @@ int avahi_open_socket_ipv4(void) { local.sin_family = AF_INET; local.sin_port = htons(AVAHI_MDNS_PORT); - if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0) + if (no_reuse) + r = bind(fd, (struct sockaddr*) &local, sizeof(local)); + else + r = bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)); + + if (r < 0) goto fail; yes = 1; - if (setsockopt(fd, SOL_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_RECVTTL failed: %s\n", strerror(errno)); + 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 (setsockopt(fd, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_PKTINFO failed: %s\n", strerror(errno)); - goto fail; + if (ip_pktinfo (fd, yes) < 0) { + goto fail; } - + if (avahi_set_cloexec(fd) < 0) { - avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno)); + avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); goto fail; } if (avahi_set_nonblock(fd) < 0) { - avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno)); + avahi_log_warn("O_NONBLOCK failed: %s", strerror(errno)); goto fail; } @@ -263,38 +310,38 @@ fail: return -1; } -int avahi_open_socket_ipv6(void) { +int avahi_open_socket_ipv6(int no_reuse) { struct sockaddr_in6 sa, local; - int fd = -1, ttl, yes; + int fd = -1, ttl, yes, r; mdns_mcast_group_ipv6(&sa); if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - avahi_log_warn("socket() failed: %s\n", strerror(errno)); + avahi_log_warn("socket() failed: %s", strerror(errno)); goto fail; } ttl = 255; - if (setsockopt(fd, SOL_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0) { - avahi_log_warn("IPV6_MULTICAST_HOPS failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0) { + avahi_log_warn("IPV6_MULTICAST_HOPS failed: %s", strerror(errno)); goto fail; } ttl = 255; - if (setsockopt(fd, SOL_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)) < 0) { - avahi_log_warn("IPV6_UNICAST_HOPS failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)) < 0) { + avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_V6ONLY failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s", strerror(errno)); goto fail; } @@ -302,28 +349,33 @@ int avahi_open_socket_ipv6(void) { local.sin6_family = AF_INET6; local.sin6_port = htons(AVAHI_MDNS_PORT); - if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0) + if (no_reuse) + r = bind(fd, (struct sockaddr*) &local, sizeof(local)); + else + r = bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)); + + if (r < 0) goto fail; yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_HOPLIMIT failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_PKTINFO failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno)); goto fail; } if (avahi_set_cloexec(fd) < 0) { - avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno)); + avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); goto fail; } if (avahi_set_nonblock(fd) < 0) { - avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno)); + avahi_log_warn("O_NONBLOCK failed: %s", strerror(errno)); goto fail; } @@ -346,7 +398,7 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) { break; if (errno != EAGAIN) { - avahi_log_debug("sendmsg() failed: %s\n", strerror(errno)); + avahi_log_debug("sendmsg() failed: %s", strerror(errno)); return -1; } @@ -514,7 +566,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - if (cmsg->cmsg_level == SOL_IP) { + if (cmsg->cmsg_level == IPPROTO_IP) { if (cmsg->cmsg_type == IP_TTL) { if (ret_ttl) @@ -594,7 +646,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa, *ret_ttl = 0; for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) { + if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) { if (ret_ttl) *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); @@ -602,7 +654,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa, found_ttl = 1; } - if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) { + if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) { struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); if (ret_iface) @@ -631,7 +683,7 @@ int avahi_open_unicast_socket_ipv4(void) { int fd = -1, yes; if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - avahi_log_warn("socket() failed: %s\n", strerror(errno)); + avahi_log_warn("socket() failed: %s", strerror(errno)); goto fail; } @@ -639,29 +691,28 @@ int avahi_open_unicast_socket_ipv4(void) { local.sin_family = AF_INET; if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) { - avahi_log_warn("bind() failed: %s\n", strerror(errno)); + avahi_log_warn("bind() failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_RECVTTL failed: %s\n", strerror(errno)); + 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 (setsockopt(fd, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IP_PKTINFO failed: %s\n", strerror(errno)); - goto fail; + if (ip_pktinfo (fd, yes) < 0) { + goto fail; } - + if (avahi_set_cloexec(fd) < 0) { - avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno)); + avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); goto fail; } if (avahi_set_nonblock(fd) < 0) { - avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno)); + avahi_log_warn("O_NONBLOCK failed: %s", strerror(errno)); goto fail; } @@ -679,7 +730,7 @@ int avahi_open_unicast_socket_ipv6(void) { int fd = -1, yes; if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - avahi_log_warn("socket() failed: %s\n", strerror(errno)); + avahi_log_warn("socket() failed: %s", strerror(errno)); goto fail; } @@ -687,29 +738,29 @@ int avahi_open_unicast_socket_ipv6(void) { local.sin6_family = AF_INET6; if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) { - avahi_log_warn("bind() failed: %s\n", strerror(errno)); + avahi_log_warn("bind() failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_HOPLIMIT failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno)); goto fail; } yes = 1; - if (setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_PKTINFO failed: %s\n", strerror(errno)); + if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) { + avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno)); goto fail; } if (avahi_set_cloexec(fd) < 0) { - avahi_log_warn("FD_CLOEXEC failed: %s\n", strerror(errno)); + avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno)); goto fail; } if (avahi_set_nonblock(fd) < 0) { - avahi_log_warn("O_NONBLOCK failed: %s\n", strerror(errno)); + avahi_log_warn("O_NONBLOCK failed: %s", strerror(errno)); goto fail; }