X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=d2675ef69fea63ebe533dbc192506df7ba3df90b;hp=e49ab9989fbe5aae3f1c9b538b2a40d63a49ef23;hb=3fd96ebec7e44a0a7288c60da1cdec2d4fe03e8c;hpb=ae50b0077e27c4c4d81a98da46c66865ffa069be

diff --git a/src/mingw/device.c b/src/mingw/device.c
index e49ab998..d2675ef6 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.4 2003/07/29 11:06:23 guus Exp $
+    $Id: device.c,v 1.1.2.9 2003/08/02 21:01:50 guus Exp $
 */
 
 #include "system.h"
@@ -51,7 +51,8 @@
 /* FIXME: This only works for Windows 2000 */
 #define OSTYPE 5
 
-HANDLE device_fd = INVALID_HANDLE_VALUE;
+int device_fd = 0;
+HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
 char *iface = NULL;
 char *device_info = NULL;
@@ -59,6 +60,72 @@ char *device_info = NULL;
 int device_total_in = 0;
 int device_total_out = 0;
 
+DWORD WINAPI tapreader(void *bla) {
+	int sock, err, status;
+	struct addrinfo *ai;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_DGRAM,
+		.ai_protocol = IPPROTO_UDP,
+		.ai_flags = 0,
+	};
+	char buf[MTU];
+	long len;
+	OVERLAPPED overlapped;
+
+	/* Open a socket to the parent process */
+
+	err = getaddrinfo(NULL, "12345", &hint, &ai);
+
+	if(err || !ai) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));
+		return -1;
+	}
+
+	sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+
+	freeaddrinfo(ai);
+
+	if(sock < 0) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
+		return -1;
+	}
+
+	if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "connect", strerror(errno));
+		return -1;
+	}
+
+	logger(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, buf, sizeof(buf), &len, &overlapped);
+
+		if(!status) {
+			if(GetLastError() == ERROR_IO_PENDING) {
+				WaitForSingleObject(overlapped.hEvent, INFINITE);
+				if(!GetOverlappedResult(device_handle, &overlapped, &len, FALSE))
+					continue;
+			} else {
+				logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+					   device, strerror(errno));
+				return -1;
+			}
+		}
+
+		if(send(sock, buf, len, 0) <= 0)
+			return -1;
+	}
+}
+
 bool setup_device(void)
 {
 	HKEY key, key2;
@@ -68,11 +135,21 @@ bool setup_device(void)
 	char adapterid[1024];
 	char adaptername[1024];
 	char tapname[1024];
-	char gelukt = 0;
 	long len;
 
 	bool found = false;
 
+	int sock, err;
+	HANDLE thread;
+
+	struct addrinfo *ai;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_DGRAM,
+		.ai_protocol = IPPROTO_UDP,
+		.ai_flags = AI_PASSIVE,
+	};
+
 	cp();
 
 	get_config_string(lookup_config(config_tree, "Device"), &device);
@@ -81,7 +158,7 @@ bool setup_device(void)
 	/* Open registry and look for network adapters */
 
 	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CONTROL_NET, 0, KEY_READ, &key)) {
-		logger(LOG_ERR, _("Unable to read registry"));
+		logger(LOG_ERR, _("Unable to read registry: %s"), winerror(GetLastError()));
 		return false;
 	}
 
@@ -90,26 +167,26 @@ bool setup_device(void)
 		if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL))
 			break;
 
-		if(device) {
-			if(!strcmp(device, adapterid)) {
-				found = true;
-				break;
-			} else
-				continue;
-		}
-
 		/* Find out more about this adapter */
 
 		snprintf(regpath, sizeof(regpath), "%s\\%s\\Connection", REG_CONTROL_NET, adapterid);
 
-                if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2)) {
-			logger(LOG_ERR, _("Unable to read registry"));
-			return false;
-		}
+                if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
+			continue;
 
 		len = sizeof(adaptername);
 		RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
