Merge branch 'winroute' into dev

osdep/WindowsEthernetTap.cpp

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

osdep/WindowsEthernetTap.hpp

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

service/OneService.cpp

@@ -1666,6 +1666,16 @@ public:
 			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
 				memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig));
 				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);
 				} else {
 					_nets.erase(nwid);