X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fraw_socket_device.c;h=00fdef07a46c48b3402a1188b66edb745338c214;hb=221f559bcf13febc9a4135c5eb54c236c543ee19;hp=90ccedfc317544a43eae5c3390def2c13ae2e1e2;hpb=178e52f76ef4ba40748c13ea7e518837394d6dbc;p=tinc

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index 90ccedfc..00fdef07 100644
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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) && defined(SIOCGIFINDEX)
 static char *device_info;
 
 static uint64_t device_total_in = 0;
@@ -48,31 +51,36 @@ static bool setup_device(void) {
 	device_info = "raw socket";
 
 	if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
-		logger(LOG_ERR, "Could not open %s: %s", device_info,
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", device_info,
 			   strerror(errno));
 		return false;
 	}
 
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr, 0, sizeof ifr);
+
+#ifdef FD_CLOEXEC
+	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
-		logger(LOG_ERR, "Can't find interface %s: %s", iface,
+		logger(DEBUG_ALWAYS, LOG_ERR, "Can't find interface %s: %s", iface,
 			   strerror(errno));
 		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))) {
-		logger(LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
+	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
 		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;
 }
@@ -85,30 +93,30 @@ 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) {
-		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+	if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
+		logger(DEBUG_ALWAYS, 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;
 
-	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(write(device_fd, packet->data, packet->len) < 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;
 	}
@@ -119,9 +127,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 raw_socket_devops = {
@@ -131,3 +139,19 @@ const devops_t raw_socket_devops = {
 	.write = write_packet,
 	.dump_stats = dump_device_stats,
 };
+
+#else
+
+static bool not_supported(void) {
+	logger(DEBUG_ALWAYS, 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