X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=c0f02f2a870a8ec1efbe9c1c75dcfbda28449150;hp=33152861087ecc3bbb1941c3cb63ec8d82b55cdf;hb=5dde6461a321ee47b06e33f8203f2acf00a31a51;hpb=dc3b7d47f3297e22161787a1d6e06205140cf0fb diff --git a/src/mingw/device.c b/src/mingw/device.c index 33152861..c0f02f2a 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-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 @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.3 2003/08/27 13:47:49 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -32,77 +30,37 @@ #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 = 0; -HANDLE device_handle = INVALID_HANDLE_VALUE; +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; extern char *myport; -DWORD WINAPI tapreader(void *bla) { - int sock, err, status; - struct addrinfo *ai; - struct addrinfo hint = { - .ai_family = AF_UNSPEC, - .ai_socktype = SOCK_DGRAM, - .ai_protocol = IPPROTO_UDP, - .ai_flags = 0, - }; - char buf[MTU]; +static DWORD WINAPI tapreader(void *bla) { + int status; long len; OVERLAPPED overlapped; - - /* Open a socket to the parent process */ - - err = getaddrinfo(NULL, myport, &hint, &ai); - - if(err || !ai) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno)); - return -1; - } - - sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - - freeaddrinfo(ai); - - if(sock < 0) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno)); - return -1; - } - - if(connect(sock, ai->ai_addr, ai->ai_addrlen)) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "connect", strerror(errno)); - return -1; - } + vpn_packet_t packet; logger(LOG_DEBUG, _("Tap reader running")); /* Read from tap device and send to parent */ overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - + for(;;) { overlapped.Offset = 0; overlapped.OffsetHigh = 0; ResetEvent(overlapped.hEvent); - status = ReadFile(device_handle, buf, sizeof(buf), &len, &overlapped); + status = ReadFile(device_handle, packet.data, MTU, &len, &overlapped); if(!status) { if(GetLastError() == ERROR_IO_PENDING) { @@ -116,13 +74,15 @@ DWORD WINAPI tapreader(void *bla) { } } - if(send(sock, buf, len, 0) <= 0) - return -1; + EnterCriticalSection(&mutex); + packet.len = len; + packet.priority = 0; + route(myself, &packet); + LeaveCriticalSection(&mutex); } } -bool setup_device(void) -{ +bool setup_device(void) { HKEY key, key2; int i; @@ -131,6 +91,7 @@ bool setup_device(void) char adaptername[1024]; char tapname[1024]; long len; + unsigned long status; bool found = false; @@ -140,8 +101,8 @@ bool setup_device(void) struct addrinfo *ai; struct addrinfo hint = { .ai_family = AF_UNSPEC, - .ai_socktype = SOCK_DGRAM, - .ai_protocol = IPPROTO_UDP, + .ai_socktype = SOCK_STREAM, + .ai_protocol = IPPROTO_TCP, .ai_flags = 0, }; @@ -152,7 +113,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; } @@ -164,7 +125,7 @@ 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; @@ -237,34 +198,6 @@ bool setup_device(void) overwrite_mac = 1; } - /* Create a listening socket */ - - err = getaddrinfo(NULL, myport, &hint, &ai); - - if(err || !ai) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno)); - return false; - } - - sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - - if(sock < 0) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno)); - return false; - } - - if(bind(sock, ai->ai_addr, ai->ai_addrlen)) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "bind", strerror(errno)); - return false; - } - - freeaddrinfo(ai); - - if(listen(sock, 1)) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno)); - return false; - } - /* Start the tap reader */ thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL); @@ -274,14 +207,10 @@ bool setup_device(void) return false; } - /* Wait for the tap reader to connect back to us */ + /* Set media status for newer TAP-Win32 devices */ - if((device_fd = accept(sock, NULL, 0)) == -1) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "accept", strerror(errno)); - return false; - } - - closesocket(sock); + status = true; + DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof(status), &status, sizeof(status), &len, NULL); device_info = _("Windows tap device"); @@ -290,37 +219,20 @@ bool setup_device(void) return true; } -void close_device(void) -{ +void close_device(void) { cp(); CloseHandle(device_handle); -} - -bool read_packet(vpn_packet_t *packet) -{ - int lenin; - - cp(); - - if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) { - logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, - device, strerror(errno)); - return false; - } - - packet->len = lenin; - device_total_in += packet->len; - - ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, - device_info); + free(device); + free(iface); +} - return true; +bool read_packet(vpn_packet_t *packet) { + return false; } -bool write_packet(vpn_packet_t *packet) -{ +bool write_packet(vpn_packet_t *packet) { long lenout; OVERLAPPED overlapped = {0}; @@ -339,8 +251,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);