X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=udp_recv.c;h=ccd769b0e6e1d36b996b87874f09190f5d2fbb7e;hb=82ec559332572814f76a8db3ed6751792687570d;hp=bdc25411ef7a5c17cdde8509ab9e6e8de01db10c;hpb=002731cd3938f3be6b71651e56c062af1adcdec0;p=paraslash.git

diff --git a/udp_recv.c b/udp_recv.c
index bdc25411..ccd769b0 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -217,6 +217,50 @@ static void *udp_recv_parse_config(int argc, char **argv)
 	return NULL;
 }
 
+/*
+ * Perform AF-independent joining of multicast receive addresses.
+ *
+ * \param fd	Bound socket descriptor.
+ *
+ * \return Zero if okay, negative on error.
+ */
+static int mcast_receiver_setup(int fd)
+{
+	struct sockaddr_storage ss;
+	socklen_t sslen = sizeof(ss);
+
+	if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0)
+		goto err;
+
+	switch (ss.ss_family) {
+	case AF_INET:
+		if (IN_MULTICAST(htonl(((struct sockaddr_in *)&ss)->sin_addr.s_addr))) {
+			struct ip_mreq m4;
+
+			memset(&m4, 0, sizeof(m4));
+			m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr;
+			if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &m4, sizeof(m4)) < 0)
+				break;
+		}
+		return 0;
+	case AF_INET6:
+		if (IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
+			struct ipv6_mreq m6;
+
+			memset(&m6, 0, sizeof(m6));
+			memcpy(&m6.ipv6mr_multiaddr, &((struct sockaddr_in6 *)&ss)->sin6_addr, 16);
+			if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &m6, sizeof(m6)) < 0)
+				break;
+		}
+		return 0;
+	default:
+		PARA_ERROR_LOG("address family %d not supported", ss.ss_family);
+		return -E_ADDRESS_LOOKUP;
+	}
+err:
+	return -ERRNO_TO_PARA_ERROR(errno);
+}
+
 static int udp_recv_open(struct receiver_node *rn)
 {
 	struct private_udp_recv_data *purd;
@@ -226,10 +270,18 @@ static int udp_recv_open(struct receiver_node *rn)
 	rn->buf = para_calloc(UDP_RECV_CHUNK_SIZE);
 	rn->private_data = para_calloc(sizeof(struct private_udp_recv_data));
 	purd = rn->private_data;
-	ret = create_udp_recv_socket(c->host_arg, c->port_arg);
+
+	ret = makesock(AF_UNSPEC, IPPROTO_UDP, 1, c->host_arg, c->port_arg);
 	if (ret < 0)
 		goto err;
 	purd->fd = ret;
+
+	ret = mcast_receiver_setup(purd->fd);
+	if (ret < 0) {
+		close(purd->fd);
+		return ret;
+	}
+
 	ret = mark_fd_nonblocking(purd->fd);
 	if (ret < 0)
 		goto err;