Updated makefile, removed old results directory

make-linux.mk

@@ -117,6 +117,7 @@ clean:
 	find netcon/ -name "*.so" -type f -delete
 	find netcon/ -name "zerotier-one" -type f -delete
 	find netcon/ -name "zerotier-cli" -type f -delete
+	find netcon/docker-test -name "zerotier-intercept" -type f -delete
 	rm -rf netcon/*.o netcon/*.so netcon/*.1.0
 	rm -rf node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm
 

netcon/Intercept.c

@@ -326,7 +326,7 @@ void load_symbols(void)
   realsocket = dlsym(RTLD_NEXT, "socket");
   realbind = dlsym(RTLD_NEXT, "bind");
   realselect = dlsym(RTLD_NEXT, "select");
-	realsetsockopt = dlsym(RTLD_NEXT, "setsockopt");
+  realsetsockopt = dlsym(RTLD_NEXT, "setsockopt");
   realgetsockopt = dlsym(RTLD_NEXT, "getsockopt");
   realaccept4 = dlsym(RTLD_NEXT, "accept4");
   realclone = dlsym(RTLD_NEXT, "clone");
@@ -347,7 +347,7 @@ void load_symbols(void)
   reallisten = dlsym(lib, "listen");
   realsocket = dlsym(lib, "socket");
   realselect = dlsym(lib, "select");
-	realsetsockopt = dlsym(lib, "setsockopt");
+  realsetsockopt = dlsym(lib, "setsockopt");
   realgetsockopt = dlsym(lib, "getsockopt");
   realaccept4 = dlsym(lib), "accept4");
   realclone = dlsym(lib, "clone");

netcon/docker-test/zerotier-intercept

@@ -1,54 +0,0 @@
-#!/bin/sh
-# usage:
-# /usr/bin/intercept program <args>
-
-if [ $# = 0 ] ; then
-   echo "$0: insufficient arguments"
-   exit
-fi
-
-case "$1" in
-	on)
-		if [ -z "$LD_PRELOAD" ]
-			then
-				export LD_PRELOAD="/lib/libzerotierintercept.so.1.0"
-			else
-				echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
-				export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
-		fi
-	;;
-	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libzerotierintercept.so.1.0 \?//'`
-		if [ -z "$LD_PRELOAD" ]
-			then
-				unset LD_PRELOAD
-		fi
-	;;
-	show|sh)
-		echo "LD_PRELOAD=\"$LD_PRELOAD\""
-	;;
-	-h|-?)
-      echo ""
-   ;;
-	*)
-		if [ -z "$LD_PRELOAD" ]
-		then
-			export LD_PRELOAD="/lib/libzerotierintercept.so.1.0"
-		else
-			echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libzerotierintercept.so.1.0 $LD_PRELOAD"
-		fi
-
-		if [ $# = 0 ]
-		then
-			${SHELL:-/bin/sh}
-		fi
-
-		if [ $# -gt 0 ]
-		then
-			exec "$@"
-		fi
-	;;
-esac
-
-#EOF