X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=915256f502d4a18108cf199f87ca19011c11750f;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=6d916ba573c27841a01bf6ab7f7d99b0b56fd6bd;hpb=a1e72f84d08b76784c11ff723666ceeaef2756eb;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 6d916ba5..915256f5 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-2005 Ivo Timmermans,
-                  2002-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2009 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
@@ -38,7 +38,7 @@ int device_fd = 0;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
 char *iface = NULL;
-char *device_info = NULL;
+static char *device_info = NULL;
 
 static int device_total_in = 0;
 static int device_total_out = 0;
@@ -52,7 +52,7 @@ static struct packetbuf {
 
 static int nbufs = 64;
 
-DWORD WINAPI tapreader(void *bla) {
+static DWORD WINAPI tapreader(void *bla) {
 	int sock, err, status;
 	struct addrinfo *ai;
 	struct addrinfo hint = {
@@ -76,18 +76,20 @@ DWORD WINAPI tapreader(void *bla) {
 
 	sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 
-	freeaddrinfo(ai);
-
 	if(sock < 0) {
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
+		freeaddrinfo(ai);
 		return -1;
 	}
 
 	if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "connect", strerror(errno));
+		freeaddrinfo(ai);
 		return -1;
 	}
 
+	freeaddrinfo(ai);
+
 	logger(LOG_DEBUG, _("Tap reader running"));
 
 	/* Read from tap device and send to parent */
@@ -121,8 +123,7 @@ DWORD WINAPI tapreader(void *bla) {
 	}
 }
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	HKEY key, key2;
 	int i;
 
@@ -159,18 +160,18 @@ bool setup_device(void)
 	}
 
 	for (i = 0; ; i++) {
-		len = sizeof(adapterid);
+		len = sizeof adapterid;
 		if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL))
 			break;
 
 		/* Find out more about this adapter */
 
-		snprintf(regpath, sizeof(regpath), "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
+		snprintf(regpath, sizeof regpath, "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
 
                 if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
 			continue;
 
-		len = sizeof(adaptername);
+		len = sizeof adaptername;
 		err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
 		RegCloseKey(key2);
@@ -194,7 +195,7 @@ bool setup_device(void)
 				continue;
 		}
 
-		snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid);
+		snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid);
 		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) {
 			found = true;
@@ -218,7 +219,7 @@ bool setup_device(void)
 	/* Try to open the corresponding tap device */
 
 	if(device_handle == INVALID_HANDLE_VALUE) {
-		snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
+		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);
 	}
 	
@@ -229,7 +230,7 @@ bool setup_device(void)
 
 	/* Get MAC address from tap device */
 
-	if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof(mymac.x), mymac.x, sizeof(mymac.x), &len, 0)) {
+	if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof mymac.x, mymac.x, sizeof mymac.x, &len, 0)) {
 		logger(LOG_ERR, _("Could not get MAC address from Windows tap device %s (%s): %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}
@@ -297,7 +298,7 @@ bool setup_device(void)
 	/* Set media status for newer TAP-Win32 devices */
 
 	status = true;
-	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof(status), &status, sizeof(status), &len, NULL);
+	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
 
 	device_info = _("Windows tap device");
 
@@ -306,15 +307,16 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	CloseHandle(device_handle);
+
+	free(device);
+	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
+bool read_packet(vpn_packet_t *packet) {
 	unsigned char bufno;
 
 	cp();
@@ -336,9 +338,8 @@ bool read_packet(vpn_packet_t *packet)
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
-	long lenout;
+bool write_packet(vpn_packet_t *packet) {
+	long outlen;
 	OVERLAPPED overlapped = {0};
 
 	cp();
@@ -346,7 +347,7 @@ bool write_packet(vpn_packet_t *packet)
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
-	if(!WriteFile(device_handle, packet->data, packet->len, &lenout, &overlapped)) {
+	if(!WriteFile(device_handle, packet->data, packet->len, &outlen, &overlapped)) {
 		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
 		return false;
 	}
@@ -356,8 +357,7 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
 	cp();
 
 	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);