summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/win-ui-wrapper/ZeroTier One.exebin761304 -> 0 bytes
-rw-r--r--osdep/WindowsEthernetTap.cpp8
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/win-ui-wrapper/ZeroTier One.exe b/ext/win-ui-wrapper/ZeroTier One.exe
deleted file mode 100644
index 6abbc129..00000000
--- a/ext/win-ui-wrapper/ZeroTier One.exe
+++ /dev/null
Binary files differ
diff --git a/osdep/WindowsEthernetTap.cpp b/osdep/WindowsEthernetTap.cpp
index 220516ab..7f6cbc4d 100644
--- a/osdep/WindowsEthernetTap.cpp
+++ b/osdep/WindowsEthernetTap.cpp
@@ -124,11 +124,11 @@ WindowsEthernetTap::WindowsEthernetTap(
Mutex::Lock _l(_systemTapInitLock);
- std::string tapDriverPath(_pathToHelpers + WINENV.tapDriverNdis6);
- const char *tapDriverName = "zttap300";
+ std::string tapDriverPath(_pathToHelpers + WINENV.tapDriverNdis5);
+ const char *tapDriverName = "zttap200";
if (::PathFileExistsA(tapDriverPath.c_str()) == FALSE) {
- tapDriverPath = _pathToHelpers + WINENV.tapDriverNdis5;
- tapDriverName = "zttap200";
+ tapDriverPath = _pathToHelpers + WINENV.tapDriverNdis6;
+ tapDriverName = "zttap300";
if (::PathFileExistsA(tapDriverPath.c_str()) == FALSE) {
throw std::runtime_error("no tap driver available: cannot find zttap300.inf (NDIS6) or zttap200.inf (NDIS5) under home path");
}