/*
device.c -- Interaction with Windows tap driver in a MinGW environment
- Copyright (C) 2002-2003 Ivo Timmermans <ivo@o2w.nl>,
- 2002-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 2002-2005 Ivo Timmermans,
+ 2002-2007 Guus Sliepen <guus@tinc-vpn.org>
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
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$
*/
#include "system.h"
#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;
+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;
+static struct packetbuf {
+ uint8_t data[MTU];
+ length_t len;
+} *bufs;
+
+static int nbufs = 64;
+
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_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
.ai_flags = 0,
};
- char buf[MTU];
+ unsigned char bufno = 0;
long len;
OVERLAPPED overlapped;
return -1;
}
- sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-
- freeaddrinfo(ai);
+ sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
+ freeaddrinfo(ai);
return -1;
}
if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "connect", strerror(errno));
+ freeaddrinfo(ai);
return -1;
}
+ freeaddrinfo(ai);
+
logger(LOG_DEBUG, _("Tap reader running"));
/* Read from tap device and send to parent */
overlapped.OffsetHigh = 0;
ResetEvent(overlapped.hEvent);
- status = ReadFile(device_handle, buf, sizeof(buf), &len, &overlapped);
+ status = ReadFile(device_handle, bufs[bufno].data, MTU, &len, &overlapped);
if(!status) {
if(GetLastError() == ERROR_IO_PENDING) {
}
}
- if(send(sock, buf, len, 0) <= 0)
+ bufs[bufno].len = len;
+ if(send(sock, &bufno, 1, 0) <= 0)
return -1;
+ if(++bufno >= nbufs)
+ bufno = 0;
}
}
char adaptername[1024];
char tapname[1024];
long len;
+ unsigned long status;
bool found = false;
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,
};
/* 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;
}
/* 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);
+ if(err)
+ continue;
+
if(device) {
if(!strcmp(device, adapterid)) {
found = true;
}
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;
}
overwrite_mac = 1;
}
+ /* Set up ringbuffer */
+
+ get_config_int(lookup_config(config_tree, "RingBufferSize"), &nbufs);
+ if(nbufs <= 1)
+ nbufs = 1;
+ else if(nbufs > 256)
+ nbufs = 256;
+
+ bufs = xmalloc_and_zero(nbufs * sizeof *bufs);
+
/* Create a listening socket */
err = getaddrinfo(NULL, myport, &hint, &ai);
return false;
}
- sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
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);
bool read_packet(vpn_packet_t *packet)
{
- int lenin;
+ unsigned char bufno;
cp();
- if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
+ if((recv(device_fd, &bufno, 1, 0)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
- packet->len = lenin;
+ packet->len = bufs[bufno].len;
+ memcpy(packet->data, bufs[bufno].data, bufs[bufno].len);
device_total_in += packet->len;
projects / tinc / blobdiff