github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Path fixes in osnet/ stuff

Browse source
This commit is contained in:
Adam Ierymenko 2014-07-31 14:31:32 -07:00
commit 98d426e1d5
10 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
osnet/OSXEthernetTap.cpp
View file

@ -259,9 +259,8 @@ static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
#include <set>
#include <algorithm>
#include "../Constants.hpp"
#include "../Utils.hpp"
#include "../Mutex.hpp"
#include "../node/Constants.hpp"
#include "../node/Utils.hpp"
#include "OSXEthernetTap.hpp"
// ff:ff:ff:ff:ff:ff with no ADI
@ -314,7 +313,6 @@ namespace ZeroTier {
static Mutex __tapCreateLock;
OSXEthernetTap::OSXEthernetTap(
const RuntimeEnvironment *renv,
const char *tryToGetDevice,
const MAC &mac,
unsigned int mtu,
@ -447,11 +445,8 @@ bool OSXEthernetTap::addIP(const InetAddress &ip)
// Remove and reconfigure if address is the same but netmask is different
for(std::set<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
if (___removeIp(_dev,*i)) {
if (___removeIp(_dev,*i))
break;
} else {
LOG("WARNING: failed to remove old IP/netmask %s to replace with %s",i->toString().c_str(),ip.toString().c_str());
}
}
}