diff options
| -rw-r--r-- | ext/installfiles/windows/ZeroTier One.aip | 2 | ||||
| -rw-r--r-- | osnet/WindowsEthernetTap.cpp | 346 | ||||
| -rw-r--r-- | osnet/WindowsEthernetTap.hpp | 77 | ||||
| -rw-r--r-- | osnet/WindowsEthernetTapFactory.cpp | 170 | ||||
| -rw-r--r-- | osnet/WindowsEthernetTapFactory.hpp | 90 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 3 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 9 |
7 files changed, 402 insertions, 295 deletions
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index 69492623..c752ea6c 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="11.3" Modules="professional" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}"> +<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="11.4" Modules="professional" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}"> <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent"> <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;PreReqComponent;MsiMergeModsComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;ActSyncAppComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;CPLAppletComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;MsiAppSearchComponent"/> </COMPONENT> diff --git a/osnet/WindowsEthernetTap.cpp b/osnet/WindowsEthernetTap.cpp index 4408dc46..02b902d0 100644 --- a/osnet/WindowsEthernetTap.cpp +++ b/osnet/WindowsEthernetTap.cpp @@ -41,10 +41,11 @@ #include <netioapi.h> #include "../node/Constants.hpp" -#include "../node/EthernetTap.hpp" + +#include "WindowsEthernetTap.hpp" +#include "WindowsEthernetTapFactory.hpp" #include "../node/Utils.hpp" #include "../node/Mutex.hpp" -#include "WindowsEthernetTap.hpp" #include "..\windows\TapDriver\tap-windows.h" @@ -53,115 +54,9 @@ static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC namespace ZeroTier { -// Helper function to get an adapter's LUID and index from its GUID. The LUID is -// constant but the index can change, so go ahead and just look them both up by -// the GUID which is constant. (The GUID is the instance ID in the registry.) -static inline std::pair<NET_LUID,NET_IFINDEX> _findAdapterByGuid(const GUID &guid) - throw(std::runtime_error) -{ - MIB_IF_TABLE2 *ift = (MIB_IF_TABLE2 *)0; - - if (GetIfTable2Ex(MibIfTableRaw,&ift) != NO_ERROR) - throw std::runtime_error("GetIfTable2Ex() failed"); - - for(ULONG i=0;i<ift->NumEntries;++i) { - if (ift->Table[i].InterfaceGuid == guid) { - std::pair<NET_LUID,NET_IFINDEX> tmp(ift->Table[i].InterfaceLuid,ift->Table[i].InterfaceIndex); - FreeMibTable(ift); - return tmp; - } - } - - FreeMibTable(&ift); - - throw std::runtime_error("interface not found"); -} - // Only create or delete devices one at a time static Mutex _systemTapInitLock; -// Compute some basic environment stuff on startup -class _WinSysEnv -{ -public: - _WinSysEnv() - { -#ifdef _WIN64 - is64Bit = TRUE; - devcon = "\\devcon_x64.exe"; - tapDriver = "\\tap-windows\\x64\\zttap200.inf"; -#else - is64Bit = FALSE; - IsWow64Process(GetCurrentProcess(),&is64Bit); - devcon = ((is64Bit == TRUE) ? "\\devcon_x64.exe" : "\\devcon_x86.exe"); - tapDriver = ((is64Bit == TRUE) ? "\\tap-windows\\x64\\zttap200.inf" : "\\tap-windows\\x86\\zttap200.inf"); -#endif - } - BOOL is64Bit; - const char *devcon; - const char *tapDriver; -}; -static const _WinSysEnv _winEnv; - -static bool _disableTapDevice(const RuntimeEnvironment *_r,const std::string deviceInstanceId) -{ - HANDLE devconLog = CreateFileA((_r->homePath + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); - if (devconLog != INVALID_HANDLE_VALUE) - SetFilePointer(devconLog,0,0,FILE_END); - - STARTUPINFOA startupInfo; - startupInfo.cb = sizeof(startupInfo); - if (devconLog != INVALID_HANDLE_VALUE) { - startupInfo.hStdOutput = devconLog; - startupInfo.hStdError = devconLog; - } - PROCESS_INFORMATION processInfo; - memset(&startupInfo,0,sizeof(STARTUPINFOA)); - memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); - if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _r->homePath + _winEnv.devcon + "\" disable @" + deviceInstanceId).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { - if (devconLog != INVALID_HANDLE_VALUE) - CloseHandle(devconLog); - return false; - } - WaitForSingleObject(processInfo.hProcess,INFINITE); - CloseHandle(processInfo.hProcess); - CloseHandle(processInfo.hThread); - - if (devconLog != INVALID_HANDLE_VALUE) - CloseHandle(devconLog); - - return true; -} -static bool _enableTapDevice(const RuntimeEnvironment *_r,const std::string deviceInstanceId) -{ - HANDLE devconLog = CreateFileA((_r->homePath + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); - if (devconLog != INVALID_HANDLE_VALUE) - SetFilePointer(devconLog,0,0,FILE_END); - - STARTUPINFOA startupInfo; - startupInfo.cb = sizeof(startupInfo); - if (devconLog != INVALID_HANDLE_VALUE) { - startupInfo.hStdOutput = devconLog; - startupInfo.hStdError = devconLog; - } - PROCESS_INFORMATION processInfo; - memset(&startupInfo,0,sizeof(STARTUPINFOA)); - memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); - if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _r->homePath + _winEnv.devcon + "\" enable @" + deviceInstanceId).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { - if (devconLog != INVALID_HANDLE_VALUE) - CloseHandle(devconLog); - return false; - } - WaitForSingleObject(processInfo.hProcess,INFINITE); - CloseHandle(processInfo.hProcess); - CloseHandle(processInfo.hThread); - - if (devconLog != INVALID_HANDLE_VALUE) - CloseHandle(devconLog); - - return true; -} - static void _syncIpsWithRegistry(const std::set<InetAddress> &haveIps,const std::string netCfgInstanceId) { // Update registry to contain all non-link-local IPs for this interface @@ -190,19 +85,21 @@ static void _syncIpsWithRegistry(const std::set<InetAddress> &haveIps,const std: } WindowsEthernetTap::WindowsEthernetTap( - const RuntimeEnvironment *renv, - const char *tag, + const char *pathToHelpers, const MAC &mac, unsigned int mtu, + unsigned int metric, + uint64_t nwid, + const char *desiredDevice, + const char *friendlyName, void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), - void *arg) - throw(std::runtime_error) : - EthernetTap("WindowsEthernetTap",mac,mtu), - _r(renv), + void *arg) : + EthernetTap("WindowsEthernetTap",mac,mtu,metric), _handler(handler), _arg(arg), _tap(INVALID_HANDLE_VALUE), _injectSemaphore(INVALID_HANDLE_VALUE), + _pathToHelpers(pathToHelpers), _run(true), _initialized(false), _enabled(true) @@ -210,8 +107,9 @@ WindowsEthernetTap::WindowsEthernetTap( char subkeyName[4096]; char subkeyClass[4096]; char data[4096]; + char tag[24]; - if (mtu > ZT_IF_MTU) + if (mtu > 2800) throw std::runtime_error("MTU too large for Windows tap"); Mutex::Lock _l(_systemTapInitLock); @@ -223,7 +121,10 @@ WindowsEthernetTap::WindowsEthernetTap( std::set<std::string> existingDeviceInstances; std::string mySubkeyName; - // Look for the tap instance that corresponds with our interface tag (network ID) + // We "tag" registry entries with the network ID to identify persistent devices + Utils::snprintf(tag,sizeof(tag),"%.16llx",(unsigned long long)nwid); + + // Look for the tap instance that corresponds with this network for(DWORD subkeyIndex=0;;++subkeyIndex) { DWORD type; DWORD dataLen; @@ -258,6 +159,7 @@ WindowsEthernetTap::WindowsEthernetTap( if (!strcmp(data,tag)) { _netCfgInstanceId = instanceId; _deviceInstanceId = instanceIdPath; + mySubkeyName = subkeyName; break; // found it! } @@ -271,12 +173,9 @@ WindowsEthernetTap::WindowsEthernetTap( // If there is no device, try to create one if (_netCfgInstanceId.length() == 0) { // Log devcon output to a file - HANDLE devconLog = CreateFileA((_r->homePath + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); - if (devconLog == INVALID_HANDLE_VALUE) { - LOG("WARNING: unable to open devcon.log"); - } else { + HANDLE devconLog = CreateFileA((_pathToHelpers + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); + if (devconLog != INVALID_HANDLE_VALUE) SetFilePointer(devconLog,0,0,FILE_END); - } // Execute devcon to install an instance of the Microsoft Loopback Adapter STARTUPINFOA startupInfo; @@ -289,7 +188,7 @@ WindowsEthernetTap::WindowsEthernetTap( PROCESS_INFORMATION processInfo; memset(&startupInfo,0,sizeof(STARTUPINFOA)); memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); - if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _r->homePath + _winEnv.devcon + "\" install \"" + _r->homePath + _winEnv.tapDriver + "\" zttap200").c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { + if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _pathToHelpers + WindowsEthernetTapFactory::WINENV.devcon + "\" install \"" + _pathToHelpers + _winEnv.tapDriver + "\" zttap200").c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { RegCloseKey(nwAdapters); if (devconLog != INVALID_HANDLE_VALUE) CloseHandle(devconLog); @@ -302,9 +201,7 @@ WindowsEthernetTap::WindowsEthernetTap( if (devconLog != INVALID_HANDLE_VALUE) CloseHandle(devconLog); - // Scan for the new instance by simply looking for taps that weren't - // there originally. The static mutex we lock ensures this can't step - // on its own toes. + // Scan for the new instance by simply looking for taps that weren't originally there... for(DWORD subkeyIndex=0;;++subkeyIndex) { DWORD type; DWORD dataLen; @@ -347,14 +244,14 @@ WindowsEthernetTap::WindowsEthernetTap( } if (_netCfgInstanceId.length() > 0) { - char tmps[4096]; + char tmps[64]; unsigned int tmpsl = Utils::snprintf(tmps,sizeof(tmps),"%.2X-%.2X-%.2X-%.2X-%.2X-%.2X",(unsigned int)mac[0],(unsigned int)mac[1],(unsigned int)mac[2],(unsigned int)mac[3],(unsigned int)mac[4],(unsigned int)mac[5]) + 1; RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"NetworkAddress",REG_SZ,tmps,tmpsl); RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"MAC",REG_SZ,tmps,tmpsl); DWORD tmp = mtu; RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"MTU",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp)); tmp = 0; - RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"EnableDHCP",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp)); + RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"EnableDHCP",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp)); // disable DHCP by default on new devices RegCloseKey(nwAdapters); } else { RegCloseKey(nwAdapters); @@ -376,6 +273,13 @@ WindowsEthernetTap::WindowsEthernetTap( throw std::runtime_error("unable to convert instance ID GUID to native GUID (invalid NetCfgInstanceId in registry?)"); } + // Look up interface LUID... why are there (at least) four fucking ways to refer to a network device in Windows? + if (ConvertInterfaceGuidToLuid(&_deviceGuid,&_deviceLuid) != NO_ERROR) + throw std::runtime_error("unable to convert device interface GUID to LUID"); + + if (friendlyName) + setFriendlyName(friendlyName); + // Start background thread that actually performs I/O _injectSemaphore = CreateSemaphore(NULL,0,1,NULL); _thread = Thread::start(this); @@ -390,7 +294,7 @@ WindowsEthernetTap::~WindowsEthernetTap() ReleaseSemaphore(_injectSemaphore,1,NULL); Thread::join(_thread); CloseHandle(_injectSemaphore); - _disableTapDevice(_r,_deviceInstanceId); + _disableTapDevice(); } void WindowsEthernetTap::setEnabled(bool en) @@ -403,17 +307,6 @@ bool WindowsEthernetTap::enabled() const return _enabled; } -void WindowsEthernetTap::setDisplayName(const char *dn) -{ - if (!_initialized) - return; - HKEY ifp; - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,(std::string("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\") + _netCfgInstanceId).c_str(),0,KEY_READ|KEY_WRITE,&ifp) == ERROR_SUCCESS) { - RegSetKeyValueA(ifp,"Connection","Name",REG_SZ,(LPCVOID)dn,(DWORD)(strlen(dn)+1)); - RegCloseKey(ifp); - } -} - bool WindowsEthernetTap::addIP(const InetAddress &ip) { if (!_initialized) @@ -426,7 +319,6 @@ bool WindowsEthernetTap::addIP(const InetAddress &ip) try { // Add IP to interface at the netlink level if not already assigned. if (!haveIps.count(ip)) { - std::pair<NET_LUID,NET_IFINDEX> ifidx = _findAdapterByGuid(_deviceGuid); MIB_UNICASTIPADDRESS_ROW ipr; InitializeUnicastIpAddressEntry(&ipr); @@ -449,23 +341,18 @@ bool WindowsEthernetTap::addIP(const InetAddress &ip) ipr.ValidLifetime = 0xffffffff; ipr.PreferredLifetime = 0xffffffff; - ipr.InterfaceLuid = ifidx.first; - ipr.InterfaceIndex = ifidx.second; + ipr.InterfaceLuid = _deviceLuid; + ipr.InterfaceIndex = _getDeviceIndex(); if (CreateUnicastIpAddressEntry(&ipr) == NO_ERROR) { haveIps.insert(ip); } else { - LOG("unable to add IP address %s to interface %s: %d",ip.toString().c_str(),deviceName().c_str(),(int)GetLastError()); return false; } } _syncIpsWithRegistry(haveIps,_netCfgInstanceId); - } catch (std::exception &exc) { - LOG("unexpected exception adding IP address %s to %s: %s",ip.toString().c_str(),deviceName().c_str(),exc.what()); - return false; } catch ( ... ) { - LOG("unexpected exception adding IP address %s to %s: unknown exception",ip.toString().c_str(),deviceName().c_str()); return false; } return true; @@ -477,10 +364,9 @@ bool WindowsEthernetTap::removeIP(const InetAddress &ip) return false; try { MIB_UNICASTIPADDRESS_TABLE *ipt = (MIB_UNICASTIPADDRESS_TABLE *)0; - std::pair<NET_LUID,NET_IFINDEX> ifidx = _findAdapterByGuid(_deviceGuid); if (GetUnicastIpAddressTable(AF_UNSPEC,&ipt) == NO_ERROR) { for(DWORD i=0;i<ipt->NumEntries;++i) { - if ((ipt->Table[i].InterfaceLuid.Value == ifidx.first.Value)&&(ipt->Table[i].InterfaceIndex == ifidx.second)) { + if (ipt->Table[i].InterfaceLuid.Value == _deviceLuid.Value) { InetAddress addr; switch(ipt->Table[i].Address.si_family) { case AF_INET: @@ -502,11 +388,7 @@ bool WindowsEthernetTap::removeIP(const InetAddress &ip) } FreeMibTable((PVOID)ipt); } - } catch (std::exception &exc) { - LOG("unexpected exception removing IP address %s from %s: %s",ip.toString().c_str(),deviceName().c_str(),exc.what()); - } catch ( ... ) { - LOG("unexpected exception removing IP address %s from %s: unknown exception",ip.toString().c_str(),deviceName().c_str()); - } + } catch ( ... ) {} return false; } @@ -520,11 +402,9 @@ std::set<InetAddress> WindowsEthernetTap::ips() const try { MIB_UNICASTIPADDRESS_TABLE *ipt = (MIB_UNICASTIPADDRESS_TABLE *)0; - std::pair<NET_LUID,NET_IFINDEX> ifidx = _findAdapterByGuid(_deviceGuid); - if (GetUnicastIpAddressTable(AF_UNSPEC,&ipt) == NO_ERROR) { for(DWORD i=0;i<ipt->NumEntries;++i) { - if ((ipt->Table[i].InterfaceLuid.Value == ifidx.first.Value)&&(ipt->Table[i].InterfaceIndex == ifidx.second)) { + if (ipt->Table[i].InterfaceLuid.Value == _deviceLuid.Value) { switch(ipt->Table[i].Address.si_family) { case AF_INET: { InetAddress ip(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr),4,ipt->Table[i].OnLinkPrefixLength); @@ -550,27 +430,36 @@ void WindowsEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherTyp { if ((!_initialized)||(!_enabled)||(_tap == INVALID_HANDLE_VALUE)||(len > (ZT_IF_MTU))) return; - { - Mutex::Lock _l(_injectPending_m); - _injectPending.push( std::pair<Array<char,ZT_IF_MTU + 32>,unsigned int>(Array<char,ZT_IF_MTU + 32>(),len + 14) ); - char *d = _injectPending.back().first.data; - to.copyTo(d,6); - from.copyTo(d + 6,6); - d[12] = (char)((etherType >> 8) & 0xff); - d[13] = (char)(etherType & 0xff); - memcpy(d + 14,data,len); - } + + Mutex::Lock _l(_injectPending_m); + _injectPending.push( std::pair<Array<char,ZT_IF_MTU + 32>,unsigned int>(Array<char,ZT_IF_MTU + 32>(),len + 14) ); + char *d = _injectPending.back().first.data; + to.copyTo(d,6); + from.copyTo(d + 6,6); + d[12] = (char)((etherType >> 8) & 0xff); + d[13] = (char)(etherType & 0xff); + memcpy(d + 14,data,len); + ReleaseSemaphore(_injectSemaphore,1,NULL); } std::string WindowsEthernetTap::deviceName() const { - return _netCfgInstanceId; + char tmp[1024]; + if (ConvertInterfaceLuidToNameA(&_deviceLuid,tmp,sizeof(tmp)) != NO_ERROR) + return std::string("[ConvertInterfaceLuidToName() failed]"); + return std::string(tmp); } -std::string WindowsEthernetTap::persistentId() const +void WindowsEthernetTap::setFriendlyName(const char *dn) { - return _deviceInstanceId; + if (!_initialized) + return; + HKEY ifp; + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,(std::string("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\") + _netCfgInstanceId).c_str(),0,KEY_READ|KEY_WRITE,&ifp) == ERROR_SUCCESS) { + RegSetKeyValueA(ifp,"Connection","Name",REG_SZ,(LPCVOID)dn,(DWORD)(strlen(dn)+1)); + RegCloseKey(ifp); + } } bool WindowsEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups) @@ -652,9 +541,9 @@ void WindowsEthernetTap::threadMain() // headless MSI upgrade. It cannot be reproduced in any other circumstance. bool throwOneAway = true; while (_run) { - _disableTapDevice(_r,_deviceInstanceId); + _disableTapDevice(); Sleep(250); - if (!_enableTapDevice(_r,_deviceInstanceId)) { + if (!_enableTapDevice()) { ::free(tapReadBuf); _enabled = false; return; // only happens if devcon is missing or totally fails @@ -743,94 +632,83 @@ void WindowsEthernetTap::threadMain() ::free(tapReadBuf); } -bool WindowsEthernetTap::deletePersistentTapDevice(const RuntimeEnvironment *_r,const char *pid) +bool WindowsEthernetTap::_disableTapDevice() { - Mutex::Lock _l(_systemTapInitLock); // only one thread may mess with taps at a time, process-wide + HANDLE devconLog = CreateFileA((_pathToHelpers + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); + if (devconLog != INVALID_HANDLE_VALUE) + SetFilePointer(devconLog,0,0,FILE_END); - HANDLE devconLog = CreateFileA((_r->homePath + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); STARTUPINFOA startupInfo; startupInfo.cb = sizeof(startupInfo); if (devconLog != INVALID_HANDLE_VALUE) { - SetFilePointer(devconLog,0,0,FILE_END); startupInfo.hStdOutput = devconLog; startupInfo.hStdError = devconLog; } PROCESS_INFORMATION processInfo; memset(&startupInfo,0,sizeof(STARTUPINFOA)); memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); - if (CreateProcessA(NULL,(LPSTR)(std::string("\"") + _r->homePath + _winEnv.devcon + "\" remove @" + pid).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { - WaitForSingleObject(processInfo.hProcess,INFINITE); - CloseHandle(processInfo.hProcess); - CloseHandle(processInfo.hThread); + if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _pathToHelpers + WindowsEthernetTapFactory::WINENV.devcon + "\" disable @" + _deviceInstanceId).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { if (devconLog != INVALID_HANDLE_VALUE) CloseHandle(devconLog); - return true; + return false; } + WaitForSingleObject(processInfo.hProcess,INFINITE); + CloseHandle(processInfo.hProcess); + CloseHandle(processInfo.hThread); + if (devconLog != INVALID_HANDLE_VALUE) CloseHandle(devconLog); - return false; + return true; } -int WindowsEthernetTap::cleanPersistentTapDevices(const RuntimeEnvironment *_r,const std::set<std::string> &exceptThese,bool alsoRemoveUnassociatedDevices) +bool WindowsEthernetTap::_enableTapDevice() { - char subkeyName[4096]; - char subkeyClass[4096]; - char data[4096]; + HANDLE devconLog = CreateFileA((_pathToHelpers + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); + if (devconLog != INVALID_HANDLE_VALUE) + SetFilePointer(devconLog,0,0,FILE_END); - std::set<std::string> instanceIdPathsToRemove; - { - Mutex::Lock _l(_systemTapInitLock); // only one thread may mess with taps at a time, process-wide + STARTUPINFOA startupInfo; + startupInfo.cb = sizeof(startupInfo); + if (devconLog != INVALID_HANDLE_VALUE) { + startupInfo.hStdOutput = devconLog; + startupInfo.hStdError = devconLog; + } + PROCESS_INFORMATION processInfo; + memset(&startupInfo,0,sizeof(STARTUPINFOA)); + memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); + if (!CreateProcessA(NULL,(LPSTR)(std::string("\"") + _pathToHelpers + WindowsEthernetTapFactory::WINENV.devcon + "\" enable @" + _deviceInstanceId).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { + if (devconLog != INVALID_HANDLE_VALUE) + CloseHandle(devconLog); + return false; + } + WaitForSingleObject(processInfo.hProcess,INFINITE); + CloseHandle(processInfo.hProcess); + CloseHandle(processInfo.hThread); - HKEY nwAdapters; - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}",0,KEY_READ|KEY_WRITE,&nwAdapters) != ERROR_SUCCESS) - return -1; + if (devconLog != INVALID_HANDLE_VALUE) + CloseHandle(devconLog); - for(DWORD subkeyIndex=0;;++subkeyIndex) { - DWORD type; - DWORD dataLen; - DWORD subkeyNameLen = sizeof(subkeyName); - DWORD subkeyClassLen = sizeof(subkeyClass); - FILETIME lastWriteTime; - if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) { - type = 0; - dataLen = sizeof(data); - if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) { - data[dataLen] = '\0'; - if (!strnicmp(data,"zttap",5)) { - std::string instanceIdPath; - type = 0; - dataLen = sizeof(data); - if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) - instanceIdPath.assign(data,dataLen); - if (instanceIdPath.length() != 0) { - type = 0; - dataLen = sizeof(data); - if (RegGetValueA(nwAdapters,subkeyName,"_ZeroTierTapIdentifier",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) { - if (dataLen <= 0) { - if (alsoRemoveUnassociatedDevices) - instanceIdPathsToRemove.insert(instanceIdPath); - } else { - if (!exceptThese.count(std::string(data,dataLen))) - instanceIdPathsToRemove.insert(instanceIdPath); - } - } else if (alsoRemoveUnassociatedDevices) - instanceIdPathsToRemove.insert(instanceIdPath); - } - } - } - } else break; // end of list or failure - } + return true; +} - RegCloseKey(nwAdapters); - } +NET_IFINDEX WindowsEthernetTap::_getDeviceIndex() +{ + MIB_IF_TABLE2 *ift = (MIB_IF_TABLE2 *)0; + + if (GetIfTable2Ex(MibIfTableRaw,&ift) != NO_ERROR) + throw std::runtime_error("GetIfTable2Ex() failed"); - int removed = 0; - for(std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin());iidp!=instanceIdPathsToRemove.end();++iidp) { - if (deletePersistentTapDevice(_r,iidp->c_str())) - ++removed; + for(ULONG i=0;i<ift->NumEntries;++i) { + if (ift->Table[i].InterfaceLuid.Value == _deviceLuid.Value) { + FreeMibTable(ift); + return ift->Table[i].InterfaceIndex; + } } - return removed; + + FreeMibTable(&ift); + + throw std::runtime_error("interface not found"); } } // namespace ZeroTier diff --git a/osnet/WindowsEthernetTap.hpp b/osnet/WindowsEthernetTap.hpp index 74c56621..516601bc 100644 --- a/osnet/WindowsEthernetTap.hpp +++ b/osnet/WindowsEthernetTap.hpp @@ -31,95 +31,76 @@ #include <stdio.h> #include <stdlib.h> +#include <ifdef.h> + #include <string> #include <queue> #include <stdexcept> -#include "../Constants.hpp" -#include "../EthernetTap.hpp" -#include "../Mutex.hpp" -#include "../Thread.hpp" -#include "../Array.hpp" +#include "../node/Constants.hpp" +#include "../node/EthernetTap.hpp" +#include "../node/Mutex.hpp" +#include "../node/Thread.hpp" +#include "../node/Array.hpp" +#include "../node/MulticastGroup.hpp" namespace ZeroTier { -/** - * Windows Ethernet tap device using bundled ztTap driver - */ class WindowsEthernetTap : public EthernetTap { public: - /** - * Open tap device, installing and creating one if it does not exist - * - * @param renv Runtime environment - * @param tag A tag (presently the hex network ID) used to identify persistent tap devices in the registry - * @param mac MAC address of device - * @param mtu MTU of device - * @param desc If non-NULL, a description (not used on all OSes) - * @param handler Handler function to be called when data is received from the tap - * @param arg First argument to handler function - * @throws std::runtime_error Unable to allocate device - */ WindowsEthernetTap( - const RuntimeEnvironment *renv, - const char *tag, + const char *pathToHelpers, const MAC &mac, unsigned int mtu, + unsigned int metric, + uint64_t nwid, + const char *desiredDevice, + const char *friendlyName, void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), - void *arg) - throw(std::runtime_error); + void *arg); virtual ~WindowsEthernetTap(); virtual void setEnabled(bool en); virtual bool enabled() const; - virtual void setDisplayName(const char *dn); virtual bool addIP(const InetAddress &ip); virtual bool removeIP(const InetAddress &ip); virtual std::set<InetAddress> ips() const; virtual void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len); virtual std::string deviceName() const; - virtual std::string persistentId() const; + virtual void setFriendlyName(const char *friendlyName); virtual bool updateMulticastGroups(std::set<MulticastGroup> &groups); - /** - * Thread main method; do not call elsewhere - */ + inline const NET_LUID &luid() const { return _deviceLuid; } + inline const GUID &guid() const { return _deviceGuid; } + inline const std::string &instanceId() const { return _deviceInstanceId; } + void threadMain() throw(); - /** - * Remove persistent tap device by device name - * - * @param _r Runtime environment - * @param pdev Device name as returned by persistentId() while tap is running - * @return True if a device was deleted - */ - static bool deletePersistentTapDevice(const RuntimeEnvironment *_r,const char *pid); - - /** - * Clean persistent tap devices that are not in the supplied set - * - * @param _r Runtime environment - * @param exceptThese Devices to leave in place - * @param alsoRemoveUnassociatedDevices If true, remove devices not associated with any network as well - * @return Number of devices deleted or -1 if an error prevented the operation from being performed - */ - static int cleanPersistentTapDevices(const RuntimeEnvironment *_r,const std::set<std::string> &exceptThese,bool alsoRemoveUnassociatedDevices); - private: + bool _disableTapDevice(); + bool _enableTapDevice(); + NET_IFINDEX _getDeviceIndex(); // throws on failure + void (*_handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &); void *_arg; Thread _thread; volatile HANDLE _tap; HANDLE _injectSemaphore; + GUID _deviceGuid; + NET_LUID _deviceLuid; std::string _netCfgInstanceId; // NetCfgInstanceId, a GUID std::string _deviceInstanceId; // DeviceInstanceID, another kind of "instance ID" + std::queue< std::pair< Array<char,ZT_IF_MTU + 32>,unsigned int > > _injectPending; Mutex _injectPending_m; + + std::string _pathToHelpers; + volatile bool _run; volatile bool _initialized; volatile bool _enabled; diff --git a/osnet/WindowsEthernetTapFactory.cpp b/osnet/WindowsEthernetTapFactory.cpp index e69de29b..6564e186 100644 --- a/osnet/WindowsEthernetTapFactory.cpp +++ b/osnet/WindowsEthernetTapFactory.cpp @@ -0,0 +1,170 @@ +/* + * ZeroTier One - Global Peer to Peer Ethernet + * Copyright (C) 2011-2014 ZeroTier Networks LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ + +#include "WindowsEthernetTapFactory.hpp" +#include "WindowsEthernetTap.hpp" + +namespace ZeroTier { + +WindowsEthernetTapFactory::Env::Env() +{ +#ifdef _WIN64 + is64Bit = TRUE; + devcon = "\\devcon_x64.exe"; + tapDriver = "\\tap-windows\\x64\\zttap200.inf"; +#else + is64Bit = FALSE; + IsWow64Process(GetCurrentProcess(),&is64Bit); + devcon = ((is64Bit == TRUE) ? "\\devcon_x64.exe" : "\\devcon_x86.exe"); + tapDriver = ((is64Bit == TRUE) ? "\\tap-windows\\x64\\zttap200.inf" : "\\tap-windows\\x86\\zttap200.inf"); +#endif +} + +WindowsEthernetTapFactory::WindowsEthernetTapFactory(const char *pathToHelpers) : + _pathToHelpers(pathToHelpers) +{ +} + +WindowsEthernetTapFactory::~WindowsEthernetTapFactory() +{ + Mutex::Lock _l(_devices_m); + for(std::vector<EthernetTap *>::iterator d(_devices.begin());d!=_devices.end();++d) + delete *d; +} + +EthernetTap *WindowsEthernetTapFactory::open( + const MAC &mac, + unsigned int mtu, + unsigned int metric, + uint64_t nwid, + const char *desiredDevice, + const char *friendlyName, + void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), + void *arg) +{ + Mutex::Lock _l(_devices_m); + EthernetTap *t = new WindowsEthernetTap(_pathToHelpers.c_str(),mac,mtu,metric,nwid,desiredDevice,friendlyName,handler,arg); + _devices.push_back(t); + return t; +} + +void WindowsEthernetTapFactory::close(EthernetTap *tap,bool destroyPersistentDevices) +{ + std::string instanceId(((WindowsEthernetTap *)tap)->instanceId()); + Mutex::Lock _l(_devices_m); + + for(std::vector<EthernetTap *>::iterator d(_devices.begin());d!=_devices.end();++d) { + if (*d == tap) { + _devices.erase(d); + break; + } + } + + delete tap; + + if (destroyPersistentDevices) + _deletePersistentTapDevice(_pathToHelpers.c_str(),instanceId.c_str()); +} + +void WindowsEthernetTapFactory::destroyAllPersistentTapDevices(const char *pathToHelpers) +{ + char subkeyName[4096]; + char subkeyClass[4096]; + char data[4096]; + + std::set<std::string> instanceIdPathsToRemove; + { + HKEY nwAdapters; + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}",0,KEY_READ|KEY_WRITE,&nwAdapters) != ERROR_SUCCESS) + return; + + for(DWORD subkeyIndex=0;;++subkeyIndex) { + DWORD type; + DWORD dataLen; + DWORD subkeyNameLen = sizeof(subkeyName); + DWORD subkeyClassLen = sizeof(subkeyClass); + FILETIME lastWriteTime; + if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) { + type = 0; + dataLen = sizeof(data); + if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) { + data[dataLen] = '\0'; + if (!strnicmp(data,"zttap",5)) { + std::string instanceIdPath; + type = 0; + dataLen = sizeof(data); + if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) + instanceIdPath.assign(data,dataLen); + if (instanceIdPath.length() != 0) { + instanceIdPathsToRemove.insert(instanceIdPath); + /* + type = 0; + dataLen = sizeof(data); + if (RegGetValueA(nwAdapters,subkeyName,"_ZeroTierTapIdentifier",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) { + if (dataLen <= 0) { + instanceIdPathsToRemove.insert(instanceIdPath); + } else { + instanceIdPathsToRemove.insert(instanceIdPath); + } + } + */ + } + } + } + } else break; // end of list or failure + } + + RegCloseKey(nwAdapters); + } + + for(std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin());iidp!=instanceIdPathsToRemove.end();++iidp) + _deletePersistentTapDevice(pathToHelpers,iidp->c_str()); +} + +void WindowsEthernetTapFactory::_deletePersistentTapDevice(const char *pathToHelpers,const char *instanceId) +{ + HANDLE devconLog = CreateFileA((std::string(pathToHelpers) + "\\devcon.log").c_str(),GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); + STARTUPINFOA startupInfo; + startupInfo.cb = sizeof(startupInfo); + if (devconLog != INVALID_HANDLE_VALUE) { + SetFilePointer(devconLog,0,0,FILE_END); + startupInfo.hStdOutput = devconLog; + startupInfo.hStdError = devconLog; + } + PROCESS_INFORMATION processInfo; + memset(&startupInfo,0,sizeof(STARTUPINFOA)); + memset(&processInfo,0,sizeof(PROCESS_INFORMATION)); + if (CreateProcessA(NULL,(LPSTR)(std::string("\"") + pathToHelpers + WINENV.devcon + "\" remove @" + instanceId).c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) { + WaitForSingleObject(processInfo.hProcess,INFINITE); + CloseHandle(processInfo.hProcess); + CloseHandle(processInfo.hThread); + } + if (devconLog != INVALID_HANDLE_VALUE) + CloseHandle(devconLog); +} + +} // namespace ZeroTier diff --git a/osnet/WindowsEthernetTapFactory.hpp b/osnet/WindowsEthernetTapFactory.hpp index e69de29b..619ae759 100644 --- a/osnet/WindowsEthernetTapFactory.hpp +++ b/osnet/WindowsEthernetTapFactory.hpp @@ -0,0 +1,90 @@ +/* + * ZeroTier One - Global Peer to Peer Ethernet + * Copyright (C) 2011-2014 ZeroTier Networks LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ + +#ifndef ZT_WINDOWSETHERNETTAPFACTORY_HPP +#define ZT_WINDOWSETHERNETTAPFACTORY_HPP + +#include <vector> +#include <string> + +#include "../node/EthernetTapFactory.hpp" +#include "../node/Mutex.hpp" + +namespace ZeroTier { + +class WindowsEthernetTapFactory : public EthernetTapFactory +{ +public: + class Env + { + public: + Env(); + BOOL is64Bit; // true if WIN64 or WoW64 (32-bit binary on 64-bit architecture) + const char *devcon; // name of devcon binary in pathToHelpers to use + const char *tapDriver; // relative path to driver under pathToHelpers to use + }; + + /** + * Constants related to Windows environment, computed on program start + */ + static const Env WINENV; + + /** + * @param pathToHelpers Path to devcon32.exe, devcon64.exe, and other required helper binaries (ZeroTier running directory) + */ + WindowsEthernetTapFactory(const char *pathToHelpers); + virtual ~WindowsEthernetTapFactory(); + + virtual EthernetTap *open( + const MAC &mac, + unsigned int mtu, + unsigned int metric, + uint64_t nwid, + const char *desiredDevice, + const char *friendlyName, + void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), + void *arg); + virtual void close(EthernetTap *tap,bool destroyPersistentDevices); + + /** + * Uninstalls all persistent tap devices in the system belonging to ZeroTier + * + * This is for uninstallation. Do not call this while tap devices are active. + */ + static void destroyAllPersistentTapDevices(const char *pathToHelpers); + +private: + static void _deletePersistentTapDevice(const char *pathToHelpers,const char *instanceId); + + std::string _pathToHelpers; + std::vector<EthernetTap *> _devices; + Mutex _devices_m; +}; + +} // namespace ZeroTier + +#endif diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 2a1b0325..b31a76cc 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -20,7 +20,6 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\ext\lz4\lz4.c" /> - <ClCompile Include="..\..\ext\lz4\lz4hc.c" /> <ClCompile Include="..\..\main.cpp" /> <ClCompile Include="..\..\node\C25519.cpp" /> <ClCompile Include="..\..\node\CertificateOfMembership.cpp" /> @@ -47,7 +46,6 @@ <ClCompile Include="..\..\node\SocketManager.cpp" /> <ClCompile Include="..\..\node\SoftwareUpdater.cpp" /> <ClCompile Include="..\..\node\Switch.cpp" /> - <ClCompile Include="..\..\node\SysEnv.cpp" /> <ClCompile Include="..\..\node\TcpSocket.cpp" /> <ClCompile Include="..\..\node\Topology.cpp" /> <ClCompile Include="..\..\node\UdpSocket.cpp" /> @@ -106,7 +104,6 @@ <ClInclude Include="..\..\node\SocketManager.hpp" /> <ClInclude Include="..\..\node\SoftwareUpdater.hpp" /> <ClInclude Include="..\..\node\Switch.hpp" /> - <ClInclude Include="..\..\node\SysEnv.hpp" /> <ClInclude Include="..\..\node\TcpSocket.hpp" /> <ClInclude Include="..\..\node\Thread.hpp" /> <ClInclude Include="..\..\node\Topology.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index b68854a1..dcba83ef 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -18,9 +18,6 @@ <ClCompile Include="..\..\ext\lz4\lz4.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\ext\lz4\lz4hc.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\node\C25519.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -84,9 +81,6 @@ <ClCompile Include="..\..\node\Switch.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\node\SysEnv.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\node\Topology.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -251,9 +245,6 @@ <ClInclude Include="..\..\node\Switch.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\node\SysEnv.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\node\Thread.hpp"> <Filter>Header Files</Filter> </ClInclude> |