ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-02 19:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'winroute' into dev

Browse Source
This commit is contained in:
Grant Limberg 2017-01-09 12:41:45 -08:00
commit dbd577c6b0
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osdep/WindowsEthernetTap.cpp
View File

@ -640,7 +640,7 @@ WindowsEthernetTap::WindowsEthernetTap(
if (ConvertInterfaceGuidToLuid(&_deviceGuid,&_deviceLuid) != NO_ERROR) if (ConvertInterfaceGuidToLuid(&_deviceGuid,&_deviceLuid) != NO_ERROR)
throw std::runtime_error("unable to convert device interface GUID to LUID"); throw std::runtime_error("unable to convert device interface GUID to LUID");
_initialized = true; //_initialized = true;
if (friendlyName) if (friendlyName)
setFriendlyName(friendlyName); setFriendlyName(friendlyName);
@ -1007,6 +1007,10 @@ void WindowsEthernetTap::threadMain()
ReadFile(_tap,tapReadBuf,sizeof(tapReadBuf),NULL,&tapOvlRead); ReadFile(_tap,tapReadBuf,sizeof(tapReadBuf),NULL,&tapOvlRead);
bool writeInProgress = false; bool writeInProgress = false;
ULONGLONG timeOfLastBorkCheck = GetTickCount64(); ULONGLONG timeOfLastBorkCheck = GetTickCount64();
_initialized = true;
while (_run) { while (_run) {
DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE); DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE);
if (!_run) break; // will also break outer while(_run) if (!_run) break; // will also break outer while(_run)

2
osdep/WindowsEthernetTap.hpp
View File

@ -110,6 +110,8 @@ public:
void threadMain() void threadMain()
throw(); throw();
bool isInitialized() const { return _initialized; };
private: private:
NET_IFINDEX _getDeviceIndex(); // throws on failure NET_IFINDEX _getDeviceIndex(); // throws on failure
std::vector<std::string> _getRegistryIPv4Value(const char *regKey); std::vector<std::string> _getRegistryIPv4Value(const char *regKey);

10
service/OneService.cpp
View File

@ -1666,6 +1666,16 @@ public:
case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig)); memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig));
if (n.tap) { // sanity check if (n.tap) { // sanity check
#ifdef __WINDOWS__
// wait for up to 5 seconds for the WindowsEthernetTap to actually be initialized
//
// without WindowsEthernetTap::isInitialized() returning true, the won't actually
// be online yet and setting managed routes on it will fail.
const int MAX_SLEEP_COUNT = 500;
for (int i = 0; !n.tap->isInitialized() && i < MAX_SLEEP_COUNT; i++) {
Sleep(10);
}
#endif
syncManagedStuff(n,true,true); syncManagedStuff(n,true,true);
} else { } else {
_nets.erase(nwid); _nets.erase(nwid);