diff --git a/Makefile b/Makefile index f77767fb8..51a9914bb 100644 --- a/Makefile +++ b/Makefile @@ -33,4 +33,4 @@ drone: drone sign zerotier/ZeroTierOne --save clang-format: - find node osdep service tcp-proxy controller -iname '*.cpp' -o -iname '*.hpp' | xargs clang-format -i + find node osdep service tcp-proxy nonfree/controller -iname '*.cpp' -o -iname '*.hpp' | xargs clang-format -i diff --git a/make-bsd.mk b/make-bsd.mk index ce0b4dde1..f7d42531d 100644 --- a/make-bsd.mk +++ b/make-bsd.mk @@ -181,7 +181,7 @@ selftest: $(CORE_OBJS) $(ONE_OBJS) selftest.o zerotier-selftest: selftest clean: - rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS) + rm -rf *.a *.o node/*.o nonfree/controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS) debug: FORCE $(MAKE) -j ZT_DEBUG=1 diff --git a/make-linux.mk b/make-linux.mk index f0f63161f..e55cbba1f 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -418,7 +418,7 @@ manpages: FORCE doc: manpages clean: FORCE - rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one rustybits/target + rm -rf *.a *.so *.o node/*.o nonfree/controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one rustybits/target distclean: clean diff --git a/make-mac.mk b/make-mac.mk index b8a9d6db9..95fa02bd6 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -216,7 +216,7 @@ docker-release: _buildx docker buildx build --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x -t zerotier/zerotier:${RELEASE_DOCKER_TAG} -t zerotier/zerotier:latest --build-arg VERSION=${RELEASE_VERSION} -f Dockerfile.release . --push clean: - rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* rustybits/target/ + rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o nonfree/controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* rustybits/target/ distclean: clean diff --git a/make-netbsd.mk b/make-netbsd.mk index f2490038b..a7e19954b 100644 --- a/make-netbsd.mk +++ b/make-netbsd.mk @@ -53,7 +53,7 @@ selftest: $(OBJS) selftest.o # ./buildinstaller.sh clean: - rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* + rm -rf *.o node/*.o nonfree/controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* debug: FORCE make -j 4 ZT_DEBUG=1 diff --git a/controller/CV1.cpp b/nonfree/controller/CV1.cpp similarity index 100% rename from controller/CV1.cpp rename to nonfree/controller/CV1.cpp diff --git a/controller/CV1.hpp b/nonfree/controller/CV1.hpp similarity index 100% rename from controller/CV1.hpp rename to nonfree/controller/CV1.hpp diff --git a/controller/CV2.cpp b/nonfree/controller/CV2.cpp similarity index 100% rename from controller/CV2.cpp rename to nonfree/controller/CV2.cpp diff --git a/controller/CV2.hpp b/nonfree/controller/CV2.hpp similarity index 100% rename from controller/CV2.hpp rename to nonfree/controller/CV2.hpp diff --git a/controller/ConnectionPool.hpp b/nonfree/controller/ConnectionPool.hpp similarity index 100% rename from controller/ConnectionPool.hpp rename to nonfree/controller/ConnectionPool.hpp diff --git a/controller/CtlUtil.cpp b/nonfree/controller/CtlUtil.cpp similarity index 100% rename from controller/CtlUtil.cpp rename to nonfree/controller/CtlUtil.cpp diff --git a/controller/CtlUtil.hpp b/nonfree/controller/CtlUtil.hpp similarity index 100% rename from controller/CtlUtil.hpp rename to nonfree/controller/CtlUtil.hpp diff --git a/controller/DB.cpp b/nonfree/controller/DB.cpp similarity index 100% rename from controller/DB.cpp rename to nonfree/controller/DB.cpp diff --git a/controller/DB.hpp b/nonfree/controller/DB.hpp similarity index 100% rename from controller/DB.hpp rename to nonfree/controller/DB.hpp diff --git a/controller/DBMirrorSet.cpp b/nonfree/controller/DBMirrorSet.cpp similarity index 100% rename from controller/DBMirrorSet.cpp rename to nonfree/controller/DBMirrorSet.cpp diff --git a/controller/DBMirrorSet.hpp b/nonfree/controller/DBMirrorSet.hpp similarity index 100% rename from controller/DBMirrorSet.hpp rename to nonfree/controller/DBMirrorSet.hpp diff --git a/controller/EmbeddedNetworkController.cpp b/nonfree/controller/EmbeddedNetworkController.cpp similarity index 100% rename from controller/EmbeddedNetworkController.cpp rename to nonfree/controller/EmbeddedNetworkController.cpp diff --git a/controller/EmbeddedNetworkController.hpp b/nonfree/controller/EmbeddedNetworkController.hpp similarity index 100% rename from controller/EmbeddedNetworkController.hpp rename to nonfree/controller/EmbeddedNetworkController.hpp diff --git a/controller/FileDB.cpp b/nonfree/controller/FileDB.cpp similarity index 100% rename from controller/FileDB.cpp rename to nonfree/controller/FileDB.cpp diff --git a/controller/FileDB.hpp b/nonfree/controller/FileDB.hpp similarity index 100% rename from controller/FileDB.hpp rename to nonfree/controller/FileDB.hpp diff --git a/controller/LFDB.cpp b/nonfree/controller/LFDB.cpp similarity index 100% rename from controller/LFDB.cpp rename to nonfree/controller/LFDB.cpp diff --git a/controller/LFDB.hpp b/nonfree/controller/LFDB.hpp similarity index 100% rename from controller/LFDB.hpp rename to nonfree/controller/LFDB.hpp diff --git a/controller/PostgreSQL.cpp b/nonfree/controller/PostgreSQL.cpp similarity index 100% rename from controller/PostgreSQL.cpp rename to nonfree/controller/PostgreSQL.cpp diff --git a/controller/PostgreSQL.hpp b/nonfree/controller/PostgreSQL.hpp similarity index 100% rename from controller/PostgreSQL.hpp rename to nonfree/controller/PostgreSQL.hpp diff --git a/controller/README.md b/nonfree/controller/README.md similarity index 100% rename from controller/README.md rename to nonfree/controller/README.md diff --git a/controller/Redis.hpp b/nonfree/controller/Redis.hpp similarity index 100% rename from controller/Redis.hpp rename to nonfree/controller/Redis.hpp diff --git a/objects.mk b/objects.mk index bba4c6fa3..12e40b88d 100644 --- a/objects.mk +++ b/objects.mk @@ -34,15 +34,15 @@ CORE_OBJS=\ osdep/OSUtils.o ONE_OBJS=\ - controller/EmbeddedNetworkController.o \ - controller/DBMirrorSet.o \ - controller/DB.o \ - controller/FileDB.o \ - controller/LFDB.o \ - controller/CtlUtil.o \ - controller/PostgreSQL.o \ - controller/CV1.o \ - controller/CV2.o \ + nonfree/controller/EmbeddedNetworkController.o \ + nonfree/controller/DBMirrorSet.o \ + nonfree/controller/DB.o \ + nonfree/controller/FileDB.o \ + nonfree/controller/LFDB.o \ + nonfree/controller/CtlUtil.o \ + nonfree/controller/PostgreSQL.o \ + nonfree/controller/CV1.o \ + nonfree/controller/CV2.o \ osdep/EthernetTap.o \ osdep/ManagedRoute.o \ osdep/Http.o \ diff --git a/osdep/EthernetTap.cpp b/osdep/EthernetTap.cpp index 128ce0cfe..cb242ebfe 100644 --- a/osdep/EthernetTap.cpp +++ b/osdep/EthernetTap.cpp @@ -20,7 +20,7 @@ #ifdef ZT_SDK -#include "../controller/EmbeddedNetworkController.hpp" +#include "../nonfree/controller/EmbeddedNetworkController.hpp" #include "../include/VirtualTap.hpp" #include "../node/Node.hpp" diff --git a/service/OneService.cpp b/service/OneService.cpp index adf0409fe..2fbbcf3b0 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -106,9 +106,9 @@ extern "C" { using json = nlohmann::json; -#include "../controller/EmbeddedNetworkController.hpp" -#include "../controller/PostgreSQL.hpp" -#include "../controller/Redis.hpp" +#include "../nonfree/controller/EmbeddedNetworkController.hpp" +#include "../nonfree/controller/PostgreSQL.hpp" +#include "../nonfree/controller/Redis.hpp" #include "../osdep/EthernetTap.hpp" #ifdef __WINDOWS__ #include "../osdep/WindowsEthernetTap.hpp"