X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmulticast_device.c;h=0b232dbb6f0238d260a8f658f6c7a69d19374b9b;hp=392fd3713e03fd33232404fe81e186ae43f60044;hb=aa9d61b5cd0d6dd8b911cfd06f6bb50ec028d0d1;hpb=c373de2e9812700c0568640727ad917b6fc7d758

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 392fd371..0b232dbb 100644
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -35,7 +35,7 @@ static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
 
 static struct addrinfo *ai = NULL;
-static mac_t ignore_src = {0};
+static mac_t ignore_src = {{0}};
 
 static bool setup_device(void) {
 	char *host;
@@ -92,35 +92,47 @@ static bool setup_device(void) {
 	}
 
 	switch(ai->ai_family) {
+#ifdef IP_ADD_MEMBERSHIP
 		case AF_INET: {
 			struct ip_mreq mreq;
 			struct sockaddr_in in;
 			memcpy(&in, ai->ai_addr, sizeof in);
 			mreq.imr_multiaddr.s_addr = in.sin_addr.s_addr;
 			mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-			if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof mreq)) {
+			if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof mreq)) {
 				logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
 				closesocket(device_fd);
 				return false;
 			}
-			setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_LOOP, &one, sizeof one);
-			setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof ttl);
+#ifdef IP_MULTICAST_LOOP
+			setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_LOOP, (const void *)&one, sizeof one);
+#endif
+#ifdef IP_MULTICAST_TTL
+			setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&ttl, sizeof ttl);
+#endif
 		} break;
+#endif
 
+#ifdef IPV6_JOIN_GROUP
 		case AF_INET6: {
 			struct ipv6_mreq mreq;
 			struct sockaddr_in6 in6;
 			memcpy(&in6, ai->ai_addr, sizeof in6);
 			memcpy(&mreq.ipv6mr_multiaddr, &in6.sin6_addr, sizeof mreq.ipv6mr_multiaddr);
-			mreq.ipv6mr_interface = 0;
-			if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof mreq)) {
+			mreq.ipv6mr_interface = in6.sin6_scope_id;
+			if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof mreq)) {
 				logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
 				closesocket(device_fd);
 				return false;
 			}
-			setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &one, sizeof one);
-			setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof ttl);
+#ifdef IPV6_MULTICAST_LOOP
+			setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (const void *)&one, sizeof one);
+#endif
+#ifdef IPV6_MULTICAST_HOPS
+			setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (void *)&ttl, sizeof ttl);
+#endif
 		} break;
+#endif
 	
 		default:
 			logger(LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);