#include <errno.h>
#include <string.h>
#include <stdio.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/time.h>
-#include <net/if.h>
#include <sys/ioctl.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
#include <assert.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <sys/uio.h>
+
#ifdef IP_RECVIF
#include <net/if_dl.h>
#endif
#include "fdutil.h"
#include "socket.h"
#include "log.h"
+#include "addr-util.h"
/* this is a portability hack */
#ifndef IPV6_ADD_MEMBERSHIP
memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
}
+int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *a, int idx, int join) {
#ifdef HAVE_STRUCT_IP_MREQN
-int avahi_mdns_mcast_join_ipv4(int fd, int idx, int join) {
struct ip_mreqn mreq;
#else
-int avahi_mdns_mcast_join_ipv4(int fd, const AvahiAddress *a, int join) {
struct ip_mreq mreq;
#endif
-
struct sockaddr_in sa;
- memset(&mreq, 0, sizeof(mreq));
+ assert(fd >= 0);
+ assert(idx >= 0);
+ assert(a);
+
+ memset(&mreq, 0, sizeof(mreq));
#ifdef HAVE_STRUCT_IP_MREQN
mreq.imr_ifindex = idx;
+ mreq.imr_address.s_addr = a->address;
#else
- assert(a);
- assert(a->proto == AVAHI_PROTO_INET);
- mreq.imr_interface.s_addr = a->data.ipv4.address;
+ mreq.imr_interface.s_addr = a->address;
#endif
-
mdns_mcast_group_ipv4(&sa);
mreq.imr_multiaddr = sa.sin_addr;
+ /* Some network drivers have issues with dropping membership of
+ * mcast groups when the iface is down, but don't allow rejoining
+ * when it comes back up. This is an ugly workaround */
+ if (join)
+ setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq));
+
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 join) {
+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 (join)
+ setsockopt(fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6));
+
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_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;
#ifdef IP_PKTINFO
struct cmsghdr *cmsg;
- uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)];
+ size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
+#elif defined(IP_SENDSRCADDR)
+ struct cmsghdr *cmsg;
+ size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
#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);
msg.msg_controllen = 0;
#ifdef IP_PKTINFO
- if (interface >= 0) {
+ 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);
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
cmsg->cmsg_level = IPPROTO_IP;
cmsg->cmsg_type = IP_PKTINFO;
- pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
- pkti->ipi_ifindex = interface;
+ pkti = (struct in_pktinfo*) CMSG_DATA(cmsg);
- msg.msg_control = cmsg_data;
- msg.msg_controllen = sizeof(cmsg_data);
+ if (interface > 0)
+ pkti->ipi_ifindex = interface;
+
+ if (src_address)
+ pkti->ipi_spec_dst.s_addr = src_address->address;
+
+ msg.msg_controllen = cmsg->cmsg_len;
}
-#else
-#ifdef __GNUC__
-#warning "FIXME: We need some code to set the outgoing interface here if IP_PKTINFO is not available"
-#endif
+#elif defined(IP_SENDSRCADDR)
+ if (src_address) {
+ struct in_addr *addr;
+
+ memset(cmsg_data, 0, sizeof(cmsg_data));
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ 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_controllen = cmsg->cmsg_len;
+}
+#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)];
+ size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
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);
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);
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ 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);
+ msg.msg_controllen = cmsg->cmsg_len;
} 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) {
+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];
+ size_t aux[1024 / sizeof(size_t)]; /* for alignment on ia64 ! */
ssize_t l;
struct cmsghdr *cmsg;
- int found_iface = 0, found_addr = 0;
+ int found_addr = 0;
int ms;
+ struct sockaddr_in sa;
assert(fd >= 0);
goto fail;
}
+ if (ms < 0) {
+ avahi_log_warn("FIONREAD returned negative value.");
+ goto fail;
+ }
+
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
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;
msg.msg_flags = 0;
if ((l = recvmsg(fd, &msg, 0)) < 0) {
- avahi_log_warn("recvmsg(): %s", strerror(errno));
+ /* Linux returns EAGAIN when an invalid IP packet has been
+ recieved. We suppress warnings in this case because this might
+ create quite a bit of log traffic on machines with unstable
+ links. (See #60) */
+
+ if (errno != EAGAIN)
+ avahi_log_warn("recvmsg(): %s", strerror(errno));
+
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 = 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) {
#ifdef IP_RECVTTL
case IP_RECVTTL:
if (ret_iface)
*ret_iface = (int) i->ipi_ifindex;
- if (ret_dest_address)
- ret_dest_address->address = i->ipi_addr.s_addr;
+ if (ret_dst_address)
+ ret_dst_address->address = i->ipi_addr.s_addr;
- found_addr = found_iface = 1;
+ found_addr = 1;
break;
}
-#elif defined(IP_RECVIF)
+#endif
+
+#ifdef IP_RECVIF
case IP_RECVIF: {
struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg);
if (ret_iface)
+#ifdef __sun
+ *ret_iface = *(uint_t*) sdl;
+#else
*ret_iface = (int) sdl->sdl_index;
-
- found_iface = 1;
+#endif
+
break;
}
#endif
#ifdef IP_RECVDSTADDR
case IP_RECVDSTADDR:
- if (ret_dest_address)
- memcpy(&ret_dest_address->address, CMSG_DATA (cmsg), 4);
+ if (ret_dst_address)
+ memcpy(&ret_dst_address->address, CMSG_DATA (cmsg), 4);
+
found_addr = 1;
break;
-
#endif
default:
}
}
- assert(found_iface);
assert(found_addr);
return p;
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];
+ size_t aux[1024 / sizeof(size_t)];
ssize_t l;
int ms;
struct cmsghdr *cmsg;
int found_ttl = 0, found_iface = 0;
+ struct sockaddr_in6 sa;
assert(fd >= 0);
avahi_log_warn("ioctl(): %s", strerror(errno));
goto fail;
}
+
+ if (ms < 0) {
+ avahi_log_warn("FIONREAD returned negative value.");
+ goto fail;
+ }
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
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;
msg.msg_flags = 0;
if ((l = recvmsg(fd, &msg, 0)) < 0) {
- avahi_log_warn("recvmsg(): %s", strerror(errno));
+ /* Linux returns EAGAIN when an invalid IP packet has been
+ recieved. We suppress warnings in this case because this might
+ create quite a bit of log traffic on machines with unstable
+ links. (See #60) */
+
+ if (errno != EAGAIN)
+ avahi_log_warn("recvmsg(): %s", strerror(errno));
+
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) {
- if (ret_iface)
- *ret_iface = i->ipi6_ifindex;
+ switch (cmsg->cmsg_type) {
- if (ret_dest_address)
- memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);
-
- found_iface = 1;
+ case IPV6_HOPLIMIT:
+
+ if (ret_ttl)
+ *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
+
+ 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;
+ }
}
}
assert(found_iface);
assert(found_ttl);
-
+
return p;
fail:
int avahi_open_unicast_socket_ipv6(void) {
struct sockaddr_in6 local;
- int fd = -1;
+ int fd = -1, yes;
if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
avahi_log_warn("socket() failed: %s", strerror(errno));
goto fail;
}
+ yes = 1;
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
+ avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
+ goto fail;
+ }
+
memset(&local, 0, sizeof(local));
local.sin6_family = AF_INET6;
projects / catta / blobdiff