From 98d426e1d5a2ef83cce7cf2d5b394adde886e58d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 31 Jul 2014 14:31:32 -0700 Subject: [PATCH] Path fixes in osnet/ stuff --- make-mac.mk | 1 + node/EthernetTapFactory.hpp | 5 ----- osnet/LinuxEthernetTap.cpp | 6 +++--- osnet/LinuxEthernetTap.hpp | 5 ++--- osnet/LinuxEthernetTapFactory.cpp | 9 --------- osnet/LinuxEthernetTapFactory.hpp | 5 ++--- osnet/OSXEthernetTap.cpp | 11 +++-------- osnet/OSXEthernetTap.hpp | 5 ++--- osnet/OSXEthernetTapFactory.cpp | 9 --------- osnet/OSXEthernetTapFactory.hpp | 5 ++--- 10 files changed, 15 insertions(+), 46 deletions(-) diff --git a/make-mac.mk b/make-mac.mk index 784f4c6e6..e6cca83e9 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -43,6 +43,7 @@ CXXFLAGS=$(CFLAGS) -fno-rtti include objects.mk OBJS+=osnet/BSDRoutingTable.o +#osnet/OSXEthernetTap.o osnet/OSXEthernetTapFactory.o all: one diff --git a/node/EthernetTapFactory.hpp b/node/EthernetTapFactory.hpp index 17d697f51..d0f5e9b34 100644 --- a/node/EthernetTapFactory.hpp +++ b/node/EthernetTapFactory.hpp @@ -95,11 +95,6 @@ public: * @param destroyPersistentDevices If true, destroy persistent device (on platforms where applicable) */ virtual void close(EthernetTap *tap,bool destroyPersistentDevices) = 0; - - /** - * @return All currently open tap device names - */ - virtual std::vector allTapDeviceNames() const = 0; }; } // namespace ZeroTier diff --git a/osnet/LinuxEthernetTap.cpp b/osnet/LinuxEthernetTap.cpp index d77d56c0d..a04fd4b74 100644 --- a/osnet/LinuxEthernetTap.cpp +++ b/osnet/LinuxEthernetTap.cpp @@ -52,9 +52,9 @@ #include #include -#include "../Constants.hpp" -#include "../Utils.hpp" -#include "../Mutex.hpp" +#include "../node/Constants.hpp" +#include "../node/Utils.hpp" +#include "../node/Mutex.hpp" #include "LinuxEthernetTap.hpp" // ff:ff:ff:ff:ff:ff with no ADI diff --git a/osnet/LinuxEthernetTap.hpp b/osnet/LinuxEthernetTap.hpp index f74fdf867..0dfb504b8 100644 --- a/osnet/LinuxEthernetTap.hpp +++ b/osnet/LinuxEthernetTap.hpp @@ -33,9 +33,8 @@ #include -#include "../EthernetTap.hpp" -#include "../Mutex.hpp" -#include "../Thread.hpp" +#include "../node/EthernetTap.hpp" +#include "../node/Thread.hpp" namespace ZeroTier { diff --git a/osnet/LinuxEthernetTapFactory.cpp b/osnet/LinuxEthernetTapFactory.cpp index 01633abbc..59327fffe 100644 --- a/osnet/LinuxEthernetTapFactory.cpp +++ b/osnet/LinuxEthernetTapFactory.cpp @@ -71,13 +71,4 @@ void LinuxEthernetTapFactory::close(EthernetTap *tap,bool destroyPersistentDevic delete tap; } -std::vector allTapDeviceNames() const -{ - std::vector dn; - Mutex::Lock _l(_devices_m); - for(std::vector::const_iterator d(_devices.begin());d!=_devices.end();++d) - dn.push_back(d->deviceName()); - return dn; -} - } // namespace ZeroTier diff --git a/osnet/LinuxEthernetTapFactory.hpp b/osnet/LinuxEthernetTapFactory.hpp index 695fe52ec..6cbf4ffca 100644 --- a/osnet/LinuxEthernetTapFactory.hpp +++ b/osnet/LinuxEthernetTapFactory.hpp @@ -31,8 +31,8 @@ #include #include -#include "../EthernetTapFactory.hpp" -#include "../Mutex.hpp" +#include "../node/EthernetTapFactory.hpp" +#include "../node/Mutex.hpp" namespace ZeroTier { @@ -52,7 +52,6 @@ public: void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void *arg); virtual void close(EthernetTap *tap,bool destroyPersistentDevices); - virtual std::vector allTapDeviceNames() const; private: std::vector _devices; diff --git a/osnet/OSXEthernetTap.cpp b/osnet/OSXEthernetTap.cpp index 164b24a23..2fd2f285b 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()); - } } } diff --git a/osnet/OSXEthernetTap.hpp b/osnet/OSXEthernetTap.hpp index 680fef150..94c65b3ad 100644 --- a/osnet/OSXEthernetTap.hpp +++ b/osnet/OSXEthernetTap.hpp @@ -33,9 +33,8 @@ #include -#include "../EthernetTap.hpp" -#include "../Mutex.hpp" -#include "../Thread.hpp" +#include "../node/EthernetTap.hpp" +#include "../node/Thread.hpp" namespace ZeroTier { diff --git a/osnet/OSXEthernetTapFactory.cpp b/osnet/OSXEthernetTapFactory.cpp index 223cec7f2..ec9543d8a 100644 --- a/osnet/OSXEthernetTapFactory.cpp +++ b/osnet/OSXEthernetTapFactory.cpp @@ -114,13 +114,4 @@ void OSXEthernetTapFactory::close(EthernetTap *tap,bool destroyPersistentDevices delete tap; } -std::vector allTapDeviceNames() const -{ - std::vector dn; - Mutex::Lock _l(_devices_m); - for(std::vector::const_iterator d(_devices.begin());d!=_devices.end();++d) - dn.push_back(d->deviceName()); - return dn; -} - } // namespace ZeroTier diff --git a/osnet/OSXEthernetTapFactory.hpp b/osnet/OSXEthernetTapFactory.hpp index 2368d982a..45d6eab5f 100644 --- a/osnet/OSXEthernetTapFactory.hpp +++ b/osnet/OSXEthernetTapFactory.hpp @@ -31,8 +31,8 @@ #include #include -#include "../EthernetTapFactory.hpp" -#include "../Mutex.hpp" +#include "../node/EthernetTapFactory.hpp" +#include "../node/Mutex.hpp" namespace ZeroTier { @@ -63,7 +63,6 @@ public: void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void *arg); virtual void close(EthernetTap *tap,bool destroyPersistentDevices); - virtual std::vector allTapDeviceNames() const; private: std::vector _devices;