X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket_device.c;h=3785dcf69782012ad78280b840d7ead2aeeed58e;hp=e2692ecc1f2ec72ab035d77227674ccd847a2718;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hpb=708314df2f61675d0f54e541c9fff62ac1f433b5

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index e2692ecc..3785dcf6 100644
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -20,7 +20,9 @@
 
 #include "system.h"
 
+#ifdef HAVE_NETPACKET_PACKET_H
 #include <netpacket/packet.h>
+#endif
 
 #include "conf.h"
 #include "device.h"
@@ -30,6 +32,7 @@
 #include "route.h"
 #include "xalloc.h"
 
+#if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET)
 static char *device_info;
 
 static uint64_t device_total_in = 0;
@@ -53,11 +56,12 @@ static bool setup_device(void) {
 		return false;
 	}
 
+	memset(&ifr, 0, sizeof ifr);
+
 #ifdef FD_CLOEXEC
 	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
@@ -66,12 +70,12 @@ static bool setup_device(void) {
 		return false;
 	}
 
-	memset(&sa, '0', sizeof(sa));
+	memset(&sa, '0', sizeof sa);
 	sa.sll_family = AF_PACKET;
 	sa.sll_protocol = htons(ETH_P_ALL);
 	sa.sll_ifindex = ifr.ifr_ifindex;
 
-	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
+	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
 		logger(LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
 		return false;
 	}
@@ -89,15 +93,15 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 
-	if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+	if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
 		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
 	}
 
-	packet->len = lenin;
+	packet->len = inlen;
 
 	device_total_in += packet->len;
 
@@ -135,3 +139,19 @@ const devops_t raw_socket_devops = {
 	.write = write_packet,
 	.dump_stats = dump_device_stats,
 };
+
+#else
+
+static bool not_supported(void) {
+	logger(LOG_ERR, "Raw socket device not supported on this platform");
+	return false;
+}
+
+const devops_t raw_socket_devops = {
+	.setup = not_supported,
+	.close = NULL,
+	.read = NULL,
+	.write = NULL,
+	.dump_stats = NULL,
+};
+#endif