updated included zerotierone src
This commit is contained in:
Joseph Henry
@@ -9,16 +9,18 @@
|
||||
#
|
||||
# Targets
|
||||
# one: zerotier-one and symlinks (cli and idtool)
|
||||
# manpages: builds manpages, requires 'ronn' or nodeJS (will use either)
|
||||
# all: builds 'one' and 'manpages'
|
||||
# doc: builds manpages, requires rst2man somewhere in PATH
|
||||
# all: builds 'one'
|
||||
# selftest: zerotier-selftest
|
||||
# debug: builds 'one' and 'selftest' with tracing and debug flags
|
||||
# installer: builds installers and packages (RPM/DEB/etc.) if possible
|
||||
# official: cleans and then builds 'one', 'installer', and 'doc'
|
||||
# clean: removes all built files, objects, other trash
|
||||
# distclean: removes a few other things that might be present
|
||||
# debian: build DEB packages; deb dev tools must be present
|
||||
# redhat: build RPM packages; rpm dev tools must be present
|
||||
#
|
||||
|
||||
GENERATED_FILES :=
|
||||
DOC_DIR = doc
|
||||
|
||||
# Automagically pick clang or gcc, with preference for clang
|
||||
# This is only done if we have not overridden these with an environment or CLI variable
|
||||
ifeq ($(origin CC),default)
|
||||
@@ -31,85 +33,67 @@ endif
|
||||
#UNAME_M=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
|
||||
|
||||
INCLUDES?=
|
||||
DEFS?=-D_FORTIFY_SOURCE=2
|
||||
DEFS?=
|
||||
LDLIBS?=
|
||||
DESTDIR?=
|
||||
|
||||
include objects.mk
|
||||
|
||||
# On Linux we auto-detect the presence of some libraries and if present we
|
||||
# link against the system version. This works with our package build images.
|
||||
ifeq ($(wildcard /usr/include/lz4.h),)
|
||||
OBJS+=ext/lz4/lz4.o
|
||||
else
|
||||
LDLIBS+=-llz4
|
||||
DEFS+=-DZT_USE_SYSTEM_LZ4
|
||||
endif
|
||||
ifeq ($(wildcard /usr/include/http_parser.h),)
|
||||
OBJS+=ext/http-parser/http_parser.o
|
||||
else
|
||||
LDLIBS+=-lhttp_parser
|
||||
DEFS+=-DZT_USE_SYSTEM_HTTP_PARSER
|
||||
ifeq ($(ZT_OFFICIAL_RELEASE),1)
|
||||
DEFS+=-DZT_OFFICIAL_RELEASE
|
||||
ZT_USE_MINIUPNPC=1
|
||||
endif
|
||||
|
||||
ifeq ($(ZT_USE_MINIUPNPC),1)
|
||||
OBJS+=osdep/PortMapper.o
|
||||
DEFS+=-DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -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
|
||||
|
||||
DEFS+=-DZT_USE_MINIUPNPC
|
||||
|
||||
# Auto-detect libminiupnpc at least v2.0
|
||||
MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
|
||||
ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
|
||||
DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
|
||||
LDLIBS+=-lminiupnpc
|
||||
else
|
||||
DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
|
||||
OBJS+=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
|
||||
endif
|
||||
|
||||
# Auto-detect libnatpmp
|
||||
ifeq ($(wildcard /usr/include/natpmp.h),)
|
||||
OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
|
||||
else
|
||||
LDLIBS+=-lnatpmp
|
||||
DEFS+=-DZT_USE_SYSTEM_NATPMP
|
||||
endif
|
||||
ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
|
||||
DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
|
||||
LDLIBS+=-L/usr/local/lib -lsqlite3
|
||||
OBJS+=controller/SqliteNetworkController.o
|
||||
endif
|
||||
|
||||
ifeq ($(ZT_ENABLE_CLUSTER),1)
|
||||
DEFS+=-DZT_ENABLE_CLUSTER
|
||||
endif
|
||||
|
||||
ifeq ($(ZT_TRACE),1)
|
||||
DEFS+=-DZT_TRACE
|
||||
endif
|
||||
|
||||
ifeq ($(ZT_DEBUG),1)
|
||||
DEFS+=-DZT_TRACE
|
||||
override CFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS)
|
||||
override CXXFLAGS+=-Wall -g -O -std=c++11 -pthread $(INCLUDES) $(DEFS)
|
||||
override LDFLAGS+=
|
||||
CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
|
||||
CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
|
||||
LDFLAGS=-ldl
|
||||
STRIP?=echo
|
||||
# The following line enables optimization for the crypto code, since
|
||||
# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
|
||||
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?=-O3 -fstack-protector
|
||||
override CFLAGS+=-Wall -fPIE -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
||||
CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
||||
CXXFLAGS?=-O3 -fstack-protector
|
||||
override CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
||||
override LDFLAGS+=-pie -Wl,-z,relro,-z,now
|
||||
CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
||||
LDFLAGS=-ldl -pie -Wl,-z,relro,-z,now
|
||||
STRIP?=strip
|
||||
STRIP+=--strip-all
|
||||
endif
|
||||
|
||||
ifeq ($(ZT_TRACE),1)
|
||||
DEFS+=-DZT_TRACE
|
||||
endif
|
||||
|
||||
# Debug output for Network Containers
|
||||
# Specific levels can be controlled in netcon/common.inc.c
|
||||
ifeq ($(SDK_DEBUG),1)
|
||||
DEFS+=-DSDK_DEBUG
|
||||
endif
|
||||
|
||||
# Uncomment for gprof profile build
|
||||
#CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
|
||||
#CXXFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
|
||||
#LDFLAGS=
|
||||
#STRIP=echo
|
||||
|
||||
all: one manpages
|
||||
all: one
|
||||
|
||||
one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(LDLIBS)
|
||||
@@ -117,82 +101,47 @@ one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o
|
||||
ln -sf zerotier-one zerotier-idtool
|
||||
ln -sf zerotier-one zerotier-cli
|
||||
|
||||
netcon: $(OBJS) FORCE
|
||||
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
|
||||
# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
|
||||
cd netcon ; 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) -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztapi.so zt_api.c RPC.c -ldl
|
||||
cd netcon ; gcc $(DEFS) -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztintercept.so NetconSockets.c Intercept.c NetconDebug.c NetconRPC.c -ldl
|
||||
#cd netcon ; gcc $(DEFS) -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztkq.so zt_api.c kq.c Intercept.c RPC.c -ldl
|
||||
#cd netcon ; gcc $(DEFS) -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -o ztproxy ztproxy.c zt_api.c RPC.c -ldl
|
||||
#cp netcon/ztproxy ztproxy
|
||||
#cp netcon/libztapi.so libztapi.so
|
||||
#cp netcon/libztkq.so libztkq.so
|
||||
cp netcon/libztintercept.so libztintercept.so
|
||||
ln -sf zerotier-netcon-service zerotier-cli
|
||||
ln -sf zerotier-netcon-service zerotier-idtool
|
||||
|
||||
selftest: $(OBJS) selftest.o
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS)
|
||||
$(STRIP) zerotier-selftest
|
||||
|
||||
manpages: FORCE
|
||||
cd doc ; ./build.sh
|
||||
|
||||
doc: manpages
|
||||
installer: one FORCE
|
||||
./ext/installfiles/linux/buildinstaller.sh
|
||||
|
||||
clean: FORCE
|
||||
rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one
|
||||
|
||||
distclean: clean
|
||||
rm -rf doc/node_modules
|
||||
find linux-build-farm -type f -name '*.deb' -print0 | xargs -0 rm -fv
|
||||
find linux-build-farm -type f -name '*.rpm' -print0 | xargs -0 rm -fv
|
||||
find linux-build-farm -type f -name 'zt1-src.tar.gz' | xargs rm -fv
|
||||
|
||||
realclean: distclean
|
||||
rm -rf ${GENERATED_FILES} *.so *.o netcon/*.a node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend
|
||||
find netcon -type f \( -name '*.o' -o -name '*.so' -o -name '*.1.0' -o -name 'zerotier-one' -o -name 'zerotier-cli' -o -name 'zerotier-netcon-service' \) -delete
|
||||
find netcon/tests/docker -name "zerotier-intercept" -type f -delete
|
||||
|
||||
debug: FORCE
|
||||
make ZT_DEBUG=1 one
|
||||
make ZT_DEBUG=1 selftest
|
||||
|
||||
# Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
|
||||
# provide backward compatibility with old releases where the binaries actually
|
||||
# lived here. Folks got scripts.
|
||||
official: FORCE
|
||||
make ZT_OFFICIAL_RELEASE=1 clean
|
||||
make -j 4 ZT_OFFICIAL_RELEASE=1 one
|
||||
make ZT_OFFICIAL_RELEASE=1 installer
|
||||
make ZT_OFFICIAL_RELEASE=1 doc
|
||||
|
||||
install: FORCE
|
||||
mkdir -p $(DESTDIR)/usr/sbin
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-one
|
||||
cp -f zerotier-one $(DESTDIR)/usr/sbin/zerotier-one
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-cli
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
|
||||
ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-cli
|
||||
ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-idtool
|
||||
mkdir -p $(DESTDIR)/var/lib/zerotier-one
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
|
||||
ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-one
|
||||
ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
|
||||
ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
|
||||
mkdir -p $(DESTDIR)/usr/share/man/man8
|
||||
rm -f $(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
|
||||
cat doc/zerotier-one.8 | gzip -9 >$(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
|
||||
mkdir -p $(DESTDIR)/usr/share/man/man1
|
||||
rm -f $(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
|
||||
rm -f $(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
|
||||
cat doc/zerotier-cli.1 | gzip -9 >$(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
|
||||
cat doc/zerotier-idtool.1 | gzip -9 >$(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
|
||||
|
||||
# Uninstall preserves identity.public and identity.secret since the user might
|
||||
# want to save these. These are your ZeroTier address.
|
||||
|
||||
uninstall: FORCE
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-cli
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
|
||||
rm -f $(DESTDIR)/usr/sbin/zerotier-one
|
||||
rm -rf $(DESTDIR)/var/lib/zerotier-one/iddb.d
|
||||
rm -rf $(DESTDIR)/var/lib/zerotier-one/updates.d
|
||||
rm -rf $(DESTDIR)/var/lib/zerotier-one/networks.d
|
||||
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one.port
|
||||
rm -f $(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
|
||||
rm -f $(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
|
||||
rm -f $(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
|
||||
|
||||
# These are just for convenience for building Linux packages
|
||||
|
||||
debian: distclean
|
||||
debuild -I -i -us -uc
|
||||
|
||||
redhat: distclean
|
||||
rpmbuild -ba zerotier-one.spec
|
||||
# Includes 'doc' target
|
||||
include ${DOC_DIR}/module.mk
|
||||
|
||||
FORCE:
|
||||
|
||||
Reference in New Issue
Block a user