From 6f7cce69479f9b2796d81f458bf836287b74462e Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 29 Jul 2003 12:18:35 +0000 Subject: [PATCH] Make sure it works. --- src/cygwin/device.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/cygwin/device.c b/src/cygwin/device.c index ca8c5f35..f7db4c23 100644 --- a/src/cygwin/device.c +++ b/src/cygwin/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.12 2003/07/29 11:06:23 guus Exp $ + $Id: device.c,v 1.1.2.13 2003/07/29 12:18:35 guus Exp $ */ #include "system.h" @@ -95,26 +95,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; @@ -132,6 +132,8 @@ bool setup_device(void) } } + RegCloseKey(key); + if(!found) { logger(LOG_ERR, _("No Windows tap device found!")); return false; @@ -164,7 +166,7 @@ bool setup_device(void) /* 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(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; } @@ -187,9 +189,11 @@ bool setup_device(void) It passes everything it reads to the socket. */ char buf[MTU]; - int lenin; + long lenin; + + CloseHandle(handle); - handle = CreateFile(tapname, GENERIC_READ, FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM , 0); + handle = CreateFile(tapname, GENERIC_READ, FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0); if(handle == INVALID_HANDLE_VALUE) { logger(LOG_ERR, _("Could not open Windows tap device for reading!")); @@ -208,7 +212,7 @@ bool setup_device(void) /* Pass packets */ for(;;) { - ReadFile (handle, buf, MTU, &lenin, NULL); + ReadFile(handle, buf, MTU, &lenin, NULL); write(sp[1], buf, lenin); } } @@ -219,14 +223,11 @@ bool setup_device(void) return false; } - if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) - iface = device; - device_info = _("Windows tap device"); logger(LOG_INFO, _("%s (%s) is a %s"), device, iface, device_info); - return false; + return true; } void close_device(void) @@ -264,7 +265,7 @@ bool read_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet) { - int lenout; + long lenout; cp(); -- 2.20.1