X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmulticast_device.c;h=e5e9a3fbd4fa7a009ec0b4cd7f11bc9d09341671;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hp=392fd3713e03fd33232404fe81e186ae43f60044;hpb=c373de2e9812700c0568640727ad917b6fc7d758;p=meshlink

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 392fd371..e5e9a3fb 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;
@@ -48,14 +48,14 @@ static bool setup_device(void) {
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
-		logger(LOG_ERR, "Device variable required for %s", device_info);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Device variable required for %s", device_info);
 		return false;
 	}
 
 	host = xstrdup(device);
 	space = strchr(host, ' ');
 	if(!space) {
-		logger(LOG_ERR, "Port number required for %s", device_info);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Port number required for %s", device_info);
 		return false;
 	}
 
@@ -74,7 +74,7 @@ static bool setup_device(void) {
 
 	device_fd = socket(ai->ai_family, SOCK_DGRAM, IPPROTO_UDP);
 	if(device_fd < 0) {
-		logger(LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
 		return false;
 	}
 
@@ -87,48 +87,60 @@ static bool setup_device(void) {
 
 	if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
 		closesocket(device_fd);
-		logger(LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
 		return false;
 	}
 
 	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)) {
-				logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
+			if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof mreq)) {
+				logger(DEBUG_ALWAYS, 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)) {
-				logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
+			mreq.ipv6mr_interface = in6.sin6_scope_id;
+			if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof mreq)) {
+				logger(DEBUG_ALWAYS, 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);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
 			closesocket(device_fd);
 			return false;
 	}
 
-	logger(LOG_INFO, "%s is a %s", device, device_info);
+	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
 	return true;
 }
@@ -147,13 +159,13 @@ static bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
 	if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
-		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
 	}
 
 	if(!memcmp(&ignore_src, packet->data + 6, sizeof ignore_src)) {
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
 		packet->len = 0;
 		return true;
 	}
@@ -162,18 +174,18 @@ static bool read_packet(vpn_packet_t *packet) {
 
 	device_total_in += packet->len;
 
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
 			   device_info);
 
 	return true;
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   packet->len, device_info);
 
 	if(sendto(device_fd, packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
-		logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
+		logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
 			   strerror(errno));
 		return false;
 	}
@@ -186,9 +198,9 @@ static bool write_packet(vpn_packet_t *packet) {
 }
 
 static void dump_device_stats(void) {
-	logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
 
 const devops_t multicast_devops = {
@@ -202,7 +214,7 @@ const devops_t multicast_devops = {
 #if 0
 
 static bool not_supported(void) {
-	logger(LOG_ERR, "Raw socket device not supported on this platform");
+	logger(DEBUG_ALWAYS, LOG_ERR, "Raw socket device not supported on this platform");
 	return false;
 }