diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-02-09 06:35:09 +0000 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-02-09 06:35:09 +0000 |
| commit | 978d8fcd4a3a890ecf5598d949b1c50a97de1cae (patch) | |
| tree | 069e83af1a493d3133bcfad54d6db6d4add81e50 /service | |
| parent | 51aadcf9017c9c4b1c86302fa3bb65cc67dcc05b (diff) | |
| parent | db952a050a727717a5cd836c79a50d7504a9b9ef (diff) | |
| download | infinitytier-978d8fcd4a3a890ecf5598d949b1c50a97de1cae.tar.gz infinitytier-978d8fcd4a3a890ecf5598d949b1c50a97de1cae.zip | |
Merge branch 'dev' of http://10.187.63.16/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; |