Make device close cleaner.

[tinc] / src / cygwin / device.c

diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index f4dcae4..d522b4f 100644 (file)
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -40,9 +40,6 @@ char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
 
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
-
 static pid_t reader_pid;
 static int sp[2];
 
@@ -218,12 +215,13 @@ static bool setup_device(void) {
 static void close_device(void) {
        close(sp[0]);
        close(sp[1]);
-       CloseHandle(device_handle);
+       CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
 
        kill(reader_pid, SIGKILL);
 
-       free(device);
-       free(iface);
+       free(device); device = NULL;
+       free(iface); iface = NULL;
+       device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -237,8 +235,6 @@ static bool read_packet(vpn_packet_t *packet) {
 
        packet->len = inlen;
 
-       device_total_in += packet->len;
-
        logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
                           device_info);
 
@@ -256,21 +252,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 os_devops = {
        .setup = setup_device,
        .close = close_device,
        .read = read_packet,
        .write = write_packet,
-       .dump_stats = dump_device_stats,
 };