Additional test files

netcon/Intercept.c

@@ -228,8 +228,13 @@ int get_new_fd(int oversock)
   char buf[BUF_SZ];
   int newfd;
   ssize_t size = sock_fd_read(oversock, buf, sizeof(buf), &newfd);
-  dwr(MSG_DEBUG, "get_new_fd(): RX: fd = (%d) over (%d)\n", newfd, oversock);
-  return newfd;
+
+  if(size > 0){
+    dwr(MSG_DEBUG, "get_new_fd(): RX: fd = (%d) over (%d)\n", newfd, oversock);
+    return newfd;
+  }
+  dwr(MSG_ERROR, "get_new_fd(): ERROR: unable to read fd over (%d)\n", oversock);
+  return -1;
 }
 
 /* Check whether the socket is mapped to the service or not. We
@@ -525,7 +530,6 @@ int socket(SOCKET_SIG)
   send_command(fdret_sock, cmd);
 
   /* get new fd */
-  char rbuf[16];
   newfd = get_new_fd(fdret_sock);
   if(newfd > 0)
   {
@@ -574,7 +578,7 @@ int connect(CONNECT_SIG)
     return -1;
   }
   dwr(MSG_DEBUG,"\nconnect(%d):\n", __fd);
-  print_addr(__addr);
+  /* print_addr(__addr); */
   struct sockaddr_in *connaddr;
   connaddr = (struct sockaddr_in *) __addr;
 
@@ -675,7 +679,7 @@ int bind(BIND_SIG)
     return -1;
   }
   dwr(MSG_DEBUG,"\nbind(%d):\n", sockfd);
-  print_addr(addr);
+  /* print_addr(addr); */
 #ifdef CHECKS
   /* Check that this is a valid fd */
   if(fcntl(sockfd, F_GETFD) < 0) {
@@ -835,7 +839,7 @@ int accept(ACCEPT_SIG)
       fcntl(sockfd, F_SETFL, O_NONBLOCK);
   */
 
-  char rbuf[16], c[1];
+  char c[1];
   int new_conn_socket;
   int n = read(sockfd, c, sizeof(c)); /* Read signal byte */
 

netcon/docker-test/_results/OK.nginx-1.8.0-14.fc23.x86_64.txt

@@ -0,0 +1 @@
+Test: md5 sum ok!

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

@@ -47,7 +47,8 @@ dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
 #md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-echo '*** Starting httpd...'
+
+echo '*** Starting application...'
 sleep 0.5
 rm -rf /run/httpd/* /tmp/httpd*
 zerotier-intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1

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

@@ -47,7 +47,8 @@ dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
 #md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-echo '*** Starting httpd...'
+
+echo '*** Starting application...'
 sleep 0.5
 rm -rf /run/httpd/* /tmp/httpd*
 zerotier-intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1

netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh

@@ -47,7 +47,8 @@ dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
 #md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
 echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-echo '*** Starting httpd...'
+
+echo '*** Starting application...'
 sleep 0.5
 rm -rf /run/httpd/* /tmp/httpd*
 zerotier-intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1

netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/README.md

@@ -0,0 +1,8 @@
+Network Containers Test Sequence for: httpd_demo
+
+1) Creates a Netcon docker container with an intercepted instance of httpd
+2) Creates a test monitor container 
+
+3) Test monitor container waits for X seconds for the Netcon container to come online
+4) Test monitor attempts to curl an index.html file
+ - If file is of sufficient size, it will append "OK." to the result file for this test, otherwise "FAIL." is appended

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

@@ -0,0 +1,25 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# 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
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]

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

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+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
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+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'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" >> "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ ($rx_md5sum != $tx_md5sum) || ${#rx_md5sum}<5 || ${#tx_md5sum}<5 ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,41 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install nginx-1:1.8.0-13.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp
+
+# 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
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"]

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

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+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
+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
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+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'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+zerotier-intercept nginx -p /var/www/html

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

@@ -0,0 +1,40 @@
+
+test_name=${PWD##*/}
+echo 'Building dockerfiles for test: ' "$test_name"
+touch "$test_name".name
+
+# Docker won't allow the inclusion of files outside of the build directory
+cp ../../*.conf .
+cp ../../zerotier-one zerotier-one
+cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-intercept zerotier-intercept
+cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
+cp ../../liblwip.so liblwip.so
+cp ../../netcon_identity.public netcon_identity.public
+cp ../../netcon_identity.secret netcon_identity.secret
+cp ../../monitor_identity.public monitor_identity.public
+cp ../../monitor_identity.secret monitor_identity.secret
+
+docker build --tag="$test_name" -f netcon_dockerfile .
+docker build --tag="$test_name"_monitor -f monitor_dockerfile .
+
+rm -f zerotier-one
+rm -f zerotier-cli
+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 *.conf
+rm -f *.name
+
+# Start netcon container to be tested
+docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
+docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
+
+sleep 45s
+docker kill $(docker ps -a -q)
+
+rm -rf ../../_results/*.tmp

netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/README.md

@@ -0,0 +1,8 @@
+Network Containers Test Sequence for: httpd_demo
+
+1) Creates a Netcon docker container with an intercepted instance of httpd
+2) Creates a test monitor container 
+
+3) Test monitor container waits for X seconds for the Netcon container to come online
+4) Test monitor attempts to curl an index.html file
+ - If file is of sufficient size, it will append "OK." to the result file for this test, otherwise "FAIL." is appended

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

@@ -0,0 +1,25 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# 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
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]

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

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+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
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+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'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" >> "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ $rx_md5sum != $tx_md5sum ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,41 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install nginx-1:1.8.0-14.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp
+
+# 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
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"]

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

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+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
+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
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+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'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+zerotier-intercept nginx -p /var/www/html

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

@@ -0,0 +1,40 @@
+
+test_name=${PWD##*/}
+echo 'Building dockerfiles for test: ' "$test_name"
+touch "$test_name".name
+
+# Docker won't allow the inclusion of files outside of the build directory
+cp ../../*.conf .
+cp ../../zerotier-one zerotier-one
+cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-intercept zerotier-intercept
+cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
+cp ../../liblwip.so liblwip.so
+cp ../../netcon_identity.public netcon_identity.public
+cp ../../netcon_identity.secret netcon_identity.secret
+cp ../../monitor_identity.public monitor_identity.public
+cp ../../monitor_identity.secret monitor_identity.secret
+
+docker build --tag="$test_name" -f netcon_dockerfile .
+docker build --tag="$test_name"_monitor -f monitor_dockerfile .
+
+rm -f zerotier-one
+rm -f zerotier-cli
+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 *.conf
+rm -f *.name
+
+# Start netcon container to be tested
+docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
+docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
+
+sleep 45s
+docker kill $(docker ps -a -q)
+
+rm -rf ../../_results/*.tmp

netcon/docker-test/test.sh

@@ -1,20 +1,30 @@
-./build.sh
-
-cd httpd
+#./build.sh
 
 # httpd
-cd httpd-2.4.16-1.fc23.x86_64/
+cd httpd
+cd httpd-2.4.16-1.fc23.x86_64
 pwd
 ./test.sh
 cd ..
 
-cd httpd-2.4.17-3.fc23.x86_64/
+cd httpd-2.4.17-3.fc23.x86_64
 pwd
 ./test.sh
 cd ..
 
+cd ..
 
 # nginx
+cd nginx
+pwd
+ls -l -G
+cd nginx-1.8.0-13.fc23.x86_64
+./test.sh
+cd ..
 
+cd nginx-1.8.0-14.fc23.x86_64
+pwd
+./test.sh
+cd ..
 
 cd ..