summaryrefslogtreecommitdiff
path: root/netcon
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-12-07 05:37:14 -0800
committerJoseph Henry <josephjah@gmail.com>2015-12-07 05:37:14 -0800
commitdab13f59e5b84ec4b6eb486dfc6dd8b61656646f (patch)
tree928150d870840aa99bbc0e7d612c638f9aaf2f1b /netcon
parent036bbfaff9b5ad7a04e91b03b38688f5d03a878c (diff)
downloadinfinitytier-dab13f59e5b84ec4b6eb486dfc6dd8b61656646f.tar.gz
infinitytier-dab13f59e5b84ec4b6eb486dfc6dd8b61656646f.zip
Test updates
Diffstat (limited to 'netcon')
-rwxr-xr-xnetcon/docker-test/_build_single_image.sh11
-rwxr-xr-xnetcon/docker-test/build_zt.sh4
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/httpd/httpd_demo/netcon_dockerfile7
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-ub14.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile7
-rw-r--r--netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh4
-rwxr-xr-xnetcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh17
-rw-r--r--netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile7
-rw-r--r--netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh4
-rw-r--r--netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile7
-rwxr-xr-xnetcon/docker-test/zerotier-netcon-servicebin747928 -> 0 bytes
-rw-r--r--netcon/make-intercept.mk5
21 files changed, 48 insertions, 80 deletions
diff --git a/netcon/docker-test/_build_single_image.sh b/netcon/docker-test/_build_single_image.sh
index f18a83a4..c11f611c 100755
--- a/netcon/docker-test/_build_single_image.sh
+++ b/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 \ No newline at end of file
diff --git a/netcon/docker-test/build_zt.sh b/netcon/docker-test/build_zt.sh
index 0c707670..11fd0316 100755
--- a/netcon/docker-test/build_zt.sh
+++ b/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
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 1a241c56..f0c6260d 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
@@ -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 /
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 095aecd7..0ed4d331 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,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
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 8fdd7fe0..d946e2fd 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
@@ -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 /
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 db98e9f6..77439e0c 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,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
diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
index be9d3f3f..a193863f 100644
--- a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
+++ b/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
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 a513553c..53541b3e 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
@@ -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 /
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 9967fb4e..3f84f5e5 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
@@ -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
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 70986d7b..b6678998 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
@@ -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 /
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 9967fb4e..3f84f5e5 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
@@ -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
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 5653fa7c..25e2d90e 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
@@ -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 /
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 9967fb4e..3f84f5e5 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
@@ -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
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 fc57dfae..b8f9fa78 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
@@ -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 /
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 9d485c2a..324ebc8a 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,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
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh
deleted file mode 100755
index 164b0b2e..00000000
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh
+++ /dev/null
@@ -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 \ No newline at end of file
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 f7df2ecf..25b860b2 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
@@ -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 /
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 ee37bd80..0b8fc7a7 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,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
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
index e64c72bb..052d6303 100644
--- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
+++ b/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 /
diff --git a/netcon/docker-test/zerotier-netcon-service b/netcon/docker-test/zerotier-netcon-service
deleted file mode 100755
index 24427ac6..00000000
--- a/netcon/docker-test/zerotier-netcon-service
+++ /dev/null
Binary files differ
diff --git a/netcon/make-intercept.mk b/netcon/make-intercept.mk
index e81914a6..14fe3534 100644
--- a/netcon/make-intercept.mk
+++ b/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