Update copyright notices.

[oweals/tinc.git] / src / mingw / device.c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 93c6b78e1ea016db1f9cca3732a40ecba1c66854..6d916ba573c27841a01bf6ab7f7d99b0b56fd6bd 100644 (file)
--- 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 <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
@@ -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.14 2003/10/08 11:37:53 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -32,45 +32,36 @@
 #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)
-#define TAP_IOCTL_GET_VERSION           TAP_CONTROL_CODE(3, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_MTU               TAP_CONTROL_CODE(4, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_INFO              TAP_CONTROL_CODE(5, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE(6, METHOD_BUFFERED)
-#define TAP_IOCTL_SET_MEDIA_STATUS      TAP_CONTROL_CODE(7, 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;
 
@@ -83,7 +74,7 @@ DWORD WINAPI tapreader(void *bla) {
                return -1;
        }
 
-       sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+       sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 
        freeaddrinfo(ai);
 
@@ -108,7 +99,7 @@ DWORD WINAPI tapreader(void *bla) {
                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) {
@@ -122,8 +113,11 @@ DWORD WINAPI tapreader(void *bla) {
                        }
                }
 
-               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;
        }
 }
 
@@ -147,8 +141,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,
        };
 
@@ -159,7 +153,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;
        }
@@ -171,7 +165,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;
@@ -244,6 +238,16 @@ bool setup_device(void)
                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);
@@ -253,7 +257,7 @@ bool setup_device(void)
                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));
@@ -311,17 +315,18 @@ void close_device(void)
 
 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;