X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=b156cef7f977f399dc9cc8cdd139023901907827;hp=d2675ef69fea63ebe533dbc192506df7ba3df90b;hb=6f3099595530280028f6ec3d0b310df523e75f98;hpb=3fd96ebec7e44a0a7288c60da1cdec2d4fe03e8c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index d2675ef6..b156cef7 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -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.9 2003/08/02 21:01:50 guus Exp $
+    $Id: device.c,v 1.1.2.12 2003/08/08 17:20:12 guus Exp $
 */
 
 #include "system.h"
@@ -32,13 +32,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#define NETCARD_REG_KEY_2000 "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-#define NETCARD_REG_KEY      "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards"
-#define REG_SERVICE_KEY      "SYSTEM\\CurrentControlSet\\Services"
 #define REG_CONTROL_NET      "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
 
 #define USERMODEDEVICEDIR "\\\\.\\"
-#define SYSDEVICEDIR  "\\Device\\"
 #define USERDEVICEDIR "\\??\\"
 #define TAPSUFFIX     ".tap"
 
@@ -48,9 +44,6 @@
 #define TAP_IOCTL_GET_MAC        TAP_CONTROL_CODE(1, METHOD_BUFFERED)
 #define TAP_IOCTL_SET_STATISTICS TAP_CONTROL_CODE(2, METHOD_BUFFERED)
 
-/* FIXME: This only works for Windows 2000 */
-#define OSTYPE 5
-
 int device_fd = 0;
 HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
@@ -60,6 +53,8 @@ char *device_info = NULL;
 int device_total_in = 0;
 int device_total_out = 0;
 
+extern char *myport;
+
 DWORD WINAPI tapreader(void *bla) {
 	int sock, err, status;
 	struct addrinfo *ai;
@@ -75,7 +70,7 @@ DWORD WINAPI tapreader(void *bla) {
 
 	/* Open a socket to the parent process */
 
-	err = getaddrinfo(NULL, "12345", &hint, &ai);
+	err = getaddrinfo(NULL, myport, &hint, &ai);
 
 	if(err || !ai) {
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));
@@ -147,7 +142,7 @@ bool setup_device(void)
 		.ai_family = AF_UNSPEC,
 		.ai_socktype = SOCK_DGRAM,
 		.ai_protocol = IPPROTO_UDP,
-		.ai_flags = AI_PASSIVE,
+		.ai_flags = 0,
 	};
 
 	cp();
@@ -224,7 +219,7 @@ bool setup_device(void)
 	}
 	
 	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!"), device, iface);
 		return false;
 	}
 
@@ -241,7 +236,7 @@ bool setup_device(void)
 
 	/* Create a listening socket */
 
-	err = getaddrinfo(NULL, "12345", &hint, &ai);
+	err = getaddrinfo(NULL, myport, &hint, &ai);
 
 	if(err || !ai) {
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));