X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmulticast_device.c;h=c19852bfca7f855ba5e0c9543f8e894bf3996d2d;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=dbd832bf63419d82da7f39fcee842aeb338bb7a2;hpb=6242b68242646fa94bdacc94be93f0e894ae757e;p=tinc

diff --git a/src/multicast_device.c b/src/multicast_device.c
index dbd832bf..c19852bf 100644
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -31,9 +31,6 @@
 
 static char *device_info;
 
-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}};
 
@@ -54,6 +51,7 @@ static bool setup_device(void) {
 
 	host = xstrdup(device);
 	space = strchr(host, ' ');
+
 	if(!space) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Port number required for %s", device_info);
 		goto error;
@@ -69,10 +67,13 @@ static bool setup_device(void) {
 	}
 
 	ai = str2addrinfo(host, port, SOCK_DGRAM);
-	if(!ai)
+
+	if(!ai) {
 		goto error;
+	}
 
 	device_fd = socket(ai->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+
 	if(device_fd < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
 		goto error;
@@ -83,7 +84,7 @@ static bool setup_device(void) {
 #endif
 
 	static const int one = 1;
-	setsockopt(device_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof one);
+	setsockopt(device_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
 
 	if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
@@ -92,48 +93,56 @@ 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, (void *)&mreq, sizeof mreq)) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
-				goto error;
-			}
+
+	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, (void *)&mreq, sizeof(mreq))) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
+			goto error;
+		}
+
 #ifdef IP_MULTICAST_LOOP
-			setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_LOOP, (const void *)&one, sizeof one);
+		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);
+		setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&ttl, sizeof(ttl));
 #endif
-		} break;
+	}
+	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 = 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));
-				goto error;
-			}
+
+	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 = 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));
+			goto error;
+		}
+
 #ifdef IPV6_MULTICAST_LOOP
-			setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (const void *)&one, sizeof one);
+		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);
+		setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (void *)&ttl, sizeof(ttl));
 #endif
-		} break;
+	}
+	break;
 #endif
 
-		default:
-			logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
-			goto error;
+	default:
+		logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %x unsupported", ai->ai_family);
+		goto error;
 	}
 
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
@@ -141,10 +150,15 @@ static bool setup_device(void) {
 	return true;
 
 error:
-	if(device_fd >= 0)
+
+	if(device_fd >= 0) {
 		closesocket(device_fd);
-	if(ai)
+	}
+
+	if(ai) {
 		freeaddrinfo(ai);
+	}
+
 	free(host);
 
 	return false;
@@ -152,82 +166,61 @@ error:
 
 static void close_device(void) {
 	close(device_fd);
+	device_fd = -1;
 
 	free(device);
+	device = NULL;
 	free(iface);
+	iface = NULL;
 
-	if(ai)
+	if(ai) {
 		freeaddrinfo(ai);
+		ai = NULL;
+	}
+
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
-	if((lenin = recv(device_fd, (void *)packet->data, MTU, 0)) <= 0) {
+	if((lenin = recv(device_fd, (void *)DATA(packet), MTU, 0)) <= 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-			   device, strerror(errno));
+		       device, sockstrerror(sockerrno));
 		return false;
 	}
 
-	if(!memcmp(&ignore_src, packet->data + 6, sizeof ignore_src)) {
+	if(!memcmp(&ignore_src, DATA(packet) + 6, sizeof(ignore_src))) {
 		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
-		packet->len = 0;
-		return true;
+		return false;
 	}
 
 	packet->len = lenin;
 
-	device_total_in += packet->len;
-
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
-			   device_info);
+	       device_info);
 
 	return true;
 }
 
 static bool write_packet(vpn_packet_t *packet) {
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
-			   packet->len, device_info);
+	       packet->len, device_info);
 
-	if(sendto(device_fd, (void *)packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
+	if(sendto(device_fd, (void *)DATA(packet), packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-			   strerror(errno));
+		       sockstrerror(sockerrno));
 		return false;
 	}
 
-	device_total_out += packet->len;
-
-	memcpy(&ignore_src, packet->data + 6, sizeof ignore_src);
+	memcpy(&ignore_src, DATA(packet) + 6, sizeof(ignore_src));
 
 	return true;
 }
 
-static void dump_device_stats(void) {
-	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 = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
 };
-
-#if 0
-
-static bool not_supported(void) {
-	logger(DEBUG_ALWAYS, LOG_ERR, "Raw socket device not supported on this platform");
-	return false;
-}
-
-const devops_t multicast_devops = {
-	.setup = not_supported,
-	.close = NULL,
-	.read = NULL,
-	.write = NULL,
-	.dump_stats = NULL,
-};
-#endif