X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=dfdb964191e2dfa890cd425faa72f07f703204fc;hb=aebaaa8db80ec3931346af710f2182d129c74c41;hp=7a462ba54bfebbafa654aebde59abac5dc6d0610;hpb=1ceea259c3ba5efb9b8b12161e75256270ba4804;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 7a462ba5..dfdb9641 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -101,8 +101,8 @@ static bool setup_device(void) {
 	get_config_string(lookup_config(config_tree, "Device"), &device);
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
-	if(device && interface)
-		logger(LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
+	if(device && iface)
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
 
 	/* Open registry and look for network adapters */
 
@@ -214,6 +214,9 @@ static bool setup_device(void) {
 
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
 
+	device_read_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+	device_write_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+
 	return true;
 }
 
@@ -226,9 +229,6 @@ static void enable_device(void) {
 
 	/* We don't use the write event directly, but GetOverlappedResult() does, internally. */
 
-	device_read_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-	device_write_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-
 	io_add_event(&device_read_io, device_handle_read, NULL, device_read_overlapped.hEvent);
 	device_issue_read();
 }
@@ -237,6 +237,19 @@ static void disable_device(void) {
 	logger(DEBUG_ALWAYS, LOG_INFO, "Disabling %s", device_info);
 
 	io_del(&device_read_io);
+
+	ULONG status = 0;
+	DWORD len;
+	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
+
+	/* Note that we don't try to cancel ongoing I/O here - we just stop listening.
+	   This is because some TAP-Win32 drivers don't seem to handle cancellation very well,
+	   especially when combined with other events such as the computer going to sleep - cases
+	   were observed where the GetOverlappedResult() would just block indefinitely and never
+	   return in that case. */
+}
+
+static void close_device(void) {
 	CancelIo(device_handle);
 
 	/* According to MSDN, CancelIo() does not necessarily wait for the operation to complete.
@@ -253,11 +266,6 @@ static void disable_device(void) {
 	CloseHandle(device_read_overlapped.hEvent);
 	CloseHandle(device_write_overlapped.hEvent);
 
-	ULONG status = 0;
-	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
-}
-
-static void close_device(void) {
 	CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
 
 	free(device); device = NULL;