From a40192a40bdf81b9d2a78ae69e059e41d78604ea Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 8 May 2015 12:35:03 -0700 Subject: Scratch that wrapper... it was easy to make, but it turns out WebControl is IE4 (!!!?!). Also prefer NDIS5 to NDIS6 *if* NDIS5 is installed. We will no longer ship it, but this will make older installs use the same driver they are already using. Should ease upgrade. --- ext/win-ui-wrapper/ZeroTier One.exe | Bin 761304 -> 0 bytes osdep/WindowsEthernetTap.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 ext/win-ui-wrapper/ZeroTier One.exe 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 Binary files a/ext/win-ui-wrapper/ZeroTier One.exe and /dev/null 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"); } -- cgit v1.2.3