diff options
| -rw-r--r-- | main.cpp | 12 | ||||
| -rw-r--r-- | make-freebsd.mk | 4 | ||||
| -rw-r--r-- | make-linux.mk | 4 | ||||
| -rw-r--r-- | make-mac.mk | 4 | ||||
| -rw-r--r-- | objects.mk | 2 | ||||
| -rw-r--r-- | selftest.cpp | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOneService.cpp | 6 |
7 files changed, 17 insertions, 17 deletions
@@ -75,33 +75,33 @@ #include "control/NodeControlClient.hpp" #include "control/NodeControlService.hpp" -#include "osnet/NativeSocketManager.hpp" +#include "osdep/NativeSocketManager.hpp" #ifdef ZT_ENABLE_NETCONF_MASTER #include "netconf/SqliteNetworkConfigMaster.hpp" #endif // ZT_ENABLE_NETCONF_MASTER #ifdef __WINDOWS__ -#include "osnet/WindowsEthernetTapFactory.hpp" +#include "osdep/WindowsEthernetTapFactory.hpp" #define ZTCreatePlatformEthernetTapFactory (new WindowsEthernetTapFactory(homeDir)) #endif // __WINDOWS__ #ifdef __LINUX__ -#include "osnet/LinuxEthernetTapFactory.hpp" +#include "osdep/LinuxEthernetTapFactory.hpp" #define ZTCreatePlatformEthernetTapFactory (new LinuxEthernetTapFactory()) #endif // __LINUX__ #ifdef __APPLE__ -#include "osnet/OSXEthernetTapFactory.hpp" +#include "osdep/OSXEthernetTapFactory.hpp" #define ZTCreatePlatformEthernetTapFactory (new OSXEthernetTapFactory(homeDir,"tap.kext")) #endif // __APPLE__ #ifndef ZTCreatePlatformEthernetTapFactory #ifdef __BSD__ -#include "osnet/BSDEthernetTapFactory.hpp" +#include "osdep/BSDEthernetTapFactory.hpp" #define ZTCreatePlatformEthernetTapFactory (new BSDEthernetTapFactory()) #else -#error Sorry, this platform has no osnet/ implementation yet. Fork me on GitHub and add one? +#error Sorry, this platform has no osdep/ implementation yet. Fork me on GitHub and add one? #endif // __BSD__ #endif // ZTCreatePlatformEthernetTapFactory diff --git a/make-freebsd.mk b/make-freebsd.mk index 0b65ca7a..0830ad36 100644 --- a/make-freebsd.mk +++ b/make-freebsd.mk @@ -6,7 +6,7 @@ DEFS= LIBS= include objects.mk -OBJS+=osnet/BSDEthernetTapFactory.o osnet/BSDEthernetTap.o +OBJS+=osdep/BSDEthernetTapFactory.o osdep/BSDEthernetTap.o TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o # Enable SSE-optimized Salsa20 on x86 and x86_64 machines @@ -84,7 +84,7 @@ testnet: $(TESTNET_OBJS) $(OBJS) testnet.o # ./buildinstaller.sh clean: - rm -rf $(OBJS) $(TESTNET_OBJS) node/*.o osnet/*.o control/*.o testnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* + rm -rf $(OBJS) $(TESTNET_OBJS) node/*.o osdep/*.o control/*.o testnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* debug: FORCE make -j 4 ZT_DEBUG=1 diff --git a/make-linux.mk b/make-linux.mk index 627b7737..e8ce1156 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -7,7 +7,7 @@ DEFS= LIBS= include objects.mk -OBJS+=osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o +OBJS+=osdep/LinuxEthernetTap.o osdep/LinuxEthernetTapFactory.o TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o # Enable SSE-optimized Salsa20 on x86 and x86_64 machines @@ -89,7 +89,7 @@ installer: one FORCE ./buildinstaller.sh clean: - rm -rf *.o netconf/*.o node/*.o osnet/*.o control/*.o testnet/*.o ext/lz4/*.o zerotier-* build-* ZeroTierOneInstaller-* *.deb *.rpm + rm -rf *.o netconf/*.o node/*.o osdep/*.o control/*.o testnet/*.o ext/lz4/*.o zerotier-* build-* ZeroTierOneInstaller-* *.deb *.rpm debug: FORCE make -j 4 ZT_DEBUG=1 diff --git a/make-mac.mk b/make-mac.mk index 730bda15..29ea4863 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -7,7 +7,7 @@ LIBS= ARCH_FLAGS=-arch i386 -arch x86_64 include objects.mk -OBJS+=osnet/OSXEthernetTap.o osnet/OSXEthernetTapFactory.o +OBJS+=osdep/OSXEthernetTap.o osdep/OSXEthernetTapFactory.o TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o # Disable codesign since open source users will not have ZeroTier's certs @@ -77,7 +77,7 @@ mac-ui: FORCE $(CODESIGN) -vvv "build-ZeroTierUI-release/ZeroTier One.app" clean: - rm -rf *.dSYM build-* *.o netconf/*.o control/*.o node/*.o testnet/*.o osnet/*.o ext/http-parser/*.o ext/lz4/*.o zerotier-* ZeroTierOneInstaller-* "ZeroTier One.zip" "ZeroTier One.dmg" + rm -rf *.dSYM build-* *.o netconf/*.o control/*.o node/*.o testnet/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o zerotier-* ZeroTierOneInstaller-* "ZeroTier One.zip" "ZeroTier One.dmg" # For our use -- builds official signed binary, packages in installer and download DMG official: FORCE @@ -1,7 +1,7 @@ OBJS=\ ext/lz4/lz4.o \ ext/http-parser/http_parser.o \ - osnet/NativeSocketManager.o \ + osdep/NativeSocketManager.o \ node/C25519.o \ node/CertificateOfMembership.o \ node/Defaults.o \ diff --git a/selftest.cpp b/selftest.cpp index aa209b7c..3e56f585 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -58,7 +58,7 @@ #include "node/Node.hpp" #ifdef ZT_TEST_PHY -#include "osnet/Phy.hpp" +#include "osdep/Phy.hpp" #endif #ifdef ZT_ENABLE_NETCONF_MASTER diff --git a/windows/ZeroTierOne/ZeroTierOneService.cpp b/windows/ZeroTierOne/ZeroTierOneService.cpp index 247e6427..abae3aff 100644 --- a/windows/ZeroTierOne/ZeroTierOneService.cpp +++ b/windows/ZeroTierOne/ZeroTierOneService.cpp @@ -40,9 +40,9 @@ #include "../../control/NodeControlClient.hpp" #include "../../control/NodeControlService.hpp" -#include "../../osnet/WindowsEthernetTapFactory.hpp" -#include "../../osnet/WindowsRoutingTable.hpp" -#include "../../osnet/NativeSocketManager.hpp" +#include "../../osdep/WindowsEthernetTapFactory.hpp" +#include "../../osdep/WindowsRoutingTable.hpp" +#include "../../osdep/NativeSocketManager.hpp" #pragma endregion // Includes |