X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=01854d67b7d2f6014afc5e3a9b733e94191b2be5;hp=0ae0cf2713a84af3c88bce6bf892fe89b43e0230;hb=ef65a64443f740e3b22d9e903f764d9a58ce0ff0;hpb=5193a14ddea4c20ffc708dc629a2f91f1e4ccea3

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 0ae0cf27..01854d67 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.11 2003/08/03 21:45:41 guus Exp $
+    $Id: device.c,v 1.1.2.13 2003/08/08 19:49:47 guus Exp $
 */
 
 #include "system.h"
@@ -170,10 +170,13 @@ bool setup_device(void)
 			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;
@@ -219,14 +222,14 @@ bool setup_device(void)
 	}
 	
 	if(device_handle == INVALID_HANDLE_VALUE) {
-		logger(LOG_ERR, _("%s (%s) is no a usable Windows tap device!"), device, iface);
+		logger(LOG_ERR, _("%s (%s) is not a usable Windows tap device: %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}
 
 	/* 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!"));
+		logger(LOG_ERR, _("Could not get MAC address from Windows tap device %s (%s): %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}