X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmingw%2Fdevice.c;h=a765ce3bbf2434288526fd9a33371f4890fb83fc;hb=132bdb77a0792d85d03ad89f846cbd4024037393;hp=ac83d8c36e8344f92479a269814ebe57fdcd1c82;hpb=f9ab8e266b93aa3be772374ef4a8fdb06e376568;p=tinc

diff --git a/src/mingw/device.c b/src/mingw/device.c
index ac83d8c3..a765ce3b 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -18,21 +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 "names.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;
@@ -94,7 +94,6 @@ static bool setup_device(void) {
 	char adaptername[1024];
 	char tapname[1024];
 	DWORD len;
-	unsigned long status;
 
 	bool found = false;
 
@@ -200,11 +199,6 @@ static bool setup_device(void) {
 		return false;
 	}
 
-	/* 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);
-
 	device_info = "Windows tap device";
 
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
@@ -212,11 +206,26 @@ static bool setup_device(void) {
 	return true;
 }
 
+static void enable_device(void) {
+	logger(DEBUG_ALWAYS, LOG_INFO, "Enabling %s", device_info);
+	ULONG status = 1;
+	DWORD len;
+	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
+}
+
+static void disable_device(void) {
+	logger(DEBUG_ALWAYS, LOG_INFO, "Disabling %s", device_info);
+	ULONG status = 0;
+	DWORD len;
+	DeviceIoControl(device_handle, TAP_IOCTL_SET_MEDIA_STATUS, &status, sizeof status, &status, sizeof status, &len, NULL);
+}
+
 static void close_device(void) {
-	CloseHandle(device_handle);
+	CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
 
-	free(device);
-	free(iface);
+	free(device); device = NULL;
+	free(iface); iface = NULL;
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -240,16 +249,11 @@ static bool write_packet(vpn_packet_t *packet) {
 	return true;
 }
 
-static void dump_device_stats(void) {
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-}
-
 const devops_t os_devops = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
+	.enable = enable_device,
+	.disable = disable_device,
 };