Browse Source

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.

pull/1/head
Adam Ierymenko 11 years ago
parent
commit
a40192a40b
  1. BIN
      ext/win-ui-wrapper/ZeroTier One.exe
  2. 8
      osdep/WindowsEthernetTap.cpp

BIN
ext/win-ui-wrapper/ZeroTier One.exe

Binary file not shown.

8
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");
}

Loading…
Cancel
Save