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;
#ifdef HAVE_STRUCT_IP_MREQN
- struct ip_mreqn mreq;
-
- memset(&mreq, 0, sizeof(mreq));
- mreq.imr_ifindex = idx;
+int avahi_mdns_mcast_join_ipv4(int fd, int idx, int join) {
+ struct ip_mreqn mreq;
#else
- struct ip_mreq mreq;
- struct ifreq ifreq;
-
+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));
- 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));
+#ifdef HAVE_STRUCT_IP_MREQN
+ mreq.imr_ifindex = idx;
+#else
+ assert(a);
+ assert(a->proto == AVAHI_PROTO_INET);
+ mreq.imr_interface.s_addr = a->data.ipv4.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, int idx, int join) {
struct ipv6_mreq mreq6;
struct sockaddr_in6 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);
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;
* 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));
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;
}
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));
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);
if (r < 0)
goto fail;
- yes = 1;
- if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
- avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
+ if (ipv6_pktinfo(fd) < 0)
goto fail;
- }
-
- yes = 1;
- 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", strerror(errno));
struct sockaddr_in sa;
struct msghdr msg;
struct iovec io;
- struct cmsghdr *cmsg;
#ifdef IP_PKTINFO
+ struct cmsghdr *cmsg;
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);
msg.msg_iov = &io;
msg.msg_iovlen = 1;
msg.msg_flags = 0;
+ msg.msg_control = NULL;
+ msg.msg_controllen = 0;
+#ifdef IP_PKTINFO
if (interface >= 0) {
+ struct in_pktinfo *pkti;
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
+ cmsg->cmsg_type = IP_PKTINFO;
+
+ pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
+ pkti->ipi_ifindex = interface;
+
msg.msg_control = cmsg_data;
msg.msg_controllen = sizeof(cmsg_data);
- } else {
- msg.msg_control = NULL;
- msg.msg_controllen = 0;
}
-
+#else
+#ifdef __GNUC__
+#warning "FIXME: We need some code to set the outgoing interface here if IP_PKTINFO is not available"
+#endif
+#endif
+
return sendmsg_loop(fd, &msg, 0);
}
uint8_t aux[1024];
ssize_t l;
struct cmsghdr *cmsg;
- int found_ttl = 0, found_iface = 0, found_addr = 0;
+ int found_iface = 0, found_addr = 0;
int ms;
assert(fd >= 0);
p->size = (size_t) l;
if (ret_ttl)
- *ret_ttl = 0;
-
+ *ret_ttl = 255;
+
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_dest_address)
+ ret_dest_address->address = i->ipi_addr.s_addr;
+
+ found_addr = found_iface = 1;
+
+ break;
+ }
+#elif defined(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;
+ case IP_RECVDSTADDR:
+ if (ret_dest_address)
+ memcpy(&ret_dest_address->address, CMSG_DATA (cmsg), 4);
+ found_addr = 1;
+ break;
+
#endif
- default:
- avahi_log_warn("Unhandled cmsg_type : %d\n",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;
uint8_t aux[64];
ssize_t l;
int ms;
-
struct cmsghdr *cmsg;
int found_ttl = 0, found_iface = 0;
if (ret_dest_address)
memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);
+
found_iface = 1;
}
}
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));
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;
}
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));
goto fail;
}
- yes = 1;
- if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
- avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
+ if (ipv6_pktinfo(fd) < 0)
goto fail;
- }
-
- yes = 1;
- 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", strerror(errno));
projects / catta / blobdiff