X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=97b2a38d0c60ef327317efec5359d032c9e3bd58;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=c8f288ca3d6b3cdb4c02a971894ea77a945d80d5;hpb=ef65a64443f740e3b22d9e903f764d9a58ce0ff0;p=meshlink diff --git a/src/cygwin/device.c b/src/cygwin/device.c index c8f288ca..97b2a38d 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 , - 2002-2003 Guus Sliepen + Copyright (C) 2002-2005 Ivo Timmermans, + 2002-2009 Guus Sliepen 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.16 2003/08/08 19:49:47 guus Exp $ + $Id$ */ #include "system.h" @@ -32,34 +32,23 @@ #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; char *device = NULL; char *iface = NULL; -char *device_info = NULL; +static 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) -{ +bool setup_device(void) { HKEY key, key2; - int i; + int i, err; char regpath[1024]; char adapterid[1024]; @@ -77,24 +66,24 @@ 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; } for (i = 0; ; i++) { - len = sizeof(adapterid); + len = sizeof adapterid; if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL)) break; /* 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); + len = sizeof adaptername; err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len); RegCloseKey(key2); @@ -118,7 +107,7 @@ bool setup_device(void) continue; } - snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid); + snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid); device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0); if(device_handle != INVALID_HANDLE_VALUE) { CloseHandle(device_handle); @@ -140,7 +129,7 @@ bool setup_device(void) if(!iface) iface = xstrdup(adaptername); - snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, device); + snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, device); /* Now we are going to open this device twice: once for reading and once for writing. We do this because apparently it isn't possible to check for activity in the select() loop. @@ -164,7 +153,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)) { + 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 (%s): %s"), device, iface, winerror(GetLastError())); return false; } @@ -187,7 +176,7 @@ bool setup_device(void) It passes everything it reads to the socket. */ char buf[MTU]; - long lenin; + long inlen; CloseHandle(device_handle); @@ -210,8 +199,8 @@ bool setup_device(void) /* Pass packets */ for(;;) { - ReadFile(device_handle, buf, MTU, &lenin, NULL); - write(sp[1], buf, lenin); + ReadFile(device_handle, buf, MTU, &inlen, NULL); + write(sp[1], buf, inlen); } } @@ -228,8 +217,7 @@ bool setup_device(void) return true; } -void close_device(void) -{ +void close_device(void) { cp(); close(sp[0]); @@ -237,21 +225,23 @@ void close_device(void) CloseHandle(device_handle); kill(reader_pid, SIGKILL); + + free(device); + free(iface); } -bool read_packet(vpn_packet_t *packet) -{ - int lenin; +bool read_packet(vpn_packet_t *packet) { + int inlen; cp(); - if((lenin = read(sp[0], packet->data, MTU)) <= 0) { + if((inlen = read(sp[0], packet->data, MTU)) <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); return false; } - packet->len = lenin; + packet->len = inlen; device_total_in += packet->len; @@ -261,16 +251,15 @@ bool read_packet(vpn_packet_t *packet) return true; } -bool write_packet(vpn_packet_t *packet) -{ - long lenout; +bool write_packet(vpn_packet_t *packet) { + long outlen; cp(); ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"), packet->len, device_info); - if(!WriteFile (device_handle, packet->data, packet->len, &lenout, NULL)) { + if(!WriteFile (device_handle, packet->data, packet->len, &outlen, NULL)) { logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError())); return false; } @@ -280,8 +269,7 @@ bool write_packet(vpn_packet_t *packet) return true; } -void dump_device_stats(void) -{ +void dump_device_stats(void) { cp(); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);