X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=020632680b565cf338dc1392275001951cd9c872;hp=e1fbf2200cdfc4b0a1738ad6e3a704e51c87ab45;hb=1f00810da336f3b7132df17b7fe4625748ff4b63;hpb=2ed154e73192d5e162544bc570abbb3a1df3ec83 diff --git a/src/mingw/device.c b/src/mingw/device.c index e1fbf220..02063268 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-2003 Ivo Timmermans , - 2002-2003 Guus Sliepen + Copyright (C) 2002-2004 Ivo Timmermans , + 2002-2004 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.7 2003/07/29 23:21:01 guus Exp $ + $Id$ */ #include "system.h" @@ -32,33 +32,18 @@ #include "utils.h" #include "xalloc.h" -#define NETCARD_REG_KEY_2000 "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}" -#define NETCARD_REG_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards" -#define REG_SERVICE_KEY "SYSTEM\\CurrentControlSet\\Services" -#define REG_CONTROL_NET "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}" - -#define USERMODEDEVICEDIR "\\\\.\\" -#define SYSDEVICEDIR "\\Device\\" -#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) - -/* FIXME: This only works for Windows 2000 */ -#define OSTYPE 5 +#include "mingw/common.h" int device_fd = 0; -HANDLE device_handle = INVALID_HANDLE_VALUE; +static HANDLE device_handle = INVALID_HANDLE_VALUE; 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; + +extern char *myport; DWORD WINAPI tapreader(void *bla) { int sock, err, status; @@ -75,7 +60,7 @@ DWORD WINAPI tapreader(void *bla) { /* Open a socket to the parent process */ - err = getaddrinfo(NULL, "12345", &hint, &ai); + err = getaddrinfo(NULL, myport, &hint, &ai); if(err || !ai) { logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno)); @@ -136,6 +121,7 @@ bool setup_device(void) char adaptername[1024]; char tapname[1024]; long len; + unsigned long status; bool found = false; @@ -147,7 +133,7 @@ bool setup_device(void) .ai_family = AF_UNSPEC, .ai_socktype = SOCK_DGRAM, .ai_protocol = IPPROTO_UDP, - .ai_flags = AI_PASSIVE, + .ai_flags = 0, }; cp(); @@ -157,8 +143,8 @@ bool setup_device(void) /* Open registry and look for network adapters */ - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CONTROL_NET, 0, KEY_READ, &key)) { - logger(LOG_ERR, _("Unable to read registry")); + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key)) { + logger(LOG_ERR, _("Unable to read registry: %s"), winerror(GetLastError())); return false; } @@ -169,15 +155,18 @@ 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); - RegKeyClose(key2); + if(err) + continue; if(device) { if(!strcmp(device, adapterid)) { @@ -203,7 +192,7 @@ bool setup_device(void) } } - RegKeyClose(key); + RegCloseKey(key); if(!found) { logger(LOG_ERR, _("No Windows tap device found!")); @@ -224,14 +213,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; } @@ -241,7 +230,7 @@ bool setup_device(void) /* Create a listening socket */ - err = getaddrinfo(NULL, "12345", &hint, &ai); + err = getaddrinfo(NULL, myport, &hint, &ai); if(err || !ai) { logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno)); @@ -272,7 +261,7 @@ bool setup_device(void) thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL); if(!thread) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", strerror(errno)); + logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", winerror(GetLastError())); return false; } @@ -285,6 +274,11 @@ bool setup_device(void) closesocket(sock); + /* Set media status for newer TAP-Win32 devices */ + + status = true; + DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof(status), &status, sizeof(status), &len, NULL); + device_info = _("Windows tap device"); logger(LOG_INFO, _("%s (%s) is a %s"), device, iface, device_info); @@ -332,7 +326,7 @@ bool write_packet(vpn_packet_t *packet) packet->len, device_info); if(!WriteFile(device_handle, packet->data, packet->len, &lenout, &overlapped)) { - logger(LOG_ERR, _("Error while writing to %s %s"), device_info, device); + logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError())); return false; }