diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-18 14:26:37 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-18 14:26:37 -0800 |
| commit | fd9b2e931f338c53c2fbef83f6c4a8091208689b (patch) | |
| tree | 9586777d1e5e1e0907ec5ebcd472c088c0e2e34f | |
| parent | 6de67e828d01ffe8bb1847bb167af6fa92c0aa57 (diff) | |
| parent | 2d9f1f7857669a94df7967977ead2eae2efb7108 (diff) | |
| download | infinitytier-fd9b2e931f338c53c2fbef83f6c4a8091208689b.tar.gz infinitytier-fd9b2e931f338c53c2fbef83f6c4a8091208689b.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
| -rw-r--r-- | make-linux.mk | 3 | ||||
| -rwxr-xr-x | netcon/install-intercept.sh | 9 |
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 |