X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=40711cccca5b8f4d1b730ee29821fca9eb2e750e;hb=6834b882015a9323672e9fce8811aa4283f196f0;hp=6d02b470261ebab55e454d1fd966a4e26776fc60;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 6d02b470..40711ccc 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -28,9 +28,11 @@
 #endif
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "route.h"
+#include "threads.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -41,20 +43,41 @@ typedef enum device_type_t {
 } device_type_t;
 
 int device_fd = -1;
+int fd = -1;
 static device_type_t device_type;
 char *device = NULL;
 char *iface = NULL;
 static char ifrname[IFNAMSIZ];
 static char *device_info;
 
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
 
-bool setup_device(void)
-{
-	struct ifreq ifr;
+thread_t thread;
+
+static void read_thread(void *arg) {
+	static vpn_packet_t packet;
+	errno = 0;
+
+	while(true) {
+		if(read_packet(&packet)) {
+			mutex_lock(&mutex);
+			route(myself, &packet);
+			mutex_unlock(&mutex);
+		} else {
+			if(errno == EAGAIN || errno == EINTR) {
+				errno = 0;
+				continue;
+			}
 
-	cp();
+			return;
+		}
+	}	
+}
+
+bool setup_device(void) {
+	struct ifreq ifr;
+	bool t1q = false;
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = xstrdup(DEFAULT_DEVICE);
@@ -64,38 +87,44 @@ bool setup_device(void)
 		if (netname != NULL)
 			iface = xstrdup(netname);
 #else
-		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 #endif
-	device_fd = open(device, O_RDWR | O_NONBLOCK);
+	fd = open(device, O_RDWR);
 
-	if(device_fd < 0) {
-		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+	if(fd < 0) {
+		logger(LOG_ERR, "Could not open %s: %s", device, strerror(errno));
 		return false;
 	}
 
 #ifdef HAVE_LINUX_IF_TUN_H
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr, 0, sizeof ifr);
 	if(routing_mode == RMODE_ROUTER) {
 		ifr.ifr_flags = IFF_TUN;
 		device_type = DEVICE_TYPE_TUN;
-		device_info = _("Linux tun/tap device (tun mode)");
+		device_info = "Linux tun/tap device (tun mode)";
 	} else {
 		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
 		device_type = DEVICE_TYPE_TAP;
-		device_info = _("Linux tun/tap device (tap mode)");
+		device_info = "Linux tun/tap device (tap mode)";
 	}
 
+#ifdef IFF_ONE_QUEUE
+	/* Set IFF_ONE_QUEUE flag... */
+	if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
+		ifr.ifr_flags |= IFF_ONE_QUEUE;
+#endif
+
 	if(iface)
 		strncpy(ifr.ifr_name, iface, IFNAMSIZ);
 
-	if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
+	if(!ioctl(fd, TUNSETIFF, &ifr)) {
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
 		if(iface) free(iface);
 		iface = xstrdup(ifrname);
-	} else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
-		logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+	} else if(!ioctl(fd, (('T' << 8) | 202), &ifr)) {
+		logger(LOG_WARNING, "Old ioctl() request was needed for %s", device);
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
 		if(iface) free(iface);
 		iface = xstrdup(ifrname);
@@ -104,97 +133,89 @@ bool setup_device(void)
 	{
 		if(routing_mode == RMODE_ROUTER)
 			overwrite_mac = true;
-		device_info = _("Linux ethertap device");
+		device_info = "Linux ethertap device";
 		device_type = DEVICE_TYPE_ETHERTAP;
 		if(iface)
 			free(iface);
-		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 	}
 
-	logger(LOG_INFO, _("%s is a %s"), device, device_info);
+	logger(LOG_INFO, "%s is a %s", device, device_info);
 
-	return true;
+	return thread_create(&thread, read_thread, NULL);
 }
 
-void close_device(void)
-{
-	cp();
-	
-	close(device_fd);
+void close_device(void) {
+	close(fd);
+	thread_destroy(&thread);
 
 	free(device);
 	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-	int lenin;
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 	
-	cp();
-
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			lenin = read(device_fd, packet->data + 10, MTU - 10);
+			inlen = read(fd, packet->data + 10, MTU - 10);
 
-			if(lenin <= 0) {
-				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+			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);
+			inlen = read(fd, packet->data, MTU);
 
-			if(lenin <= 0) {
-				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+			if(inlen <= 0) {
+				logger(LOG_ERR, "Error while reading from %s %s: %s",
 					   device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin;
+			packet->len = inlen;
 			break;
 		case DEVICE_TYPE_ETHERTAP:
-			lenin = read(device_fd, packet->data - 2, MTU + 2);
+			inlen = read(fd, packet->data - 2, MTU + 2);
 
-			if(lenin <= 0) {
-				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+			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 - 2;
 			break;
 	}
 
 	device_total_in += packet->len;
 
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
 			   device_info);
 
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
-	cp();
-
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+bool write_packet(vpn_packet_t *packet) {
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   packet->len, device_info);
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
 			packet->data[10] = packet->data[11] = 0;
-			if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
-				logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+			if(write(fd, packet->data + 10, packet->len - 10) < 0) {
+				logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
 					   strerror(errno));
 				return false;
 			}
 			break;
 		case DEVICE_TYPE_TAP:
-			if(write(device_fd, packet->data, packet->len) < 0) {
-				logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+			if(write(fd, packet->data, packet->len) < 0) {
+				logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
 					   strerror(errno));
 				return false;
 			}
@@ -202,8 +223,8 @@ bool write_packet(vpn_packet_t *packet)
 		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,
+			if(write(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;
 			}
@@ -215,11 +236,8 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
-	cp();
-
-	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+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);
 }