summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-12-18 13:13:47 -0800
committerJoseph Henry <josephjah@gmail.com>2015-12-18 13:13:47 -0800
commit2d9f1f7857669a94df7967977ead2eae2efb7108 (patch)
tree39c3f1ed735d33bdc405e1f2d7acfb85dff7a8c5
parentfde8af9483e4923876cf845b68fc5fbef1fa5e43 (diff)
downloadinfinitytier-2d9f1f7857669a94df7967977ead2eae2efb7108.tar.gz
infinitytier-2d9f1f7857669a94df7967977ead2eae2efb7108.zip
Added install script for debugging with strace
-rw-r--r--make-linux.mk3
-rwxr-xr-xnetcon/install-intercept.sh9
2 files changed, 11 insertions, 1 deletions
diff --git a/make-linux.mk b/make-linux.mk
index 672ee98e..442b029d 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -102,7 +102,8 @@ netcon: $(OBJS)
# 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 -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o ../libzerotierintercept.so Intercept.c -ldl
+ cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libzerotierintercept.so Intercept.c -ldl
+ cp netcon/libzerotierintercept.so libzerotierintercept.so
ln -sf zerotier-netcon-service zerotier-cli
ln -sf zerotier-netcon-service zerotier-idtool
diff --git a/netcon/install-intercept.sh b/netcon/install-intercept.sh
new file mode 100755
index 00000000..bce4d16b
--- /dev/null
+++ b/netcon/install-intercept.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cp libzerotierintercept.so /lib/libzerotierintercept.so
+ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+/usr/bin/install -c zerotier-intercept /usr/bin
+
+# rm -r /lib/libzerotierintercept.so
+# rm -r /lib/libzerotierintercept
+# rm -r /usr/bin/zerotier-intercept