diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-22 15:34:49 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-22 15:34:49 -0800 |
| commit | fb00f0f94ce11dbd9d5c81fc15cf6e408d01c299 (patch) | |
| tree | 75f19cd3c838c1d0819b545bd39540e50da43a41 /service/OneService.cpp | |
| parent | b679ebde3b05efeb3346e20dfb216cf3b3bc2b1d (diff) | |
| parent | f3ca08b0f1dc428de49687f9d0889ecf8ff436c5 (diff) | |
| download | infinitytier-fb00f0f94ce11dbd9d5c81fc15cf6e408d01c299.tar.gz infinitytier-fb00f0f94ce11dbd9d5c81fc15cf6e408d01c299.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index dc3e0ed1..81950e26 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1087,18 +1087,17 @@ public: fprintf(stderr,"ERROR: unable to remove ip address %s" ZT_EOL_S, ip->toString().c_str()); } } - for(std::vector<InetAddress>::iterator ip(newManagedIps.begin());ip!=newManagedIps.end();++ip) { #ifdef __SYNOLOGY__ - if (!n.tap->addIp(*ip)) - fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString().c_str()); + if (!n.tap->addIpSyn(newManagedIps)) + fprintf(stderr,"ERROR: unable to add ip addresses to ifcfg" ZT_EOL_S); #else + for(std::vector<InetAddress>::iterator ip(newManagedIps.begin());ip!=newManagedIps.end();++ip) { if (std::find(n.managedIps.begin(),n.managedIps.end(),*ip) == n.managedIps.end()) { - if (!n.tap->addIp(*ip)) fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString().c_str()); - } -#endif + } } +#endif n.managedIps.swap(newManagedIps); } |