X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=6ee26e7bf9be125e6a683ca1c525c573c057a650;hb=5ae1ec8d80393182b6ff235062b6816b64edfa9b;hp=b6dffbc988bda018e7d9adffc1b0ca96f42d2033;hpb=f704304823df0ac868786ac89355eda38592dc3f;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index b6dffbc9..6ee26e7b 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -49,11 +49,20 @@ static void device_issue_read() {
 	device_read_overlapped.Offset = 0;
 	device_read_overlapped.OffsetHigh = 0;
 
-	int status = ReadFile(device_handle, (void *)device_read_packet.data, MTU, NULL, &device_read_overlapped);
+	int status;
+	for (;;) {
+		DWORD len;
+		status = ReadFile(device_handle, (void *)device_read_packet.data, MTU, &len, &device_read_overlapped);
+		if (!status) {
+			if (GetLastError() != ERROR_IO_PENDING)
+				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
+					   device, strerror(errno));
+			break;
+		}
 
-	if(!status && GetLastError() != ERROR_IO_PENDING) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-			   device, strerror(errno));
+		device_read_packet.len = len;
+		device_read_packet.priority = 0;
+		route(myself, &device_read_packet);
 	}
 }
 
@@ -177,12 +186,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);
@@ -192,22 +195,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;