From 98d426e1d5a2ef83cce7cf2d5b394adde886e58d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 31 Jul 2014 14:31:32 -0700 Subject: Path fixes in osnet/ stuff --- osnet/OSXEthernetTap.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'osnet/OSXEthernetTap.cpp') diff --git a/osnet/OSXEthernetTap.cpp b/osnet/OSXEthernetTap.cpp index 164b24a2..2fd2f285 100644 --- a/osnet/OSXEthernetTap.cpp +++ b/osnet/OSXEthernetTap.cpp @@ -259,9 +259,8 @@ static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp) #include #include -#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::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()); - } } } -- cgit v1.2.3