X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=2649914c10756b94091d66985f418ac6b98e37cc;hp=00b57abfd392d094e3376992d57a0000cc4c9182;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=7926a156e5b118d06295228e57de0cc9de0433b4

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 00b57abf..2649914c 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-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2002-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2002-2005 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
@@ -32,32 +32,16 @@
 #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;
 
@@ -159,7 +143,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 +155,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;