From e5fad005a9c5b4ad5f645a4aba40a7bff2eeda58 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 12 Nov 2015 08:21:05 -0800 Subject: Updated RPC handling --- docker-test/httpd_demo/lib/libintercept.so.1.0 | Bin 53072 -> 0 bytes docker-test/throughput/Dockerfile | 39 --------------- docker-test/throughput/build.sh | 17 ------- docker-test/throughput/entrypoint.sh | 14 ------ docker-test/throughput/generate_file.sh | 1 - docker-test/throughput/intercept | 54 --------------------- docker-test/throughput/libintercept.so.1.0 | Bin 56832 -> 0 bytes docker-test/throughput/liblwip.so | Bin 333696 -> 0 bytes docker-test/throughput/zerotier-cli | Bin 737072 -> 0 bytes docker-test/throughput/zerotier-one | Bin 737072 -> 0 bytes docker-test/throughput_httpd_2.4.16/Dockerfile | 39 +++++++++++++++ docker-test/throughput_httpd_2.4.16/build.sh | 17 +++++++ docker-test/throughput_httpd_2.4.16/entrypoint.sh | 14 ++++++ .../throughput_httpd_2.4.16/generate_file.sh | 1 + docker-test/throughput_httpd_2.4.16/intercept | 54 +++++++++++++++++++++ docker-test/throughput_httpd_2.4.17/Dockerfile | 40 +++++++++++++++ docker-test/throughput_httpd_2.4.17/build.sh | 17 +++++++ docker-test/throughput_httpd_2.4.17/entrypoint.sh | 14 ++++++ .../throughput_httpd_2.4.17/generate_file.sh | 1 + docker-test/throughput_httpd_2.4.17/intercept | 54 +++++++++++++++++++++ 20 files changed, 251 insertions(+), 125 deletions(-) delete mode 100755 docker-test/httpd_demo/lib/libintercept.so.1.0 delete mode 100644 docker-test/throughput/Dockerfile delete mode 100755 docker-test/throughput/build.sh delete mode 100644 docker-test/throughput/entrypoint.sh delete mode 100644 docker-test/throughput/generate_file.sh delete mode 100755 docker-test/throughput/intercept delete mode 100755 docker-test/throughput/libintercept.so.1.0 delete mode 100755 docker-test/throughput/liblwip.so delete mode 100755 docker-test/throughput/zerotier-cli delete mode 100755 docker-test/throughput/zerotier-one create mode 100644 docker-test/throughput_httpd_2.4.16/Dockerfile create mode 100755 docker-test/throughput_httpd_2.4.16/build.sh create mode 100644 docker-test/throughput_httpd_2.4.16/entrypoint.sh create mode 100644 docker-test/throughput_httpd_2.4.16/generate_file.sh create mode 100755 docker-test/throughput_httpd_2.4.16/intercept create mode 100644 docker-test/throughput_httpd_2.4.17/Dockerfile create mode 100755 docker-test/throughput_httpd_2.4.17/build.sh create mode 100644 docker-test/throughput_httpd_2.4.17/entrypoint.sh create mode 100644 docker-test/throughput_httpd_2.4.17/generate_file.sh create mode 100755 docker-test/throughput_httpd_2.4.17/intercept (limited to 'docker-test') diff --git a/docker-test/httpd_demo/lib/libintercept.so.1.0 b/docker-test/httpd_demo/lib/libintercept.so.1.0 deleted file mode 100755 index 61826641..00000000 Binary files a/docker-test/httpd_demo/lib/libintercept.so.1.0 and /dev/null differ diff --git a/docker-test/throughput/Dockerfile b/docker-test/throughput/Dockerfile deleted file mode 100644 index 71549754..00000000 --- a/docker-test/throughput/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# ZT Netcon Throughput test -FROM fedora:23 -MAINTAINER https://www.zerotier.com/ - -# Install apps -RUN yum -y update -RUN yum -y install httpd-2.4.16-1.fc23 -RUN yum -y install nano -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/build.sh b/docker-test/throughput/build.sh deleted file mode 100755 index 1e31ab22..00000000 --- a/docker-test/throughput/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -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 - -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 - diff --git a/docker-test/throughput/entrypoint.sh b/docker-test/throughput/entrypoint.sh deleted file mode 100644 index 00fdd2be..00000000 --- a/docker-test/throughput/entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/generate_file.sh b/docker-test/throughput/generate_file.sh deleted file mode 100644 index ac5b2433..00000000 --- a/docker-test/throughput/generate_file.sh +++ /dev/null @@ -1 +0,0 @@ -dd if=/dev/urandom of=/var/www/html/big bs=100M count=1 diff --git a/docker-test/throughput/intercept b/docker-test/throughput/intercept deleted file mode 100755 index 3eb27ff7..00000000 --- a/docker-test/throughput/intercept +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# usage: -# /usr/bin/intercept program - -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/libintercept.so.1.0 b/docker-test/throughput/libintercept.so.1.0 deleted file mode 100755 index 7a451408..00000000 Binary files a/docker-test/throughput/libintercept.so.1.0 and /dev/null differ diff --git a/docker-test/throughput/liblwip.so b/docker-test/throughput/liblwip.so deleted file mode 100755 index 158169f1..00000000 Binary files a/docker-test/throughput/liblwip.so and /dev/null differ diff --git a/docker-test/throughput/zerotier-cli b/docker-test/throughput/zerotier-cli deleted file mode 100755 index 6e659e7a..00000000 Binary files a/docker-test/throughput/zerotier-cli and /dev/null differ diff --git a/docker-test/throughput/zerotier-one b/docker-test/throughput/zerotier-one deleted file mode 100755 index 6e659e7a..00000000 Binary files a/docker-test/throughput/zerotier-one and /dev/null differ diff --git a/docker-test/throughput_httpd_2.4.16/Dockerfile b/docker-test/throughput_httpd_2.4.16/Dockerfile new file mode 100644 index 00000000..71549754 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.16/Dockerfile @@ -0,0 +1,39 @@ +# ZT Netcon Throughput test +FROM fedora:23 +MAINTAINER https://www.zerotier.com/ + +# Install apps +RUN yum -y update +RUN yum -y install httpd-2.4.16-1.fc23 +RUN yum -y install nano +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.16/build.sh b/docker-test/throughput_httpd_2.4.16/build.sh new file mode 100755 index 00000000..1e31ab22 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.16/build.sh @@ -0,0 +1,17 @@ +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 + +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 + diff --git a/docker-test/throughput_httpd_2.4.16/entrypoint.sh b/docker-test/throughput_httpd_2.4.16/entrypoint.sh new file mode 100644 index 00000000..00fdd2be --- /dev/null +++ b/docker-test/throughput_httpd_2.4.16/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.16/generate_file.sh b/docker-test/throughput_httpd_2.4.16/generate_file.sh new file mode 100644 index 00000000..ac5b2433 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.16/generate_file.sh @@ -0,0 +1 @@ +dd if=/dev/urandom of=/var/www/html/big bs=100M count=1 diff --git a/docker-test/throughput_httpd_2.4.16/intercept b/docker-test/throughput_httpd_2.4.16/intercept new file mode 100755 index 00000000..3eb27ff7 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.16/intercept @@ -0,0 +1,54 @@ +#!/bin/sh +# usage: +# /usr/bin/intercept program + +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/Dockerfile b/docker-test/throughput_httpd_2.4.17/Dockerfile new file mode 100644 index 00000000..77a1a26a --- /dev/null +++ b/docker-test/throughput_httpd_2.4.17/Dockerfile @@ -0,0 +1,40 @@ +# ZT Netcon Throughput test +FROM fedora:23 +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.17/build.sh b/docker-test/throughput_httpd_2.4.17/build.sh new file mode 100755 index 00000000..14f5b44a --- /dev/null +++ b/docker-test/throughput_httpd_2.4.17/build.sh @@ -0,0 +1,17 @@ +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.17 + +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 + diff --git a/docker-test/throughput_httpd_2.4.17/entrypoint.sh b/docker-test/throughput_httpd_2.4.17/entrypoint.sh new file mode 100644 index 00000000..00fdd2be --- /dev/null +++ b/docker-test/throughput_httpd_2.4.17/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.17/generate_file.sh b/docker-test/throughput_httpd_2.4.17/generate_file.sh new file mode 100644 index 00000000..ac5b2433 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.17/generate_file.sh @@ -0,0 +1 @@ +dd if=/dev/urandom of=/var/www/html/big bs=100M count=1 diff --git a/docker-test/throughput_httpd_2.4.17/intercept b/docker-test/throughput_httpd_2.4.17/intercept new file mode 100755 index 00000000..3eb27ff7 --- /dev/null +++ b/docker-test/throughput_httpd_2.4.17/intercept @@ -0,0 +1,54 @@ +#!/bin/sh +# usage: +# /usr/bin/intercept program + +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 -- cgit v1.2.3