X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=b7a191f4ebb490a3c68e074ab5e6964c4188a407;hb=3a149f7521dfff67e6a790c1a830afc649ae083e;hp=d90c69b0244622138422390c110ba7b3e7ea4c0e;hpb=7bf4d225a994d8ce9fb45d42afd53793c4232e8e;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index d90c69b0..b7a191f4 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Windows tap driver in a MinGW environment
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2018 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -48,9 +48,6 @@ 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(;;) {
@@ -74,10 +71,20 @@ static void device_issue_read() {
 }
 
 static void device_handle_read(void *data, int flags) {
+	(void)data;
+	(void)flags;
+
 	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));
+
+		if(GetLastError() != ERROR_IO_INCOMPLETE) {
+			/* Must reset event or it will keep firing. */
+			ResetEvent(device_read_overlapped.hEvent);
+		}
+
 		return;
 	}
 
@@ -101,8 +108,8 @@ static bool setup_device(void) {
 
 	int err;
 
-	get_config_string(lookup_config(config_tree, "Device"), &device);
-	get_config_string(lookup_config(config_tree, "Interface"), &iface);
+	get_config_string(lookup_config(&config_tree, "Device"), &device);
+	get_config_string(lookup_config(&config_tree, "Interface"), &iface);
 
 	if(device && iface) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
@@ -208,7 +215,7 @@ static bool setup_device(void) {
 			if(info[0] == 9 && info[1] >= 21)
 				logger(DEBUG_ALWAYS, LOG_WARNING,
 				       "You are using the newer (>= 9.0.0.21, NDIS6) series of TAP-Win32 drivers. "
-				       "Using these drivers with tinc is not recommanded as it can result in poor performance. "
+				       "Using these drivers with tinc is not recommended as it can result in poor performance. "
 				       "You might want to revert back to 9.0.0.9 instead.");
 		}
 	}
@@ -296,6 +303,7 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
+	(void)packet;
 	return false;
 }
 
@@ -311,9 +319,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;
+			}
 		}
 	}
 
@@ -321,10 +333,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;
 	}