X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=eb3663d7921a322b2c15e4f19b34bc7b49d7c9f2;hb=8145a3392bdcff4d7856ba72e66a90d73d887c00;hp=1116b5e18ab79aeead7cb4514f6c28d730547716;hpb=87f96aec8c48327d879c20ff2b789c88a675173d;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 1116b5e1..eb3663d7 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -43,17 +43,16 @@ static vpn_packet_t device_read_packet;
 static vpn_packet_t device_write_packet;
 char *device = NULL;
 char *iface = NULL;
-static char *device_info = NULL;
+static const char *device_info = "Windows tap device";
 
 extern char *myport;
 
 static void device_issue_read() {
-	device_read_overlapped.Offset = 0;
-	device_read_overlapped.OffsetHigh = 0;
-
 	int status;
 
 	for(;;) {
+		ResetEvent(device_read_overlapped.hEvent);
+
 		DWORD len;
 		status = ReadFile(device_handle, (void *)device_read_packet.data, MTU, &len, &device_read_overlapped);
 
@@ -72,10 +71,7 @@ static void device_issue_read() {
 }
 
 static void device_handle_read(void *data, int flags) {
-	ResetEvent(device_read_overlapped.hEvent);
-
 	DWORD len;
-
 	if(!GetOverlappedResult(device_handle, &device_read_overlapped, &len, FALSE)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error getting read result from %s %s: %s", device_info,
 		       device, strerror(errno));
@@ -312,9 +308,13 @@ static bool write_packet(vpn_packet_t *packet) {
 		   which according to MSDN is a no-no. */
 
 		if(!GetOverlappedResult(device_handle, &device_write_overlapped, &outlen, FALSE)) {
-			int log_level = (GetLastError() == ERROR_IO_INCOMPLETE) ? DEBUG_TRAFFIC : DEBUG_ALWAYS;
-			logger(log_level, LOG_ERR, "Error while checking previous write to %s %s: %s", device_info, device, winerror(GetLastError()));
-			return false;
+			if(GetLastError() != ERROR_IO_INCOMPLETE) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Error completing previously queued write to %s %s: %s", device_info, device, winerror(GetLastError()));
+			} else {
+				logger(DEBUG_TRAFFIC, LOG_ERR, "Previous overlapped write to %s %s still in progress", device_info, device);
+				// drop this packet
+				return true;
+			}
 		}
 	}
 
@@ -322,10 +322,14 @@ static bool write_packet(vpn_packet_t *packet) {
 
 	memcpy(&device_write_packet, packet, sizeof(*packet));
 
+	ResetEvent(device_write_overlapped.hEvent);
+
 	if(WriteFile(device_handle, DATA(&device_write_packet), device_write_packet.len, &outlen, &device_write_overlapped)) {
+		// Write was completed immediately.
 		device_write_packet.len = 0;
 	} else if(GetLastError() != ERROR_IO_PENDING) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
+		device_write_packet.len = 0;
 		return false;
 	}