Updated throughput_httpd docker test files

9 files changed, 93 insertions, 127 deletions

diff --git a/docker-test/throughput_httpd_2.4.16/build.sh b/docker-test/throughput_httpd_2.4.16/build.sh
index 1e31ab22..2925035a 100755
--- a/docker-test/throughput_httpd_2.4.16/build.sh
+++ b/docker-test/throughput_httpd_2.4.16/build.sh
@@ -7,11 +7,11 @@ rm *.o
 rm liblwip.so
 make -f make-liblwip.mk
 
-cd ../docker-test/throughput
+cd ../docker-test/throughput_httpd_2.4.16
 
 cp ../../zerotier-one zerotier-one
 cp ../../zerotier-cli zerotier-cli
 
 cp ../../netcon/liblwip.so liblwip.so
 cp ../../netcon/libintercept.so.1.0 libintercept.so.1.0
-
+cp ../../netcon/intercept intercept
diff --git a/docker-test/throughput_httpd_2.4.16/intercept b/docker-test/throughput_httpd_2.4.16/intercept
deleted file mode 100755
index 3eb27ff7..00000000
--- a/docker-test/throughput_httpd_2.4.16/intercept
+++ /dev/null
@@ -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/libintercept.so.1.0"
-			else
-				echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-				export LD_PRELOAD="/lib/libintercept.so $LD_PRELOAD"
-		fi
-	;;
-	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libintercept.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/libintercept.so.1.0"
-		else
-			echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libintercept.so.1.0 $LD_PRELOAD"
-		fi
-
-		if [ $# = 0 ]
-		then
-			${SHELL:-/bin/sh}
-		fi
-
-		if [ $# -gt 0 ]
-		then
-			exec "$@"
-		fi
-	;;
-esac
-
-#EOF
diff --git a/docker-test/throughput_httpd_2.4.17/build.sh b/docker-test/throughput_httpd_2.4.17/build.sh
index 14f5b44a..adbbdcbe 100755
--- a/docker-test/throughput_httpd_2.4.17/build.sh
+++ b/docker-test/throughput_httpd_2.4.17/build.sh
@@ -14,4 +14,5 @@ cp ../../zerotier-cli zerotier-cli
 
 cp ../../netcon/liblwip.so liblwip.so
 cp ../../netcon/libintercept.so.1.0 libintercept.so.1.0
+cp ../../netcon/intercept intercept
 
diff --git a/docker-test/throughput_httpd_2.4.17/intercept b/docker-test/throughput_httpd_2.4.17/intercept
deleted file mode 100755
index 3eb27ff7..00000000
--- a/docker-test/throughput_httpd_2.4.17/intercept
+++ /dev/null
@@ -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/libintercept.so.1.0"
-			else
-				echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-				export LD_PRELOAD="/lib/libintercept.so $LD_PRELOAD"
-		fi
-	;;
-	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libintercept.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/libintercept.so.1.0"
-		else
-			echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libintercept.so.1.0 $LD_PRELOAD"
-		fi
-
-		if [ $# = 0 ]
-		then
-			${SHELL:-/bin/sh}
-		fi
-
-		if [ $# -gt 0 ]
-		then
-			exec "$@"
-		fi
-	;;
-esac
-
-#EOF
diff --git a/docker-test/throughput_httpd_2.4.6/Dockerfile b/docker-test/throughput_httpd_2.4.6/Dockerfile
new file mode 100644
index 00000000..9ce81551
--- /dev/null
+++ b/docker-test/throughput_httpd_2.4.6/Dockerfile
@@ -0,0 +1,40 @@
+# ZT Netcon Throughput test
+FROM centos:7
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install httpd-2.4.17-3.fc23
+RUN yum -y install nano
+RUN yum -y install strace
+RUN yum clean all
+
+EXPOSE 9993/udp 9992/udp 9991/udp 9990/udp
+
+# Install sys-call intercept library
+ADD intercept /
+ADD libintercept.so.1.0 /
+RUN cp libintercept.so.1.0 lib/libintercept.so.1.0
+RUN cp libintercept.so.1.0 /lib/libintercept.so.1.0
+RUN ln -sf /lib/libintercept.so.1.0 /lib/libintercept
+RUN /usr/bin/install -c intercept /usr/bin
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Install test-setup scripts
+ADD generate_file.sh /generate_file.sh
+RUN chmod -v +x /generate_file.sh
+ADD entrypoint.sh /entrypoint.sh
+RUN chmod -v +x /entrypoint.sh
+
+# Install LWIP library used by service
+ADD liblwip.so /
+RUN mkdir -p ext/bin/lwip
+RUN cp liblwip.so ext/bin/lwip/liblwip.so
+
+# Start ZeroTier-One
+CMD ["./entrypoint.sh"]
diff --git a/docker-test/throughput_httpd_2.4.6/build.sh b/docker-test/throughput_httpd_2.4.6/build.sh
new file mode 100755
index 00000000..360b7c42
--- /dev/null
+++ b/docker-test/throughput_httpd_2.4.6/build.sh
@@ -0,0 +1,18 @@
+cd ../../
+make clean
+make
+cd netcon
+make -f make-intercept.mk lib
+rm *.o
+rm liblwip.so
+make -f make-liblwip.mk
+
+cd ../docker-test/throughput_httpd_2.4.6
+
+cp ../../zerotier-one zerotier-one
+cp ../../zerotier-cli zerotier-cli
+
+cp ../../netcon/liblwip.so liblwip.so
+cp ../../netcon/libintercept.so.1.0 libintercept.so.1.0
+cp ../../netcon/intercept intercept
+
diff --git a/docker-test/throughput_httpd_2.4.6/entrypoint.sh b/docker-test/throughput_httpd_2.4.6/entrypoint.sh
new file mode 100644
index 00000000..00fdd2be
--- /dev/null
+++ b/docker-test/throughput_httpd_2.4.6/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+echo '***'
+echo '*** ZeroTier Network Containers Test Image'
+echo '*** https://www.zerotier.com/'
+echo '***'
+
+./zerotier-one &
+./zerotier-cli join e5cd7a9e1c5311ab
+./zerotier-cli listnetworks
+
+
diff --git a/docker-test/throughput_httpd_2.4.6/generate_file.sh b/docker-test/throughput_httpd_2.4.6/generate_file.sh
new file mode 100644
index 00000000..ac5b2433
--- /dev/null
+++ b/docker-test/throughput_httpd_2.4.6/generate_file.sh
@@ -0,0 +1 @@
+dd if=/dev/urandom of=/var/www/html/big  bs=100M  count=1
diff --git a/netcon/README.md b/netcon/README.md
index 26543cc4..2a99d82f 100644
--- a/netcon/README.md
+++ b/netcon/README.md
@@ -94,23 +94,23 @@ To run a simple RX/TX test:
 
 Network Containers have been tested with the following:
 
-	sshd			[ WORKS as of 20151102] Long ~15-20s delay for client during connect
-	ssh			[ WORKS as of 20151102]
-	sftp			[ WORKS as of 20151022]
-	curl			[ WORKS as of 20151021] 
-	apache (debug mode)	[ WORKS as of 20150810]
-	apache (prefork MPM)	[ WORKS as of 20151102]
-	nginx			[ WORKS as of 20151022]
-	nodejs			[ WORKS as of 20151021]
-	java			[ WORKS as of 20151010]
-	tomcat			[ WORKS as of 2015xxxx]
-	thttpd			[ WORKS as of 2015xxxx]
-	vsftpd			[BROKEN as of 20151021] Server sends 500 when 220 is expected
-	mysql			[BROKEN as of 20151021]
-	postresql		[BROKEN as of 20151021]
-	MongoDB			[ WORKS as of 20151028]
-	Redis-server		[ WORKS as of 20151027]
-	pure-ftpd		[BROKEN as of 20151021] Socket operation on non-socket
+	sshd					[ WORKS as of 20151102] Long ~15-20s delay for client during connect
+	ssh						[ WORKS as of 20151102]
+	sftp					[ WORKS as of 20151022]
+	curl					[ WORKS as of 20151021] 
+	apache (debug mode)		[ WORKS as of 20150810]
+	apache (prefork MPM)	[ WORKS as of 20151112] (2.4.6-31.x86-64 on Centos 7), (2.4.16-1.x84-64 on F22), (2.4.17-3.x86-64 on F22)
+	nginx					[ WORKS as of 20151022]
+	nodejs					[ WORKS as of 20151021]
+	java					[ WORKS as of 20151010]
+	tomcat					[ WORKS as of 2015xxxx]
+	thttpd					[ WORKS as of 2015xxxx] 
+	vsftpd					[BROKEN as of 20151021] Server sends 500 when 220 is expected
+	mysql					[BROKEN as of 20151021]
+	postresql				[BROKEN as of 20151021]
+	MongoDB					[ WORKS as of 20151028]
+	Redis-server			[ WORKS as of 20151027]
+	pure-ftpd				[BROKEN as of 20151021] Socket operation on non-socket
 
 To Test: