X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fvde_device.c;h=73ad7136a2e3e10f7e1284249d31520d2e284106;hp=be53e0a255e90d7ac8389c85732ba5f6a6efcd9c;hb=706d855e507980de3845556989d7de7a3b9c76e8;hpb=2c1412306242d26f7803829873e582b50adde922

diff --git a/src/vde_device.c b/src/vde_device.c
index be53e0a2..73ad7136 100644
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -1,6 +1,6 @@
 /*
     device.c -- VDE plug
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 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
@@ -36,9 +36,6 @@ static int port = 0;
 static char *group = NULL;
 static char *device_info;
 
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
-
 static bool setup_device(void) {
 	libvdeplug_dynopen(plug);
 
@@ -85,19 +82,22 @@ static bool setup_device(void) {
 }
 
 static void close_device(void) {
-	if(conn)
-		plug.vde_close(conn);
+	if(conn) {
+		plug.vde_close(conn); conn = NULL;
+	}
 
 	if(plug.dl_handle)
 		libvdeplug_dynclose(plug);
 
-	free(device);
+	free(device); device = NULL;
 
-	free(iface);
+	free(iface); iface = NULL;
+
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int lenin = (ssize_t)plug.vde_recv(conn, packet->data, MTU, 0);
+	int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
 	if(lenin <= 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
 		event_exit();
@@ -105,14 +105,14 @@ static bool read_packet(vpn_packet_t *packet) {
 	}
 
 	packet->len = lenin;
-	device_total_in += 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) {
-	if((ssize_t)plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
+	if((ssize_t)plug.vde_send(conn, DATA(packet), packet->len, 0) < 0) {
 		if(errno != EINTR && errno != EAGAIN) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 			event_exit();
@@ -121,21 +121,12 @@ static bool write_packet(vpn_packet_t *packet) {
 		return false;
 	}
 
-	device_total_out += packet->len;
-
 	return true;
 }
 
-static void dump_device_stats(void) {
-	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 vde_devops = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
 };