#include <sys/ioctl.h>
#include <assert.h>
+#ifdef IP_RECVIF
+#include <net/if_dl.h>
+#endif
+
#include "dns.h"
#include "fdutil.h"
#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);
}
int avahi_mdns_mcast_join_ipv4(int fd, int idx) {
- struct ip_mreqn mreq;
+/* FIXME: sebest : we must factorize this part of the code */
struct sockaddr_in sa;
-
- mdns_mcast_group_ipv4 (&sa);
+#ifdef HAVE_STRUCT_IP_MREQN
+ struct ip_mreqn mreq;
memset(&mreq, 0, sizeof(mreq));
- 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));
+#else
+ struct ip_mreq mreq;
+ struct ifreq ifreq;
+
+ memset(&mreq, 0, sizeof(mreq));
+
+ if ((!if_indextoname(idx, ifreq.ifr_name))) {
+ avahi_log_warn("Can't find iface name for iface index %i:%s\n", idx, 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_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
+ avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s", strerror(errno));
return -1;
}
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;
}
}
int avahi_mdns_mcast_leave_ipv4(int fd, int idx) {
- struct ip_mreqn mreq;
+/* FIXME: sebest : we must factorize this part of the code */
struct sockaddr_in sa;
-
- mdns_mcast_group_ipv4 (&sa);
+#ifdef HAVE_STRUCT_IP_MREQN
+ struct ip_mreqn mreq;
memset(&mreq, 0, sizeof(mreq));
- 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));
+#else
+ struct ip_mreq mreq;
+ struct ifreq ifreq;
+
+ memset(&mreq, 0, sizeof(mreq));
+
+ if ((!if_indextoname(idx, ifreq.ifr_name))) {
+ avahi_log_warn("Can't find iface name for iface index %i:%s\n", idx, 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));
return -1;
}
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;
}
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;
}
/* 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 {
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;
}
}
return 0;
}
-int avahi_open_socket_ipv4(void) {
+static int ip_pktinfo (int fd, int yes)
+{
+ int ret = -1;
+
+#ifdef 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;
}
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;
}
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;
}
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;
}
break;
if (errno != EAGAIN) {
- avahi_log_debug("sendmsg() failed: %s\n", strerror(errno));
+ avahi_log_debug("sendmsg() failed: %s", strerror(errno));
return -1;
}
struct msghdr msg;
struct iovec io;
struct cmsghdr *cmsg;
- struct in_pktinfo *pkti;
+#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)];
+#endif
assert(fd >= 0);
assert(p);
- assert(avahi_dns_packet_is_valid(p) >= 0);
+ assert(avahi_dns_packet_check_valid(p) >= 0);
assert(!a || port > 0);
if (!a)
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
io.iov_len = p->size;
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
- cmsg->cmsg_len = sizeof(cmsg_data);
- cmsg->cmsg_level = IPPROTO_IP;
- cmsg->cmsg_type = IP_PKTINFO;
-
- pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
- pkti->ipi_ifindex = interface;
-
memset(&msg, 0, sizeof(msg));
msg.msg_name = &sa;
msg.msg_namelen = sizeof(sa);
msg.msg_iov = &io;
msg.msg_iovlen = 1;
- msg.msg_control = cmsg_data;
- msg.msg_controllen = sizeof(cmsg_data);
msg.msg_flags = 0;
+ if (interface >= 0) {
+
+ memset(cmsg_data, 0, sizeof(cmsg_data));
+ cmsg = (struct cmsghdr*) cmsg_data;
+ cmsg->cmsg_len = sizeof(cmsg_data);
+ cmsg->cmsg_level = IPPROTO_IP;
+#ifdef IP_PKTINFO
+ {
+ struct in_pktinfo *pkti;
+
+ cmsg->cmsg_type = IP_PKTINFO;
+ pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
+ pkti->ipi_ifindex = interface;
+ }
+#elif IP_RECVIF
+ {
+ struct sockaddr_dl *pkti;
+
+ cmsg->cmsg_type = IP_RECVIF;
+ pkti = (struct sockaddr_dl*) (cmsg_data + sizeof(struct cmsghdr));
+ pkti->sdl_index = interface;
+ }
+#elif IP_RECVINTERFACE
+ {
+ u_short *i;
+
+ cmsg->cmsg_type = IP_RECVINTERFACE;
+ i = (u_short *) (cmsg_data + sizeof(u_short));
+ 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;
+ }
+
return sendmsg_loop(fd, &msg, 0);
}
struct msghdr msg;
struct iovec io;
struct cmsghdr *cmsg;
- struct in6_pktinfo *pkti;
uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in6_pktinfo)];
assert(fd >= 0);
assert(p);
- assert(avahi_dns_packet_is_valid(p) >= 0);
+ assert(avahi_dns_packet_check_valid(p) >= 0);
if (!a)
mdns_mcast_group_ipv6(&sa);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
io.iov_len = p->size;
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
- cmsg->cmsg_len = sizeof(cmsg_data);
- cmsg->cmsg_level = IPPROTO_IPV6;
- cmsg->cmsg_type = IPV6_PKTINFO;
-
- pkti = (struct in6_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
- pkti->ipi6_ifindex = interface;
memset(&msg, 0, sizeof(msg));
msg.msg_name = &sa;
msg.msg_namelen = sizeof(sa);
msg.msg_iov = &io;
msg.msg_iovlen = 1;
- msg.msg_control = cmsg_data;
- msg.msg_controllen = sizeof(cmsg_data);
msg.msg_flags = 0;
- return sendmsg_loop(fd, &msg, 0 /*MSG_DONTROUTE*/);
+ if (interface >= 0) {
+ struct in6_pktinfo *pkti;
+
+ memset(cmsg_data, 0, sizeof(cmsg_data));
+ cmsg = (struct cmsghdr*) cmsg_data;
+ cmsg->cmsg_len = sizeof(cmsg_data);
+ cmsg->cmsg_level = IPPROTO_IPV6;
+ cmsg->cmsg_type = IPV6_PKTINFO;
+
+ pkti = (struct in6_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
+ pkti->ipi6_ifindex = interface;
+
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
+ } else {
+ msg.msg_control = NULL;
+ msg.msg_controllen = 0;
+ }
+
+ 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) {
uint8_t aux[1024];
ssize_t l;
struct cmsghdr *cmsg;
- int found_ttl = 0, found_iface = 0;
+ int found_ttl = 0, found_iface = 0, found_addr = 0;
int ms;
assert(fd >= 0);
- assert(ret_sa);
- assert(ret_dest_address);
- assert(ret_iface);
- assert(ret_ttl);
if (ioctl(fd, FIONREAD, &ms) < 0) {
avahi_log_warn("ioctl(): %s", strerror(errno));
io.iov_len = p->max_size;
memset(&msg, 0, sizeof(msg));
- msg.msg_name = ret_sa;
- msg.msg_namelen = sizeof(struct sockaddr_in);
+ 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_iov = &io;
msg.msg_iovlen = 1;
msg.msg_control = aux;
goto fail;
}
- if (ret_sa->sin_addr.s_addr == INADDR_ANY) {
+ if (ret_sa && ret_sa->sin_addr.s_addr == INADDR_ANY) {
/* Linux 2.4 behaves very strangely sometimes! */
/*avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l); */
assert(!(msg.msg_flags & MSG_CTRUNC));
assert(!(msg.msg_flags & MSG_TRUNC));
p->size = (size_t) l;
-
- *ret_ttl = 0;
-/* avahi_hexdump(msg.msg_control, msg.msg_controllen); */
-
+ if (ret_ttl)
+ *ret_ttl = 0;
+
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-/* avahi_hexdump(CMSG_DATA(cmsg), cmsg->cmsg_len - sizeof(struct cmsghdr)); */
-
- if (cmsg->cmsg_level == SOL_IP) {
-
- if (cmsg->cmsg_type == IP_TTL) {
- *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
- found_ttl = 1;
- } else if (cmsg->cmsg_type == IP_PKTINFO) {
- struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
- *ret_iface = (int) i->ipi_ifindex;
- ret_dest_address->address = i->ipi_addr.s_addr;
- found_iface = 1;
- }
+ if (cmsg->cmsg_level == IPPROTO_IP) {
+ switch (cmsg->cmsg_type) {
+ case IP_TTL:
+ if (ret_ttl)
+ *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
+ found_ttl = 1;
+ 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
+#ifdef IP_RECVDSTADDR
+ case IP_RECVDSTADDR:
+ if (ret_dest_address)
+ memcpy (&ret_dest_address->address, CMSG_DATA (cmsg), 4);
+ found_addr = 1;
+ break;
+#endif
+ }
}
}
-/* avahi_log_debug("ttl=%u iface=%i", *ret_ttl, *ret_iface); */
-
assert(found_iface);
+ assert(found_addr);
assert(found_ttl);
return p;
int found_ttl = 0, found_iface = 0;
assert(fd >= 0);
- assert(ret_sa);
- assert(ret_dest_address);
- assert(ret_iface);
- assert(ret_ttl);
if (ioctl(fd, FIONREAD, &ms) < 0) {
avahi_log_warn("ioctl(): %s", strerror(errno));
io.iov_len = p->max_size;
memset(&msg, 0, sizeof(msg));
- msg.msg_name = ret_sa;
- msg.msg_namelen = sizeof(struct sockaddr_in6);
+ 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_iov = &io;
msg.msg_iovlen = 1;
msg.msg_control = aux;
}
p->size = (size_t) l;
-
- *ret_ttl = 0;
+
+ if (ret_ttl)
+ *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) {
- *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(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 == 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);
- *ret_iface = i->ipi6_ifindex;
- memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);
+
+ if (ret_iface)
+ *ret_iface = i->ipi6_ifindex;
+
+ if (ret_dest_address)
+ memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);
found_iface = 1;
}
}
return NULL;
}
-int avahi_open_legacy_unicast_socket_ipv4(void) {
+int avahi_open_unicast_socket_ipv4(void) {
struct sockaddr_in local;
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;
}
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;
}
return -1;
}
-int avahi_open_legacy_unicast_socket_ipv6(void) {
- struct sockaddr_in local;
+int avahi_open_unicast_socket_ipv6(void) {
+ struct sockaddr_in6 local;
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;
}
memset(&local, 0, sizeof(local));
- local.sin_family = AF_INET;
+ 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;
}
projects / catta / blobdiff