X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=0ae0cf2713a84af3c88bce6bf892fe89b43e0230;hp=dfda08951f01de73ab8b47828004042a47f19771;hb=5193a14ddea4c20ffc708dc629a2f91f1e4ccea3;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219

diff --git a/src/mingw/device.c b/src/mingw/device.c
index dfda089..0ae0cf2 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.6 2003/07/29 22:59:01 guus Exp $
+    $Id: device.c,v 1.1.2.11 2003/08/03 21:45:41 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();
@@ -158,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)) {
-		logger(LOG_ERR, _("Unable to read registry"));
+		logger(LOG_ERR, _("Unable to read registry: %s"), winerror(GetLastError()));
 		return false;
 	}
 
@@ -177,6 +172,8 @@ bool setup_device(void)
 		len = sizeof(adaptername);
 		RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
+		RegCloseKey(key2);
+
 		if(device) {
 			if(!strcmp(device, adapterid)) {
 				found = true;
@@ -201,6 +198,8 @@ bool setup_device(void)
 		}
 	}
 
+	RegCloseKey(key);
+
 	if(!found) {
 		logger(LOG_ERR, _("No Windows tap device found!"));
 		return false;
@@ -237,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));
@@ -268,7 +267,7 @@ bool setup_device(void)
 	thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL);
 
 	if(!thread) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", strerror(errno));
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", winerror(GetLastError()));
 		return false;
 	}
 
@@ -328,7 +327,7 @@ bool write_packet(vpn_packet_t *packet)
 			   packet->len, device_info);
 
 	if(!WriteFile(device_handle, packet->data, packet->len, &lenout, &overlapped)) {
-		logger(LOG_ERR, _("Error while writing to %s %s"), device_info, device);
+		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
 		return false;
 	}