+		RegCloseKey(key2);
+
+		if(device) {
+			if(!strcmp(device, adapterid)) {
+				found = true;
+				break;
+			} else
+				continue;
+		}
+
 		if(iface) {
 			if(!strcmp(iface, adaptername)) {
 				found = true;
@@ -119,36 +196,41 @@ bool setup_device(void)
 		}
 
 		snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid);
-		device_fd = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
-		if(device_fd != INVALID_HANDLE_VALUE) {
+		device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
+		if(device_handle != INVALID_HANDLE_VALUE) {
 			found = true;
 			break;
 		}
 	}
 
+	RegCloseKey(key);
+
 	if(!found) {
 		logger(LOG_ERR, _("No Windows tap device found!"));
 		return false;
 	}
 
-	device = adapterid;
-	iface = adaptername;
+	if(!device)
+		device = xstrdup(adapterid);
+
+	if(!iface)
+		iface = xstrdup(adaptername);
 
 	/* Try to open the corresponding tap device */
 
-	if(device_fd == INVALID_HANDLE_VALUE) {
+	if(device_handle == INVALID_HANDLE_VALUE) {
 		snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
-		device_fd = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
+		device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
 	}
 	
-	if(device_fd == INVALID_HANDLE_VALUE) {
+	if(device_handle == INVALID_HANDLE_VALUE) {
 		logger(LOG_ERR, _("%s (%s) is no a usable Windows tap device!"), device, iface);
 		return false;
 	}
 
 	/* Get MAC address from tap device */
 
-	if(DeviceIoControl(device_fd, TAP_IOCTL_GET_MAC, mymac.x, sizeof(mymac.x), mymac.x, sizeof(mymac.x), &len, 0)) {
+	if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof(mymac.x), mymac.x, sizeof(mymac.x), &len, 0)) {
 		logger(LOG_ERR, _("Could not get MAC address from Windows tap device!"));
 		return false;
 	}
@@ -157,8 +239,51 @@ bool setup_device(void)
 		overwrite_mac = 1;
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-		iface = device;
+	/* Create a listening socket */
+
+	err = getaddrinfo(NULL, "12345", &hint, &ai);
+
+	if(err || !ai) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));
+		return false;
+	}
+
+	sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+
+	if(sock < 0) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
+		return false;
+	}
+
+	if(bind(sock, ai->ai_addr, ai->ai_addrlen)) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "bind", strerror(errno));
+		return false;
+	}
+
+	freeaddrinfo(ai);
+
+	if(listen(sock, 1)) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno));
+		return false;
+	}
+
+	/* Start the tap reader */
+
+	thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL);
+
+	if(!thread) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", winerror(GetLastError()));
+		return false;
+	}
+
+	/* Wait for the tap reader to connect back to us */
+
+	if((device_fd = accept(sock, NULL, 0)) == -1) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "accept", strerror(errno));
+		return false;
+	}
+
+	closesocket(sock);
 
 	device_info = _("Windows tap device");
 
@@ -171,7 +296,7 @@ void close_device(void)
 {
 	cp();
 
-	CloseHandle(device_fd);
+	CloseHandle(device_handle);
 }
 
 bool read_packet(vpn_packet_t *packet)
@@ -180,7 +305,7 @@ bool read_packet(vpn_packet_t *packet)
 
 	cp();
 
-	if(!ReadFile(device_fd, packet->data, MTU, &lenin, NULL)) {
+	if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
 		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return false;
@@ -198,15 +323,16 @@ bool read_packet(vpn_packet_t *packet)
 
 bool write_packet(vpn_packet_t *packet)
 {
-	int lenout;
+	long lenout;
+	OVERLAPPED overlapped = {0};
 
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
-	if(!WriteFile(device_fd, packet->data, packet->len, &lenout, NULL)) {
-		logger(LOG_ERR, _("Error while writing to %s %s"), device_info, device);
+	if(!WriteFile(device_handle, packet->data, packet->len, &lenout, &overlapped)) {
+		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
 		return false;
 	}