diff --git a/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index ac30b5d..9ace405 100644 Binary files a/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/integrations/README.md b/integrations/README.md index e81fde4..9f2ba87 100644 --- a/integrations/README.md +++ b/integrations/README.md @@ -21,7 +21,7 @@ For more support on these integrations, or if you'd like help creating a new int ##### OSX - [Embedding within an app](../docs/osx_zt_sdk.md) `make osx_app_framework` - - [Dynamic-linking into an app/service at runtime](../docs/osx_zt_sdk.md) `make ` + - [Dynamic-linking into an app/service at runtime](../docs/osx_zt_sdk.md) `make osx_shared_lib` - [Unity3D plugin](../docs/unity3d_osx_zt_sdk.md) `make osx_unity3d_bundle` *** diff --git a/make-liblwip.mk b/make-liblwip.mk index 83c28aa..a9d06d9 100644 --- a/make-liblwip.mk +++ b/make-liblwip.mk @@ -101,7 +101,8 @@ depend dep: .depend include .depend $(LWIPLIB): $(LWIPOBJS) - $(CC) -g -nostartfiles -shared -o $@ $^ + mkdir -p build/lwip + $(CC) -g -nostartfiles -shared -o build/lwip/$@ $^ .depend: $(LWIPFILES) $(CCDEP) $(CFLAGS) -MM $^ > .depend || rm -f .depend diff --git a/make-mac.mk b/make-mac.mk index 42b9e54..c8c8a30 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -11,7 +11,6 @@ LIBS= ARCH_FLAGS=-arch x86_64 include objects.mk -OBJS+=osdep/OSXEthernetTap.o # Disable codesign since open source users will not have ZeroTier's certs CODESIGN=echo @@ -19,9 +18,6 @@ PRODUCTSIGN=echo CODESIGN_APP_CERT= CODESIGN_INSTALLER_CERT= -# Build with libminiupnpc by default for Mac -ZT_USE_MINIUPNPC?=1 - # For internal use only -- signs everything with ZeroTier's developer cert ifeq ($(ZT_OFFICIAL_RELEASE),1) DEFS+=-DZT_OFFICIAL_RELEASE -DZT_AUTO_UPDATE @@ -32,27 +28,6 @@ ifeq ($(ZT_OFFICIAL_RELEASE),1) CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier Networks LLC (8ZD9JUCZ4V)" endif -# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support -ifeq ($(ZT_ENABLE_CLUSTER),1) - DEFS+=-DZT_ENABLE_CLUSTER -endif - -ifeq ($(ZT_AUTO_UPDATE),1) - DEFS+=-DZT_AUTO_UPDATE -endif - -ifeq ($(ZT_USE_MINIUPNPC),1) - DEFS+=-DMACOSX -DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -D_DARWIN_C_SOURCE -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"Darwin/15.0.0\" -DMINIUPNPC_VERSION_STRING=\"1.9\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR - OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o -endif - -# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller -ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1) - DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER - LIBS+=-L/usr/local/lib -lsqlite3 - OBJS+=controller/SqliteNetworkController.o -endif - # Debug mode -- dump trace output, build binary with -g ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE @@ -60,7 +35,7 @@ ifeq ($(ZT_DEBUG),1) STRIP=echo # The following line enables optimization for the crypto code, since # C25519 in particular is almost UNUSABLE in heavy testing without it. -ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) +#ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) else CFLAGS?=-Ofast -fstack-protector CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -pthread -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) @@ -98,23 +73,25 @@ android_jni_library: # Build library for Android Unity integrations -sdk: $(OBJS) +osx_shared_lib: $(OBJS) rm -f *.o # Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap - $(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SDK -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-netcon-service $(OBJS) service/OneService.cpp netcon/NetconEthernetTap.cpp netcon/NetconProxy.cpp one.cpp -x c netcon/NetconRPC.c $(LDLIBS) -ldl + $(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SDK -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -Izerotierone/osdep -Izerotierone/node -Isrc -o build/zerotier-sdk-service $(OBJS) zerotierone/service/OneService.cpp src/SDK_EthernetTap.cpp src/SDK_Proxy.cpp zerotierone/one.cpp -x c src/SDK_RPC.c $(LDLIBS) -ldl # Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work - cd netcon ; make -f make-liblwip.mk + make -f make-liblwip.mk # Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility #cd netcon ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztapi.so zt_api.c common.c RPC.c -ldl - cd netcon ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztintercept.so NetconSockets.c Intercept.c NetconDebug.c NetconRPC.c -ldl + cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl #cd netcon ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztkq.so zt_api.c kq.c Intercept.c common.c RPC.c -ldl - cp netcon/libztintercept.so libztintercept.so - #cp netcon/libztapi.so libztapi.so - #cp netcon/libztkq.so libztkq.so - ln -sf zerotier-netcon-service zerotier-cli - ln -sf zerotier-netcon-service zerotier-idtool + mkdir -p build/osx_shared_lib + cp src/libztintercept.so build/osx_shared_lib/libztintercept.so + + ln -sf zerotier-sdk-service zerotier-cli + ln -sf zerotier-sdk-service zerotier-idtool clean: + rm -rf zerotier-cli zerotier-idtool + rm -rf build/* find . -type f -name '*.o' -delete find . -type f -name '*.so' -delete diff --git a/objects.mk b/objects.mk index d11e281..2c02cb1 100644 --- a/objects.mk +++ b/objects.mk @@ -1,32 +1,32 @@ OBJS=\ - ext/lz4/lz4.o \ - ext/json-parser/json.o \ - ext/http-parser/http_parser.o \ - node/C25519.o \ - node/CertificateOfMembership.o \ - node/Cluster.o \ - node/DeferredPackets.o \ - node/Dictionary.o \ - node/Identity.o \ - node/IncomingPacket.o \ - node/InetAddress.o \ - node/Multicaster.o \ - node/Network.o \ - node/NetworkConfig.o \ - node/Node.o \ - node/OutboundMulticast.o \ - node/Packet.o \ - node/Path.o \ - node/Peer.o \ - node/Poly1305.o \ - node/Salsa20.o \ - node/SelfAwareness.o \ - node/SHA512.o \ - node/Switch.o \ - node/Topology.o \ - node/Utils.o \ - osdep/BackgroundResolver.o \ - osdep/Http.o \ - osdep/OSUtils.o \ - service/ClusterGeoIpService.o \ - service/ControlPlane.o + zerotierone/ext/lz4/lz4.o \ + zerotierone/ext/json-parser/json.o \ + zerotierone/ext/http-parser/http_parser.o \ + zerotierone/node/C25519.o \ + zerotierone/node/CertificateOfMembership.o \ + zerotierone/node/Cluster.o \ + zerotierone/node/DeferredPackets.o \ + zerotierone/node/Dictionary.o \ + zerotierone/node/Identity.o \ + zerotierone/node/IncomingPacket.o \ + zerotierone/node/InetAddress.o \ + zerotierone/node/Multicaster.o \ + zerotierone/node/Network.o \ + zerotierone/node/NetworkConfig.o \ + zerotierone/node/Node.o \ + zerotierone/node/OutboundMulticast.o \ + zerotierone/node/Packet.o \ + zerotierone/node/Path.o \ + zerotierone/node/Peer.o \ + zerotierone/node/Poly1305.o \ + zerotierone/node/Salsa20.o \ + zerotierone/node/SelfAwareness.o \ + zerotierone/node/SHA512.o \ + zerotierone/node/Switch.o \ + zerotierone/node/Topology.o \ + zerotierone/node/Utils.o \ + zerotierone/osdep/BackgroundResolver.o \ + zerotierone/osdep/Http.o \ + zerotierone/osdep/OSUtils.o \ + zerotierone/service/ClusterGeoIpService.o \ + zerotierone/service/ControlPlane.o diff --git a/src/SDK_EthernetTap.cpp b/src/SDK_EthernetTap.cpp index e77d31a..68e0cf7 100644 --- a/src/SDK_EthernetTap.cpp +++ b/src/SDK_EthernetTap.cpp @@ -37,9 +37,9 @@ #include "SDK_EthernetTap.hpp" -#include "node/Utils.hpp" -#include "osdep/OSUtils.hpp" -#include "osdep/Phy.hpp" +#include "Utils.hpp" +#include "OSUtils.hpp" +#include "Phy.hpp" #include "SDK_LWIPStack.hpp" @@ -60,7 +60,7 @@ #include "SDK_Debug.c" #include "SDK_ServiceSetup.hpp" -#if !defined(__IOS__) && !defined(__ANDROID__) && !defined(__UNITY_3D__) && !defined(__APPLE__) +#if !defined(__IOS__) && !defined(__ANDROID__) && !defined(__UNITY_3D__) //&& !defined(__APPLE__) const ip_addr_t ip_addr_any = { IPADDR_ANY }; #endif diff --git a/src/SDK_EthernetTap.hpp b/src/SDK_EthernetTap.hpp index e1ae12c..b0f1526 100644 --- a/src/SDK_EthernetTap.hpp +++ b/src/SDK_EthernetTap.hpp @@ -37,12 +37,12 @@ #include #include -#include "node/Constants.hpp" -#include "node/MulticastGroup.hpp" -#include "node/Mutex.hpp" -#include "node/InetAddress.hpp" -#include "osdep/Thread.hpp" -#include "osdep/Phy.hpp" +#include "Constants.hpp" +#include "MulticastGroup.hpp" +#include "Mutex.hpp" +#include "InetAddress.hpp" +#include "Thread.hpp" +#include "Phy.hpp" #include "netif/etharp.h" diff --git a/src/SDK_Proxy.cpp b/src/SDK_Proxy.cpp index c0a8ccb..f2202b0 100644 --- a/src/SDK_Proxy.cpp +++ b/src/SDK_Proxy.cpp @@ -27,8 +27,8 @@ #include "SDK_Debug.h" #include "SDK_EthernetTap.hpp" -#include "osdep/Phy.hpp" -#include "node/Utils.hpp" +#include "Phy.hpp" +#include "Utils.hpp" #include #include diff --git a/src/SDK_Sockets.c b/src/SDK_Sockets.c index 4b50f9c..95c8144 100644 --- a/src/SDK_Sockets.c +++ b/src/SDK_Sockets.c @@ -70,7 +70,7 @@ #include "SDK_Signatures.h" #include "SDK_Debug.h" #include "SDK_RPC.h" -#include "node/Constants.hpp" // For Tap's MTU +#include "Constants.hpp" // For Tap's MTU void print_addr(struct sockaddr *addr); void dwr(int level, const char *fmt, ... );