diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-02-12 09:30:12 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-02-12 09:30:12 -0800 |
| commit | f9b07c63db322b1ce0b95ef2844dccb7b9554eea (patch) | |
| tree | bb8aecad727970a85bb51261f3f7b4b8f3eab039 /service | |
| parent | 8828fc75209fb998bb1ba76b69a37969ec843527 (diff) | |
| parent | 978d8fcd4a3a890ecf5598d949b1c50a97de1cae (diff) | |
| download | infinitytier-f9b07c63db322b1ce0b95ef2844dccb7b9554eea.tar.gz infinitytier-f9b07c63db322b1ce0b95ef2844dccb7b9554eea.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 27b71141..4854d68d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1593,7 +1593,7 @@ public: if (syncRoutes) { char tapdev[64]; -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(ZT_SDK) OSUtils::ztsnprintf(tapdev,sizeof(tapdev),"%.16llx",(unsigned long long)n.tap->luid().Value); #else Utils::scopy(tapdev,sizeof(tapdev),n.tap->deviceName().c_str()); @@ -1998,7 +1998,7 @@ public: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE: ZT_FAST_MEMCPY(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig)); if (n.tap) { // sanity check -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(ZT_SDK) // wait for up to 5 seconds for the WindowsEthernetTap to actually be initialized // // without WindowsEthernetTap::isInitialized() returning true, the won't actually @@ -2019,7 +2019,7 @@ public: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY: if (n.tap) { // sanity check -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(ZT_SDK) std::string winInstanceId(n.tap->instanceId()); #endif *nuptr = (void *)0; |