mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
Potential fix for routing issue on Windows
Move setting _initialized = true until after WindowsEthernetTap::threadMain() has actually created and brought up the adapter. Also in OneService::nodeVirtualNetworkConfigFunction(), wait up to 5 seconds for WindowsEthernatTap::isInitialized() to return true before attempting to configure the interface and managed routes. Without this, the adapter doesnt actually exist yet when trying to add routes
This commit is contained in:
parent
aaf69d1aff
commit
e2b1a7157e
3 changed files with 20 additions and 1 deletions
|
@ -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)
|
||||||
|
|
|
@ -110,12 +110,17 @@ 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);
|
||||||
void _setRegistryIPv4Value(const char *regKey,const std::vector<std::string> &value);
|
void _setRegistryIPv4Value(const char *regKey,const std::vector<std::string> &value);
|
||||||
void _syncIps();
|
void _syncIps();
|
||||||
|
|
||||||
|
// clean up invalid values put into the windows registry
|
||||||
|
// void _cleanRegistry();
|
||||||
|
|
||||||
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
|
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
|
||||||
void *_arg;
|
void *_arg;
|
||||||
MAC _mac;
|
MAC _mac;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue