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;
-
- 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));
+int avahi_mdns_mcast_join_ipv4(int fd, const AvahiAddress *a, int join) {
+ struct ip_mreq mreq;
#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;
- }
-
- return 0;
-}
-
-int avahi_mdns_mcast_join_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_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
- avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s", 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));
+
+#ifdef HAVE_STRUCT_IP_MREQN
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));
+ 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_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
- avahi_log_warn("IP_DROP_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_leave_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_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
- avahi_log_warn("IPV6_DROP_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;
}
if (r < 0)
goto fail;
+#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));
+ goto fail;
+ }
+#elif IPV6_RECVHOPLIMIT
+ yes = 1;
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
+ avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
+ goto fail;
+ }
+#elif IPV6_HOPLIMIT
yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
goto fail;
}
+#endif
+#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));
+ goto fail;
+ }
+#elif IPV6_PKTINFO
yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
goto fail;
}
+#endif
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_iovlen = 1;
msg.msg_flags = 0;
+#ifdef IP_PKTINFO
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;
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;
}
+#endif
return sendmsg_loop(fd, &msg, 0);
}
break;
#endif
default:
- avahi_log_warn("Unhandled cmsg_type : %d\n",cmsg->cmsg_type);
+ avahi_log_warn("Unhandled cmsg_type : %d",cmsg->cmsg_type);
break;
}
}
goto fail;
}
+#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));
+ goto fail;
+ }
+#elif IPV6_RECVHOPLIMIT
+ yes = 1;
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
+ avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
+ goto fail;
+ }
+#elif IPV6_HOPLIMIT
yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
goto fail;
}
+#endif
+#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));
+ goto fail;
+ }
+#elif IPV6_PKTINFO
yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
goto fail;
}
+#endif
if (avahi_set_cloexec(fd) < 0) {
avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));