Test updates

make-linux.mk

@@ -113,9 +113,9 @@ installer: one FORCE
 	./ext/installfiles/linux/buildinstaller.sh
 
 clean:
-	rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-netcon-service zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm
+	rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm
 	# Remove files from all the funny places we put them for tests
-	find netcon -type f \( -name '*.o' -o -name '*.so' -o -name '*.1.0' -o -name 'zerotier-one' -o -name 'zerotier-cli' \) -delete
+	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/docker-test -name "zerotier-intercept" -type f -delete
 
 debug:	FORCE

netcon/docker-test/_build_single_image.sh

@@ -10,7 +10,7 @@ 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 ../../libzerotierintercept.so libzerotierintercept.so
 cp ../../liblwip.so liblwip.so
 cp ../../netcon_identity.public netcon_identity.public
 cp ../../netcon_identity.secret netcon_identity.secret
@@ -24,11 +24,8 @@ 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
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
+rm -f *.so
+rm -f *.public
+rm -f *.secret
 rm -f *.conf
 rm -f *.name

netcon/docker-test/build_zt.sh

@@ -13,9 +13,9 @@ cd netcon/docker-test
 
 cp ../../zerotier-one zerotier-one
 cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-cli zerotier-netcon-service
+cp ../../zerotier-netcon-service zerotier-netcon-service
+cp ../../libzerotierintercept.so libzerotierintercept.so
 
 cp ../liblwip.so liblwip.so
-cp ../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
 cp ../zerotier-intercept zerotier-intercept
 

netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh

@@ -18,8 +18,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh

@@ -19,8 +19,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/httpd/httpd_demo/netcon_dockerfile

@@ -17,10 +17,9 @@ RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 # Add ZT files

netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh

@@ -19,8 +19,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh

@@ -19,8 +19,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile

@@ -25,10 +25,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh

@@ -19,8 +19,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile

@@ -25,10 +25,9 @@ ADD httpserver.js /
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh

@@ -16,8 +16,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Runs test image and monitor image as daemons
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Start netcon container to be tested
-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

netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh

@@ -16,8 +16,8 @@ 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-netcon-service
-chgrp -R daemon /var/lib/zerotier-netcon-service
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
 virtip4=""
 while [ -z "$virtip4" ]; do

netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile

@@ -22,10 +22,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
-ADD libzerotierintercept.so.1.0 /
-RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0
-RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 ADD zerotier-one /

netcon/make-intercept.mk

@@ -30,17 +30,14 @@ SHCC=gcc
 intercept_CFLAGS = -c -fPIC -g -O2 -Wall -std=c99 -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT
 #LIB_NAME = intercept
 SHLIB_EXT=dylib
-SHLIB_MAJOR = 1
-SHLIB_MINOR = 8
 COMMON = Common
 OBJS= Intercept.o
-#SHLIB = ${LIB_NAME}.${SHLIB_EXT}.${SHLIB_MAJOR}.${SHLIB_MINOR}
 SHLDFLAGS = -g -O2 -Wall -I. -nostdlib -shared
 LIBS = -ldl -lc -lrt -lpthread
 
 lib:
 	${SHCC} $(intercept_CFLAGS) -I. Intercept.c -o Intercept.o
-	${SHCC} $(SHLDFLAGS) Intercept.o -o libzerotierintercept.so.1.0 $(LIBS)
+	${SHCC} $(SHLDFLAGS) Intercept.o -o libzerotierintercept.so $(LIBS)
 
 install:
 	cp ../libzerotierintercept.so /lib/libzerotierintercept.so