X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=db3f5a650a520f341db0955e9ce79caf1bc9e0a6;hp=2649914c10756b94091d66985f418ac6b98e37cc;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 2649914c..db3f5a65 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 <ivo@tinc-vpn.org>,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2002-2005 Ivo Timmermans,
+                  2002-2009 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
@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include "system.h"
@@ -34,65 +32,35 @@
 
 #include "mingw/common.h"
 
-int device_fd = 0;
+int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
 char *iface = NULL;
-char *device_info = NULL;
+static char *device_info = NULL;
 
 static int device_total_in = 0;
 static int device_total_out = 0;
 
 extern char *myport;
 
-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];
+static DWORD WINAPI tapreader(void *bla) {
+	int status;
 	long len;
 	OVERLAPPED overlapped;
-
-	/* Open a socket to the parent process */
-
-	err = getaddrinfo(NULL, myport, &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;
-	}
+	vpn_packet_t packet;
 
 	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);
+		status = ReadFile(device_handle, packet.data, MTU, &len, &overlapped);
 
 		if(!status) {
 			if(GetLastError() == ERROR_IO_PENDING) {
@@ -106,8 +74,11 @@ DWORD WINAPI tapreader(void *bla) {
 			}
 		}
 
-		if(send(sock, buf, len, 0) <= 0)
-			return -1;
+		EnterCriticalSection(&mutex);
+		packet.len = len;
+		packet.priority = 0;
+		route(myself, &packet);
+		LeaveCriticalSection(&mutex);
 	}
 }
 
@@ -131,8 +102,8 @@ bool setup_device(void)
 	struct addrinfo *ai;
 	struct addrinfo hint = {
 		.ai_family = AF_UNSPEC,
-		.ai_socktype = SOCK_DGRAM,
-		.ai_protocol = IPPROTO_UDP,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
 		.ai_flags = 0,
 	};
 
@@ -228,34 +199,6 @@ bool setup_device(void)
 		overwrite_mac = 1;
 	}
 
-	/* Create a listening socket */
-
-	err = getaddrinfo(NULL, myport, &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);
@@ -265,15 +208,6 @@ bool setup_device(void)
 		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);
-
 	/* Set media status for newer TAP-Win32 devices */
 
 	status = true;
@@ -291,28 +225,14 @@ void close_device(void)
 	cp();
 
 	CloseHandle(device_handle);
+
+	free(device);
+	free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)
 {
-	int lenin;
-
-	cp();
-
-	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;
-	}
-	
-	packet->len = lenin;
-
-	device_total_in += packet->len;
-
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
-			   device_info);
-
-	return true;
+	return false;
 }
 
 bool write_packet(vpn_packet_t *packet)