X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=ccb9a3f008d99f54b42ca1cc7dcd6aa51c0f417b;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=f50ff1123be023261f23ac52deed8063309f906f;hpb=1b2846d907adfc8472fc9da0c951c3243c7ee143;p=meshlink

diff --git a/src/linux/device.c b/src/linux/device.c
index f50ff112..ccb9a3f0 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -20,12 +20,8 @@
 
 #include "system.h"
 
-#ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
 #define DEFAULT_DEVICE "/dev/net/tun"
-#else
-#define DEFAULT_DEVICE "/dev/tap0"
-#endif
 
 #include "conf.h"
 #include "device.h"
@@ -34,9 +30,9 @@
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "device.h"
 
 typedef enum device_type_t {
-	DEVICE_TYPE_ETHERTAP,
 	DEVICE_TYPE_TUN,
 	DEVICE_TYPE_TAP,
 } device_type_t;
@@ -45,16 +41,16 @@ int device_fd = -1;
 static device_type_t device_type;
 char *device = NULL;
 char *iface = NULL;
+static char *type = NULL;
 static char ifrname[IFNAMSIZ];
 static char *device_info;
 
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
+uint64_t device_in_packets = 0;
+uint64_t device_in_bytes = 0;
+uint64_t device_out_packets = 0;
+uint64_t device_out_bytes = 0;
 
 static bool setup_device(void) {
-	struct ifreq ifr;
-	bool t1q = false;
-
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = xstrdup(DEFAULT_DEVICE);
 
@@ -76,11 +72,16 @@ static bool setup_device(void) {
 	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-#ifdef HAVE_LINUX_IF_TUN_H
-	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
+	struct ifreq ifr = {{{0}}};
 
-	memset(&ifr, 0, sizeof(ifr));
-	if(routing_mode == RMODE_ROUTER) {
+	get_config_string(lookup_config(config_tree, "DeviceType"), &type);
+
+	if(type && strcasecmp(type, "tun") && strcasecmp(type, "tap")) {
+		logger(LOG_ERR, "Unknown device type %s!", type);
+		return false;
+	}
+
+	if((type && !strcasecmp(type, "tun")) || (!type && routing_mode == RMODE_ROUTER)) {
 		ifr.ifr_flags = IFF_TUN;
 		device_type = DEVICE_TYPE_TUN;
 		device_info = "Linux tun/tap device (tun mode)";
@@ -92,6 +93,8 @@ static bool setup_device(void) {
 
 #ifdef IFF_ONE_QUEUE
 	/* Set IFF_ONE_QUEUE flag... */
+
+	bool t1q = false;
 	if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
 		ifr.ifr_flags |= IFF_ONE_QUEUE;
 #endif
@@ -108,16 +111,6 @@ static bool setup_device(void) {
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
 		if(iface) free(iface);
 		iface = xstrdup(ifrname);
-	} else
-#endif
-	{
-		if(routing_mode == RMODE_ROUTER)
-			overwrite_mac = true;
-		device_info = "Linux ethertap device";
-		device_type = DEVICE_TYPE_ETHERTAP;
-		if(iface)
-			free(iface);
-		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 	}
 
 	logger(LOG_INFO, "%s is a %s", device, device_info);
@@ -128,50 +121,43 @@ static bool setup_device(void) {
 static void close_device(void) {
 	close(device_fd);
 
+	free(type);
 	free(device);
 	free(iface);
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 	
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			lenin = read(device_fd, packet->data + 10, MTU - 10);
+			inlen = read(device_fd, packet->data + 10, MTU - 10);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s",
 					   device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin + 10;
+			packet->len = inlen + 10;
 			break;
 		case DEVICE_TYPE_TAP:
-			lenin = read(device_fd, packet->data, MTU);
-
-			if(lenin <= 0) {
-				logger(LOG_ERR, "Error while reading from %s %s: %s",
-					   device_info, device, strerror(errno));
-				return false;
-			}
-
-			packet->len = lenin;
-			break;
-		case DEVICE_TYPE_ETHERTAP:
-			lenin = read(device_fd, packet->data - 2, MTU + 2);
+			inlen = read(device_fd, packet->data, MTU);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s",
 					   device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin - 2;
+			packet->len = inlen;
 			break;
+		default:
+			abort();
 	}
 
-	device_total_in += packet->len;
+	device_in_packets++;
+	device_in_bytes += packet->len;
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
 			   device_info);
@@ -199,26 +185,20 @@ static bool write_packet(vpn_packet_t *packet) {
 				return false;
 			}
 			break;
-		case DEVICE_TYPE_ETHERTAP:
-			*(short int *)(packet->data - 2) = packet->len;
-
-			if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
-				logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-					   strerror(errno));
-				return false;
-			}
-			break;
+		default:
+			abort();
 	}
 
-	device_total_out += packet->len;
+	device_out_packets++;
+	device_out_bytes += packet->len;
 
 	return true;
 }
 
 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(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_in_bytes);
+	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_out_bytes);
 }
 
 const devops_t os_devops = {