X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=2ef0064189b877e925c8597f0d8176c057a6205c;hb=1d10afd3d33f5623494d9eeb2fa8237712f8aa2e;hp=0e748f85e9d965d5d5528b2129c5c610cff0d705;hpb=06a4a8c153407b690a3ce3f0e7fdaa8568ccb1a3;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 0e748f85..2ef00641 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-2013 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
@@ -36,60 +36,41 @@
 
 int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
+static io_t device_read_io;
+static OVERLAPPED device_read_overlapped;
+static vpn_packet_t device_read_packet;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
 
 extern char *myport;
 
-static DWORD WINAPI tapreader(void *bla) {
-	int status;
-	DWORD len;
-	OVERLAPPED overlapped;
-	vpn_packet_t packet;
-	int errors;
-
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "Tap reader running");
-
-	/* Read from tap device and send to parent */
-
-	overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-
-	for(;;) {
-		overlapped.Offset = 0;
-		overlapped.OffsetHigh = 0;
-		ResetEvent(overlapped.hEvent);
-
-		status = ReadFile(device_handle, (void *)packet.data, MTU, &len, &overlapped);
-
-		if(!status) {
-			if(GetLastError() == ERROR_IO_PENDING) {
-				WaitForSingleObject(overlapped.hEvent, INFINITE);
-				if(!GetOverlappedResult(device_handle, &overlapped, &len, FALSE))
-					continue;
-			} else {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-					   device, strerror(errno));
-				errors++;
-				if(errors >= 10) {
-					EnterCriticalSection(&mutex);
-					running = false;
-					LeaveCriticalSection(&mutex);
-				}
-				usleep(1000000);
-				continue;
-			}
-		}
+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);
+
+	if(!status && GetLastError() != ERROR_IO_PENDING) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
+			   device, strerror(errno));
+	}
+}
 
-		errors = 0;
-		packet.len = len;
-		packet.priority = 0;
+static void device_handle_read(void *data, int flags) {
+	ResetEvent(device_read_overlapped.hEvent);
 
-		EnterCriticalSection(&mutex);
-		route(myself, &packet);
-		event_flush_output();
-		LeaveCriticalSection(&mutex);
+	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));
+		return;
 	}
+
+	device_read_packet.len = len;
+	device_read_packet.priority = 0;
+	route(myself, &device_read_packet);
+	device_issue_read();
 }
 
 static bool setup_device(void) {
@@ -101,12 +82,10 @@ static bool setup_device(void) {
 	char adaptername[1024];
 	char tapname[1024];
 	DWORD len;
-	unsigned long status;
 
 	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);
@@ -198,32 +177,43 @@ static bool setup_device(void) {
 		overwrite_mac = 1;
 	}
 
-	/* Start the tap reader */
+	device_info = "Windows tap device";
 
-	thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL);
+	logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
 
-	if(!thread) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "CreateThread", winerror(GetLastError()));
-		return false;
-	}
+	return true;
+}
 
-	/* Set media status for newer TAP-Win32 devices */
+static void enable_device(void) {
+	logger(DEBUG_ALWAYS, LOG_INFO, "Enabling %s", device_info);
 
-	status = true;
+	ULONG status = 1;
+	DWORD len;
 	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
 
-	device_info = "Windows tap device";
+	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();
+}
 
-	logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
+static void disable_device(void) {
+	logger(DEBUG_ALWAYS, LOG_INFO, "Disabling %s", device_info);
 
-	return true;
+	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) {
-	CloseHandle(device_handle);
+	CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
 
-	free(device);
-	free(iface);
+	free(device); device = NULL;
+	free(iface); iface = NULL;
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -250,4 +240,6 @@ const devops_t os_devops = {
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
+	.enable = enable_device,
+	.disable = disable_device,
 };