ret_sa->sin_family = AF_INET;
ret_sa->sin_port = htons(AVAHI_MDNS_PORT);
- inet_pton(AF_INET, "224.0.0.251", &ret_sa->sin_addr);
+ inet_pton(AF_INET, AVAHI_IPV4_MCAST_GROUP, &ret_sa->sin_addr);
}
static void mdns_mcast_group_ipv6(struct sockaddr_in6 *ret_sa) {
ret_sa->sin6_family = AF_INET6;
ret_sa->sin6_port = htons(AVAHI_MDNS_PORT);
- inet_pton(AF_INET6, "ff02::fb", &ret_sa->sin6_addr);
+ inet_pton(AF_INET6, AVAHI_IPV6_MCAST_GROUP, &ret_sa->sin6_addr);
}
static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, guint16 port) {
memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
}
-int avahi_mdns_mcast_join_ipv4 (int index, int fd) {
+int avahi_mdns_mcast_join_ipv4(gint fd, gint idx) {
struct ip_mreqn mreq;
struct sockaddr_in sa;
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
- mreq.imr_ifindex = index;
+ 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));
return 0;
}
-int avahi_mdns_mcast_join_ipv6 (int index, int fd) {
+int avahi_mdns_mcast_join_ipv6(gint fd, gint idx) {
struct ipv6_mreq mreq6;
struct sockaddr_in6 sa6;
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
- mreq6.ipv6mr_interface = index;
+ 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));
return 0;
}
-int avahi_mdns_mcast_leave_ipv4 (int index, int fd) {
+int avahi_mdns_mcast_leave_ipv4(gint fd, gint idx) {
struct ip_mreqn mreq;
struct sockaddr_in sa;
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
- mreq.imr_ifindex = index;
+ 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));
return 0;
}
-int avahi_mdns_mcast_leave_ipv6 (int index, int fd) {
+int avahi_mdns_mcast_leave_ipv6(gint fd, gint idx) {
struct ipv6_mreq mreq6;
struct sockaddr_in6 sa6;
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
- mreq6.ipv6mr_interface = index;
+ 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));
return 0;
}
+static gint bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
+ gint yes;
+
+ g_assert(fd >= 0);
+ g_assert(sa);
+ g_assert(l > 0);
+
+ if (bind(fd, sa, l) < 0) {
+
+ if (errno != EADDRINUSE) {
+ avahi_log_warn("bind() failed: %s\n", strerror(errno));
+ return -1;
+ }
+
+ avahi_log_warn("*** WARNING: Detected another %s mDNS stack running on this host. This makes mDNS unreliable and is thus not recommended. ***",
+ 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\n", strerror(errno));
+ return -1;
+ }
+
+ if (bind(fd, sa, l) < 0) {
+ avahi_log_warn("bind() failed: %s\n", strerror(errno));
+ return -1;
+ }
+ } else {
+
+ /* We enable SO_REUSEADDR afterwards, to make sure that the
+ * 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\n", strerror(errno));
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
gint avahi_open_socket_ipv4(void) {
struct sockaddr_in local;
int fd = -1, ttl, yes;
goto fail;
}
- yes = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
- avahi_log_warn("SO_REUSEADDR failed: %s\n", 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));
goto fail;
}
-
memset(&local, 0, sizeof(local));
local.sin_family = AF_INET;
local.sin_port = htons(AVAHI_MDNS_PORT);
-
- if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
- avahi_log_warn("bind() failed: %s\n", strerror(errno));
+
+ if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0)
goto fail;
- }
yes = 1;
if (setsockopt(fd, SOL_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
goto fail;
}
- yes = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
- avahi_log_warn("SO_REUSEADDR failed: %s\n", 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));
local.sin6_family = AF_INET6;
local.sin6_port = htons(AVAHI_MDNS_PORT);
- if (bind(fd, (struct sockaddr*) &local, sizeof(local)) < 0) {
- avahi_log_warn("bind() failed: %s\n", strerror(errno));
+ if (bind_with_warn(fd, (struct sockaddr*) &local, sizeof(local)) < 0)
goto fail;
- }
yes = 1;
if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
msg.msg_controllen = sizeof(cmsg_data);
msg.msg_flags = 0;
- return sendmsg_loop(fd, &msg, MSG_DONTROUTE);
+ return sendmsg_loop(fd, &msg, 0 /*MSG_DONTROUTE*/);
}
gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p, const AvahiIPv6Address *a, guint16 port) {
msg.msg_controllen = sizeof(cmsg_data);
msg.msg_flags = 0;
- return sendmsg_loop(fd, &msg, MSG_DONTROUTE);
+ return sendmsg_loop(fd, &msg, 0 /*MSG_DONTROUTE*/);
}
-AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, gint *ret_iface, guint8* ret_ttl) {
+AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, AvahiIPv4Address *ret_dest_address, gint *ret_iface, guint8* ret_ttl) {
AvahiDnsPacket *p= NULL;
struct msghdr msg;
struct iovec io;
ssize_t l;
struct cmsghdr *cmsg;
gboolean found_ttl = FALSE, found_iface = FALSE;
- guint ms;
+ gint ms;
g_assert(fd >= 0);
g_assert(ret_sa);
+ g_assert(ret_dest_address);
g_assert(ret_iface);
g_assert(ret_ttl);
/* Linux 2.4 behaves very strangely sometimes! */
avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l);
-
-
goto fail;
}
*ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
found_ttl = TRUE;
} else if (cmsg->cmsg_type == IP_PKTINFO) {
- *ret_iface = (gint) ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex;
+ struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
+ *ret_iface = (gint) i->ipi_ifindex;
+ ret_dest_address->address = i->ipi_addr.s_addr;
found_iface = TRUE;
}
}
return NULL;
}
-AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa, gint *ret_iface, guint8* ret_ttl) {
+AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa, AvahiIPv6Address *ret_dest_address, gint *ret_iface, guint8* ret_ttl) {
AvahiDnsPacket *p = NULL;
struct msghdr msg;
struct iovec io;
uint8_t aux[64];
ssize_t l;
- guint ms;
+ gint ms;
struct cmsghdr *cmsg;
gboolean found_ttl = FALSE, found_iface = FALSE;
g_assert(fd >= 0);
g_assert(ret_sa);
+ g_assert(ret_dest_address);
g_assert(ret_iface);
g_assert(ret_ttl);
}
if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) {
- *ret_iface = ((struct in6_pktinfo*) CMSG_DATA(cmsg))->ipi6_ifindex;
+ 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);
found_iface = TRUE;
}
}
projects / catta / blobdiff