Use conditional compilation for device.c.

[tinc] / src / mingw / device.c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 46ad9eb..abe544e 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-2005 Ivo Timmermans,
-                  2002-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2013 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
@@ -18,20 +18,21 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <windows.h>
 #include <winioctl.h>
 
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../names.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
 
-#include "mingw/common.h"
+#include "common.h"
 
 int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
@@ -46,7 +47,7 @@ extern char *myport;
 
 static DWORD WINAPI tapreader(void *bla) {
        int status;
-       long len;
+       DWORD len;
        OVERLAPPED overlapped;
        vpn_packet_t packet;
 
@@ -61,7 +62,7 @@ static DWORD WINAPI tapreader(void *bla) {
                overlapped.OffsetHigh = 0;
                ResetEvent(overlapped.hEvent);
 
-               status = ReadFile(device_handle, packet.data, MTU, &len, &overlapped);
+               status = ReadFile(device_handle, (void *)packet.data, MTU, &len, &overlapped);
 
                if(!status) {
                        if(GetLastError() == ERROR_IO_PENDING) {
@@ -79,6 +80,7 @@ static DWORD WINAPI tapreader(void *bla) {
                packet.len = len;
                packet.priority = 0;
                route(myself, &packet);
+               event_flush_output();
                LeaveCriticalSection(&mutex);
        }
 }
@@ -91,7 +93,7 @@ static bool setup_device(void) {
        char adapterid[1024];
        char adaptername[1024];
        char tapname[1024];
-       long len;
+       DWORD len;
        unsigned long status;
 
        bool found = false;
@@ -118,11 +120,11 @@ static bool setup_device(void) {
 
                snprintf(regpath, sizeof regpath, "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
 
-                if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
+               if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
                        continue;
 
                len = sizeof adaptername;
-               err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
+               err = RegQueryValueEx(key2, "Name", 0, 0, (LPBYTE)adaptername, &len);
 
                RegCloseKey(key2);
 
@@ -172,7 +174,7 @@ static bool setup_device(void) {
                snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
                device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
        }
-       
+
        if(device_handle == INVALID_HANDLE_VALUE) {
                logger(DEBUG_ALWAYS, LOG_ERR, "%s (%s) is not a usable Windows tap device: %s", device, iface, winerror(GetLastError()));
                return false;
@@ -222,7 +224,7 @@ static bool read_packet(vpn_packet_t *packet) {
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-       long outlen;
+       DWORD outlen;
        OVERLAPPED overlapped = {0};
 
        logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",