diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-05-08 12:35:03 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-05-08 12:35:03 -0700 |
| commit | a40192a40bdf81b9d2a78ae69e059e41d78604ea (patch) | |
| tree | 5947342ce4d36016e5690d6f4f169b6171cfb8af | |
| parent | 92ca53e14113f3243d1516fe3c4c841aa967626d (diff) | |
| download | infinitytier-a40192a40bdf81b9d2a78ae69e059e41d78604ea.tar.gz infinitytier-a40192a40bdf81b9d2a78ae69e059e41d78604ea.zip | |
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.
| -rw-r--r-- | ext/win-ui-wrapper/ZeroTier One.exe | bin | 761304 -> 0 bytes | |||
| -rw-r--r-- | osdep/WindowsEthernetTap.cpp | 8 |
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 Binary files differdeleted file mode 100644 index 6abbc129..00000000 --- a/ext/win-ui-wrapper/ZeroTier One.exe +++ /dev/null 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"); } |