X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=111b98c671abe7fb6b2ef01bb8a8acb24d3b3a27;hb=3fca2cad485ef70360bca085c5c4d052b6deb15b;hp=4dbe38d5d2858e876d32da2b2160e7a66a77a95e;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 4dbe38d5..111b98c6 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -47,11 +47,14 @@ char *iface = 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;
 
 bool setup_device(void) {
 	struct ifreq ifr;
+	bool t1q = false;
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = xstrdup(DEFAULT_DEVICE);
@@ -84,6 +87,12 @@ bool setup_device(void) {
 		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);
 
@@ -159,7 +168,8 @@ bool read_packet(vpn_packet_t *packet) {
 			break;
 	}
 
-	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);
@@ -198,13 +208,14 @@ bool write_packet(vpn_packet_t *packet) {
 			break;
 	}
 
-	device_total_out += packet->len;
+	device_out_packets++;
+	device_out_bytes += packet->len;
 
 	return true;
 }
 
 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);
 }