Only read from TAP-Win32 if the device is enabled.

[tinc] / src / mingw / device.c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 10f7abc..2ef0064 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -43,9 +43,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;
-
 extern char *myport;
 
 static void device_issue_read() {
@@ -89,7 +86,6 @@ static bool setup_device(void) {
        bool found = false;
 
        int err;
-       HANDLE thread;
 
        get_config_string(lookup_config(config_tree, "Device"), &device);
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@ -181,12 +177,6 @@ static bool setup_device(void) {
                overwrite_mac = 1;
        }
 
-       /* Start the tap reader */
-
-       io_add_event(&device_read_io, device_handle_read, NULL, CreateEvent(NULL, TRUE, FALSE, NULL));
-       device_read_overlapped.hEvent = device_read_io.event;
-       device_issue_read();
-
        device_info = "Windows tap device";
 
        logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
@@ -196,22 +186,29 @@ static bool setup_device(void) {
 
 static void enable_device(void) {
        logger(DEBUG_ALWAYS, LOG_INFO, "Enabling %s", device_info);
+
        ULONG status = 1;
        DWORD len;
        DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
+
+       io_add_event(&device_read_io, device_handle_read, NULL, CreateEvent(NULL, TRUE, FALSE, NULL));
+       device_read_overlapped.hEvent = device_read_io.event;
+       device_issue_read();
 }
 
 static void disable_device(void) {
        logger(DEBUG_ALWAYS, LOG_INFO, "Disabling %s", device_info);
+
+       io_del(&device_read_io);
+       CancelIo(device_handle);
+       CloseHandle(device_read_overlapped.hEvent);
+
        ULONG status = 0;
        DWORD len;
        DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
 }
 
 static void close_device(void) {
-       io_del(&device_read_io);
-       CancelIo(device_handle);
-       CloseHandle(device_read_overlapped.hEvent);
        CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
 
        free(device); device = NULL;
@@ -235,8 +232,6 @@ static bool write_packet(vpn_packet_t *packet) {
                return false;
        }
 
-       device_total_out += packet->len;
-
        return true;
 }