X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=235e0fd6d64ae0692cce26dbb3c16f7fe2c997a7;hp=b9588318f15ad894d3cb2d2da193c75c16dbd7f4;hb=3f937afd75c758d7396a3f516ae77231a6f5b3d2;hpb=178e52f76ef4ba40748c13ea7e518837394d6dbc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index b958831..235e0fd 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-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2014 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
@@ -18,20 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <windows.h>
 #include <winioctl.h>
 
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
 
-#include "mingw/common.h"
+#include "common.h"
 
 int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
@@ -46,9 +46,10 @@ extern char *myport;
 
 static DWORD WINAPI tapreader(void *bla) {
 	int status;
-	long len;
+	DWORD len;
 	OVERLAPPED overlapped;
 	vpn_packet_t packet;
+	int errors = 0;
 
 	logger(LOG_DEBUG, "Tap reader running");
 
@@ -71,16 +72,27 @@ static DWORD WINAPI tapreader(void *bla) {
 			} else {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
-				return -1;
+				errors++;
+				if(errors >= 10) {
+					EnterCriticalSection(&mutex);
+					running = false;
+					LeaveCriticalSection(&mutex);
+				}
+				usleep(1000000);
+				continue;
 			}
 		}
 
-		EnterCriticalSection(&mutex);
+		errors = 0;
 		packet.len = len;
 		packet.priority = 0;
+
+		EnterCriticalSection(&mutex);
 		route(myself, &packet);
 		LeaveCriticalSection(&mutex);
 	}
+
+	return 0;
 }
 
 static bool setup_device(void) {
@@ -91,7 +103,7 @@ static bool setup_device(void) {
 	char adapterid[1024];
 	char adaptername[1024];
 	char tapname[1024];
-	long len;
+	DWORD len;
 	unsigned long status;
 
 	bool found = false;
@@ -122,7 +134,7 @@ static bool setup_device(void) {
 			continue;
 
 		len = sizeof(adaptername);
-		err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
+		err = RegQueryValueEx(key2, "Name", 0, 0, (LPBYTE)adaptername, &len);
 
 		RegCloseKey(key2);
 
@@ -222,7 +234,7 @@ static bool read_packet(vpn_packet_t *packet) {
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-	long lenout;
+	DWORD lenout;
 	OVERLAPPED overlapped = {0};
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",