Move controller/ into nonfree/controller and update references

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

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

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
 

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
 

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

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 \

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"
 

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"