Remove the TAP-Win32 reader thread.

[tinc] / src / vde_device.c

diff --git a/src/vde_device.c b/src/vde_device.c
index 446ca16..55d66b4 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -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,15 +82,18 @@ 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) {
@@ -105,7 +105,7 @@ 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;
@@ -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,
 };