Modified test scripts to match new naming conventions

22 files changed, 46 insertions, 56 deletions

diff --git a/netcon/docker-test/_build_single_image.sh b/netcon/docker-test/_build_single_image.sh
index a76be2ed..f18a83a4 100755
--- a/netcon/docker-test/_build_single_image.sh
+++ b/netcon/docker-test/_build_single_image.sh
@@ -8,6 +8,7 @@ touch "$test_name".name
 cp ../../*.conf .
 cp ../../zerotier-one zerotier-one
 cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-cli zerotier-netcon-service
 cp ../../zerotier-intercept zerotier-intercept
 cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
 cp ../../liblwip.so liblwip.so
@@ -21,6 +22,7 @@ docker build --tag="$test_name"_monitor -f monitor_dockerfile .
 
 rm -f zerotier-one
 rm -f zerotier-cli
+rm -f zerotier-netcon-service
 rm -f zerotier-intercept
 rm -f libzerotierintercept.so.1.0
 rm -f liblwip.so
diff --git a/netcon/docker-test/build_zt.sh b/netcon/docker-test/build_zt.sh
index 189a1e0d..0c707670 100755
--- a/netcon/docker-test/build_zt.sh
+++ b/netcon/docker-test/build_zt.sh
@@ -6,17 +6,14 @@
 cd ../../
 
 make clean
-make
-cd netcon
-make -f make-intercept.mk lib
-rm *.o
-rm liblwip.so
-make -f make-liblwip.mk
+make netcon
+make one
 
-cd docker-test
+cd netcon/docker-test
 
 cp ../../zerotier-one zerotier-one
 cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-cli zerotier-netcon-service
 
 cp ../liblwip.so liblwip.so
 cp ../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
index 0584107f..1a241c56 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
@@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
index bf11ebfc..095aecd7 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
@@ -18,9 +18,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
index d8dfb989..8fdd7fe0 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
@@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
index a7c82e60..db98e9f6 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
@@ -19,9 +19,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
deleted file mode 100755
index 8fa3b3eb..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Runs test image and monitor image as daemons
-test_name=${PWD##*/}
-echo 'Starting containers for: ' "$test_name"
-touch "$test_name".name
-test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
-monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
-
-echo "waiting $netcon_test_wait_time for test to complete."
-sleep $netcon_test_wait_time
-docker stop $(docker ps -a -q)
-docker rm $test_container
-docker rm $monitor_container
-
-rm -f *.name
\ No newline at end of file
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
index 3b3a7a6f..a513553c 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
@@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
index c0b9e1fc..9967fb4e 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
@@ -6,7 +6,7 @@ export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
 # --- Test Parameters ---
 test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.{conf,}) # blank test network config file
+nwconf=$(ls {*.conf,}) # blank test network config file
 nwid="${nwconf%.*}" # test network id
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -19,9 +19,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx-1.8.0-13.fc23.x86_64.name b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx-1.8.0-13.fc23.x86_64.name
deleted file mode 100644
index e69de29b..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx-1.8.0-13.fc23.x86_64.name
+++ /dev/null
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
index 56de6eb4..70986d7b 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
@@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
index c0b9e1fc..9967fb4e 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
@@ -6,7 +6,7 @@ export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
 # --- Test Parameters ---
 test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.{conf,}) # blank test network config file
+nwconf=$(ls {*.conf,}) # blank test network config file
 nwid="${nwconf%.*}" # test network id
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -19,9 +19,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile
index 16eb7cf1..5653fa7c 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile
@@ -33,6 +33,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh
index c0b9e1fc..9967fb4e 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh
@@ -6,7 +6,7 @@ export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
 # --- Test Parameters ---
 test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.{conf,}) # blank test network config file
+nwconf=$(ls {*.conf,}) # blank test network config file
 nwid="${nwconf%.*}" # test network id
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -19,9 +19,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
index 1e7e10ad..fc57dfae 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
@@ -33,6 +33,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+ADD zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
index a6e1b6c1..9d485c2a 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
@@ -16,9 +16,9 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
index 395241cd..f7df2ecf 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
@@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /
 ADD zerotier-cli /
+Add zerotier-netcon-service /
 
 # Install test scripts
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
index 8f7aefec..ee37bd80 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
@@ -16,9 +16,9 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an
 
 # --- Network Config ---
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+chown -R daemon /var/lib/zerotier-netcon-service
+chgrp -R daemon /var/lib/zerotier-netcon-service
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do
 	sleep 0.2
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/redis-3.0.4-1.fc23.x86_64.name b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/redis-3.0.4-1.fc23.x86_64.name
deleted file mode 100644
index e69de29b..00000000
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/redis-3.0.4-1.fc23.x86_64.name
+++ /dev/null
diff --git a/netcon/docker-test/zerotier-netcon-service b/netcon/docker-test/zerotier-netcon-service
new file mode 100755
index 00000000..24427ac6
--- /dev/null
+++ b/netcon/docker-test/zerotier-netcon-service
diff --git a/netcon/make-intercept.mk b/netcon/make-intercept.mk
index 71d6d4dc..e81914a6 100644
--- a/netcon/make-intercept.mk
+++ b/netcon/make-intercept.mk
@@ -43,11 +43,11 @@ lib:
 	${SHCC} $(SHLDFLAGS) Intercept.o -o libzerotierintercept.so.1.0 $(LIBS)
 
 install:
-	cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-	ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+	cp ../libzerotierintercept.so /lib/libzerotierintercept.so
+	ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 	/usr/bin/install -c zerotier-intercept /usr/bin
 
 uninstall:
-	rm -r /lib/libzerotierintercept.so.1.0
+	rm -r /lib/libzerotierintercept.so
 	rm -r /lib/libzerotierintercept
 	rm -r /usr/bin/zerotier-intercept
diff --git a/netcon/zerotier-intercept b/netcon/zerotier-intercept
index 85e9fba1..f35c9d15 100755
--- a/netcon/zerotier-intercept
+++ b/netcon/zerotier-intercept
@@ -11,14 +11,14 @@ case "$1" in
 	on)
 		if [ -z "$LD_PRELOAD" ]
 			then
-				export LD_PRELOAD="/lib/libzerotierintercept.so.1.0"
+				export LD_PRELOAD="/lib/libzerotierintercept.so"
 			else
-				echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
+				echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so" || \
 				export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
 		fi
 	;;
 	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libzerotierintercept.so.1.0 \?//'`
+		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libzerotierintercept.so \?//'`
 		if [ -z "$LD_PRELOAD" ]
 			then
 				unset LD_PRELOAD
@@ -33,10 +33,10 @@ case "$1" in
 	*)
 		if [ -z "$LD_PRELOAD" ]
 		then
-			export LD_PRELOAD="/lib/libzerotierintercept.so.1.0"
+			export LD_PRELOAD="/lib/libzerotierintercept.so"
 		else
-			echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libzerotierintercept.so.1.0 $LD_PRELOAD"
+			echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so" || \
+			export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
 		fi
 
 		if [ $# = 0 ]