X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=3f4864b557cc10aa760c3fb265349f000c11d471;hp=e5f5354b04b3e28d7f2ac4f171f45df9714b39ab;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=c044d12dfd54c033bc5ad9fbf9f889724762f76c

diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index e5f5354b..3f4864b5 100644
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Windows tap driver in a Cygwin environment
-    Copyright (C) 2002-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2002-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2002-2005 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
@@ -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.15 2003/08/02 21:33:18 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -32,17 +32,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#define REG_CONTROL_NET "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-
-#define USERMODEDEVICEDIR "\\\\.\\"
-#define USERDEVICEDIR "\\??\\"
-#define TAPSUFFIX ".tap"
-
-#define TAP_CONTROL_CODE(request,method) CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD | 8000, request, method, FILE_ANY_ACCESS)
-
-#define TAP_IOCTL_GET_LASTMAC    TAP_CONTROL_CODE(0, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_MAC        TAP_CONTROL_CODE(1, METHOD_BUFFERED)
-#define TAP_IOCTL_SET_STATISTICS TAP_CONTROL_CODE(2, METHOD_BUFFERED)
+#include "mingw/common.h"
 
 int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
@@ -50,16 +40,16 @@ char *device = NULL;
 char *iface = NULL;
 char *device_info = NULL;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
-pid_t reader_pid;
-int sp[2];
+static pid_t reader_pid;
+static int sp[2];
 
 bool setup_device(void)
 {
 	HKEY key, key2;
-	int i;
+	int i, err;
 
 	char regpath[1024];
 	char adapterid[1024];
@@ -77,7 +67,7 @@ bool setup_device(void)
 
 	/* Open registry and look for network adapters */
 
-	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CONTROL_NET, 0, KEY_READ, &key)) {
+	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key)) {
 		logger(LOG_ERR, _("Unable to read registry: %s"), winerror(GetLastError()));
 		return false;
 	}
@@ -89,16 +79,19 @@ bool setup_device(void)
 
 		/* Find out more about this adapter */
 
-		snprintf(regpath, sizeof(regpath), "%s\\%s\\Connection", REG_CONTROL_NET, adapterid);
+		snprintf(regpath, sizeof(regpath), "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
 
                 if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
 			continue;
 
 		len = sizeof(adaptername);
-		RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
+		err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
 		RegCloseKey(key2);
 
+		if(err)
+			continue;
+
 		if(device) {
 			if(!strcmp(device, adapterid)) {
 				found = true;
@@ -153,7 +146,7 @@ bool setup_device(void)
 	device_handle = CreateFile(tapname, GENERIC_WRITE,  FILE_SHARE_READ,  0,  OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM , 0);
 	
 	if(device_handle == INVALID_HANDLE_VALUE) {
-		logger(LOG_ERR, _("Could not open Windows tap device for writing: %s"), winerror(GetLastError()));
+		logger(LOG_ERR, _("Could not open Windows tap device %s (%s) for writing: %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}
 
@@ -162,7 +155,7 @@ bool setup_device(void)
 	/* Get MAC address from tap device */
 
 	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: %s"), winerror(GetLastError()));
+		logger(LOG_ERR, _("Could not get MAC address from Windows tap device %s (%s): %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}
 
@@ -191,7 +184,7 @@ bool setup_device(void)
 		device_handle = CreateFile(tapname, GENERIC_READ, FILE_SHARE_WRITE, 0,  OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
 
 		if(device_handle == INVALID_HANDLE_VALUE) {
-			logger(LOG_ERR, _("Could not open Windows tap device for reading: %s"), winerror(GetLastError()));
+			logger(LOG_ERR, _("Could not open Windows tap device %s (%s) for reading: %s"), device, iface, winerror(GetLastError()));
 			buf[0] = 0;
 			write(sp[1], buf, 1);
 			exit(1);