2017-01-12 21:18:11 +00:00
|
|
|
CC=clang
|
|
|
|
|
CXX=clang++
|
2015-07-28 21:48:26 +00:00
|
|
|
INCLUDES=
|
2015-10-27 16:41:12 +00:00
|
|
|
DEFS=
|
2013-12-13 21:49:46 +00:00
|
|
|
LIBS=
|
2017-01-12 21:18:11 +00:00
|
|
|
ARCH_FLAGS=
|
2014-01-07 21:06:34 +00:00
|
|
|
CODESIGN=echo
|
2015-06-03 02:17:39 +00:00
|
|
|
PRODUCTSIGN=echo
|
|
|
|
|
CODESIGN_APP_CERT=
|
|
|
|
|
CODESIGN_INSTALLER_CERT=
|
2014-01-07 21:06:34 +00:00
|
|
|
|
2017-01-13 21:09:42 +00:00
|
|
|
ZT_BUILD_PLATFORM=3
|
|
|
|
|
ZT_BUILD_ARCHITECTURE=2
|
|
|
|
|
ZT_VERSION_MAJOR=$(shell cat version.h | grep -F VERSION_MAJOR | cut -d ' ' -f 3)
|
|
|
|
|
ZT_VERSION_MINOR=$(shell cat version.h | grep -F VERSION_MINOR | cut -d ' ' -f 3)
|
|
|
|
|
ZT_VERSION_REV=$(shell cat version.h | grep -F VERSION_REVISION | cut -d ' ' -f 3)
|
2017-01-18 17:16:23 +00:00
|
|
|
ZT_VERSION_BUILD=$(shell cat version.h | grep -F VERSION_BUILD | cut -d ' ' -f 3)
|
2017-01-13 21:09:42 +00:00
|
|
|
|
|
|
|
|
DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUILD_ARCHITECTURE)
|
2015-11-17 02:28:55 +00:00
|
|
|
|
2017-01-12 21:18:11 +00:00
|
|
|
include objects.mk
|
2017-01-19 23:16:04 +00:00
|
|
|
OBJS+=osdep/OSXEthernetTap.o ext/http-parser/http_parser.o
|
2017-01-12 21:18:11 +00:00
|
|
|
|
|
|
|
|
# Official releases are signed with our Apple cert and apply software updates by default
|
2014-01-07 21:06:34 +00:00
|
|
|
ifeq ($(ZT_OFFICIAL_RELEASE),1)
|
2017-01-12 21:51:06 +00:00
|
|
|
DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"apply\""
|
2015-07-28 21:32:02 +00:00
|
|
|
ZT_USE_MINIUPNPC=1
|
2014-01-07 21:06:34 +00:00
|
|
|
CODESIGN=codesign
|
2015-06-03 02:17:39 +00:00
|
|
|
PRODUCTSIGN=productsign
|
2016-12-23 23:11:44 +00:00
|
|
|
CODESIGN_APP_CERT="Developer ID Application: ZeroTier, Inc (8ZD9JUCZ4V)"
|
|
|
|
|
CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier, Inc (8ZD9JUCZ4V)"
|
2017-01-12 21:18:11 +00:00
|
|
|
else
|
2017-01-12 22:35:52 +00:00
|
|
|
DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"download\""
|
2014-01-07 21:06:34 +00:00
|
|
|
endif
|
2014-10-24 15:48:44 +00:00
|
|
|
|
2015-11-17 00:22:41 +00:00
|
|
|
ifeq ($(ZT_ENABLE_CLUSTER),1)
|
2015-11-17 02:28:55 +00:00
|
|
|
DEFS+=-DZT_ENABLE_CLUSTER
|
2015-11-17 00:22:41 +00:00
|
|
|
endif
|
|
|
|
|
|
2017-04-18 15:45:37 +00:00
|
|
|
# Use fast ASM Salsa20/12 for x64 processors
|
|
|
|
|
DEFS+=-DZT_USE_X64_ASM_SALSA2012
|
|
|
|
|
OBJS+=ext/x64-salsa2012-asm/salsa2012.o
|
|
|
|
|
|
2017-01-12 21:18:11 +00:00
|
|
|
# Build miniupnpc and nat-pmp as included libraries -- extra defs are required for these sources
|
|
|
|
|
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=\"2.0\" -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
|
2015-05-21 02:38:49 +00:00
|
|
|
|
2015-05-20 23:35:33 +00:00
|
|
|
# Debug mode -- dump trace output, build binary with -g
|
2014-08-19 17:09:21 +00:00
|
|
|
ifeq ($(ZT_DEBUG),1)
|
2015-07-28 21:32:02 +00:00
|
|
|
DEFS+=-DZT_TRACE
|
2015-07-03 18:18:19 +00:00
|
|
|
CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
|
2014-08-19 17:09:21 +00:00
|
|
|
STRIP=echo
|
2014-10-12 18:42:49 +00:00
|
|
|
# The following line enables optimization for the crypto code, since
|
|
|
|
|
# C25519 in particular is almost UNUSABLE in heavy testing without it.
|
2017-01-19 23:16:04 +00:00
|
|
|
node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
|
2014-08-19 17:09:21 +00:00
|
|
|
else
|
2016-06-15 22:46:57 +00:00
|
|
|
CFLAGS?=-Ofast -fstack-protector-strong
|
2015-09-30 21:48:07 +00:00
|
|
|
CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -pthread -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
|
2014-08-19 17:09:21 +00:00
|
|
|
STRIP=strip
|
|
|
|
|
endif
|
2013-07-04 20:56:19 +00:00
|
|
|
|
2017-01-12 21:18:11 +00:00
|
|
|
CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++
|
2017-01-11 22:37:31 +00:00
|
|
|
|
2017-04-20 17:08:46 +00:00
|
|
|
all: one macui
|
|
|
|
|
|
2017-04-18 15:45:37 +00:00
|
|
|
ext/x64-salsa2012-asm/salsa2012.o:
|
|
|
|
|
$(CC) $(CFLAGS) -c ext/x64-salsa2012-asm/salsa2012.s -o ext/x64-salsa2012-asm/salsa2012.o
|
|
|
|
|
|
2015-12-04 21:19:31 +00:00
|
|
|
one: $(OBJS) service/OneService.o one.o
|
|
|
|
|
$(CXX) $(CXXFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
|
2013-07-04 20:56:19 +00:00
|
|
|
$(STRIP) zerotier-one
|
2013-12-04 22:44:28 +00:00
|
|
|
ln -sf zerotier-one zerotier-idtool
|
2015-04-16 21:55:36 +00:00
|
|
|
ln -sf zerotier-one zerotier-cli
|
2015-06-03 02:17:39 +00:00
|
|
|
$(CODESIGN) -f -s $(CODESIGN_APP_CERT) zerotier-one
|
2013-07-04 20:56:19 +00:00
|
|
|
|
2016-12-23 23:11:44 +00:00
|
|
|
macui: FORCE
|
|
|
|
|
cd macui && xcodebuild -target "ZeroTier One" -configuration Release
|
|
|
|
|
$(CODESIGN) -f -s $(CODESIGN_APP_CERT) "macui/build/Release/ZeroTier One.app"
|
|
|
|
|
|
2017-01-13 21:09:42 +00:00
|
|
|
#cli: FORCE
|
|
|
|
|
# $(CXX) $(CXXFLAGS) -o zerotier cli/zerotier.cpp osdep/OSUtils.cpp node/InetAddress.cpp node/Utils.cpp node/Salsa20.cpp node/Identity.cpp node/SHA512.cpp node/C25519.cpp -lcurl
|
|
|
|
|
# $(STRIP) zerotier
|
2016-06-23 00:54:07 +00:00
|
|
|
|
2014-11-20 21:20:16 +00:00
|
|
|
selftest: $(OBJS) selftest.o
|
2014-08-19 17:09:21 +00:00
|
|
|
$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
|
2013-07-04 20:56:19 +00:00
|
|
|
$(STRIP) zerotier-selftest
|
|
|
|
|
|
2015-05-20 23:35:33 +00:00
|
|
|
# Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html
|
|
|
|
|
mac-dist-pkg: FORCE
|
2015-06-02 18:59:05 +00:00
|
|
|
packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj"
|
2015-06-03 02:17:39 +00:00
|
|
|
rm -f "ZeroTier One Signed.pkg"
|
|
|
|
|
$(PRODUCTSIGN) --sign $(CODESIGN_INSTALLER_CERT) "ZeroTier One.pkg" "ZeroTier One Signed.pkg"
|
|
|
|
|
if [ -f "ZeroTier One Signed.pkg" ]; then mv -f "ZeroTier One Signed.pkg" "ZeroTier One.pkg"; fi
|
2017-01-13 21:09:42 +00:00
|
|
|
rm -f zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_*
|
2017-03-07 19:58:17 +00:00
|
|
|
cat ext/installfiles/mac-update/updater.tmpl.sh "ZeroTier One.pkg" >zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_$(ZT_VERSION_MAJOR).$(ZT_VERSION_MINOR).$(ZT_VERSION_REV)_$(ZT_VERSION_BUILD).exe
|
2013-12-17 06:30:37 +00:00
|
|
|
|
2016-06-23 00:54:07 +00:00
|
|
|
# For ZeroTier, Inc. to build official signed packages
|
2015-05-20 23:35:33 +00:00
|
|
|
official: FORCE
|
2016-06-23 00:54:07 +00:00
|
|
|
make clean
|
2017-01-13 21:09:42 +00:00
|
|
|
make ZT_OFFICIAL_RELEASE=1 -j 4 one
|
|
|
|
|
make ZT_OFFICIAL_RELEASE=1 macui
|
VERSION 1.1.6: route management, default route override, new IPv6 mode for Docker, and more!
Version 1.1.6 contains several significant improvements for use in complex network
environments along with some minor bug fixes and improvements to path stability and
dead path detection.
ROUTE MANAGEMENT AND FULL TUNNEL SUPPORT
1.1.6 is the first version of ZeroTier One to permit "full tunnel" (default route
override) operation on Linux, Mac, and Windows. This allows all Internet traffic
to be tunneled through ZeroTier while allowing ZeroTier peer-to-peer traffic to
continue to use the physical interface. 1.1.6 also brings route management support
and permissions settings for local networks to control whether networks are allowed
to modify the routing table or override default routing.
This is currently considered a beta/experimental feature and must be enabled via
the command line interface.
Route management and default route override requires support at the network controller.
When my.zerotier.com is updated and ready, we will post more information and testing
instructions at: https://www.zerotier.com/community
HIGHLY SCALABLE CONTAINER NETWORKING
1.1.6 also brings a new multicast-free (NDP emulated) IPv6 private addressing scheme
called "6plane." 6plane provides each host with a private IPv6 /80 and routes *all*
IPv6 traffic for this subnet to the host via transparent NDP emulation. This /80 can
then be assigned to Docker or other container/VM managers to assign a network-wide
IPv6 /128 to every container. Since NDP is emulated and multicast isn't needed, this
system can scale to millions of containers or more on a single backplane network with
a high degree of efficiency and reliability.
6plane also requires controller support. Look for it at my.zerotier.com once we have
upgraded our core infrastructure and web UIs.
(All hosts must be running 1.1.6 for 6plane to work properly. Other IPv6 addresses
or addressing modes are not affected and normal IPv6 NDP will continue to work
alongside 6plane in the same network.)
OTHER CHANGES
* Upgraded bundled miniupnpc, libnatpmp, and http-parser.
* New Debian and RPM packaging that is closer to compliance with distribution
guidelines, and a new Dockerized Linux package build system in linux-build-farm/
that can build every package on actual images of the correct distribution.
* Improvements to dead path detection.
* IPv6 now uses keepalive because a significant number of stateful IPv6 edge
routers have very short timeouts (30 seconds or less!).
* Significant performance improvements to network controllers under high load.
* Enable -fstack-protector-strong for better stack canary (security) support
in binaries. Note that this may require newer gcc/g++ or clang.
COMING SOON
The next version of ZeroTier One should have a new Mac UI. It's a system tray app
that looks and behaves a lot like the Mac WiFi pulldown menu. We'll also be adding
GUI support for default route and route management options and other new features.
Shortly after that we plan on adding full OpenFlow-like SDN rules engine support
to the ZeroTier core, making our planetary Ethernet switch a fully manageable smart
switch and enabling sophisticated security and flow rule management.
2016-06-29 22:53:46 +00:00
|
|
|
make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg
|
2015-05-20 23:35:33 +00:00
|
|
|
|
2013-07-04 20:56:19 +00:00
|
|
|
clean:
|
2017-01-19 23:16:04 +00:00
|
|
|
rm -rf *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier mkworld doc/node_modules macui/build zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_*
|
2013-07-04 20:56:19 +00:00
|
|
|
|
2016-06-09 00:45:25 +00:00
|
|
|
distclean: clean
|
|
|
|
|
|
2017-01-13 21:09:42 +00:00
|
|
|
realclean: clean
|
|
|
|
|
|
2014-08-19 17:09:21 +00:00
|
|
|
# For those building from source -- installs signed binary tap driver in system ZT home
|
|
|
|
|
install-mac-tap: FORCE
|
|
|
|
|
mkdir -p /Library/Application\ Support/ZeroTier/One
|
|
|
|
|
rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
|
|
|
|
|
cp -R ext/bin/tap-mac/tap.kext /Library/Application\ Support/ZeroTier/One
|
|
|
|
|
chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
|
|
|
|
|
|
2013-07-04 20:56:19 +00:00
|
|
|
FORCE:
|
