From 19f09e46faaee6e2cfe52221e3e01946d31692f3 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Mon, 9 Nov 2015 19:37:19 -0800 Subject: Moved/Renamed Docker test dirs --- docker-test/._.DS_Store | Bin 0 -> 4096 bytes docker-test/Dockerfile | 39 --- docker-test/entrypoint.sh | 53 ---- docker-test/htdocs/ZeroTierIcon.png | Bin 26898 -> 0 bytes docker-test/htdocs/index.html | 69 ----- docker-test/httpd.conf | 358 ------------------------ docker-test/httpd_demo/Dockerfile | 39 +++ docker-test/httpd_demo/entrypoint.sh | 53 ++++ docker-test/httpd_demo/htdocs/ZeroTierIcon.png | Bin 0 -> 26898 bytes docker-test/httpd_demo/htdocs/index.html | 69 +++++ docker-test/httpd_demo/httpd.conf | 358 ++++++++++++++++++++++++ docker-test/httpd_demo/intercept | 54 ++++ docker-test/httpd_demo/lib/libintercept.so.1.0 | Bin 0 -> 53072 bytes docker-test/intercept | 54 ---- docker-test/lib/libintercept.so.1.0 | Bin 53072 -> 0 bytes docker-test/throughput-test/Dockerfile | 39 --- docker-test/throughput-test/build.sh | 16 -- docker-test/throughput-test/entrypoint.sh | 14 - docker-test/throughput-test/generate_file.sh | 1 - docker-test/throughput-test/intercept | 54 ---- docker-test/throughput-test/libintercept.so.1.0 | Bin 56832 -> 0 bytes docker-test/throughput-test/liblwip.so | Bin 333696 -> 0 bytes docker-test/throughput-test/zerotier-cli | Bin 741168 -> 0 bytes docker-test/throughput-test/zerotier-one | Bin 741168 -> 0 bytes docker-test/throughput/Dockerfile | 39 +++ docker-test/throughput/build.sh | 16 ++ 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 0 -> 56832 bytes docker-test/throughput/liblwip.so | Bin 0 -> 333696 bytes docker-test/throughput/zerotier-cli | Bin 0 -> 741168 bytes docker-test/throughput/zerotier-one | Bin 0 -> 741168 bytes netcon/NetconEthernetTap.cpp | 6 +- 34 files changed, 700 insertions(+), 700 deletions(-) create mode 100644 docker-test/._.DS_Store delete mode 100644 docker-test/Dockerfile delete mode 100644 docker-test/entrypoint.sh delete mode 100644 docker-test/htdocs/ZeroTierIcon.png delete mode 100644 docker-test/htdocs/index.html delete mode 100644 docker-test/httpd.conf create mode 100644 docker-test/httpd_demo/Dockerfile create mode 100644 docker-test/httpd_demo/entrypoint.sh create mode 100644 docker-test/httpd_demo/htdocs/ZeroTierIcon.png create mode 100644 docker-test/httpd_demo/htdocs/index.html create mode 100644 docker-test/httpd_demo/httpd.conf create mode 100755 docker-test/httpd_demo/intercept create mode 100755 docker-test/httpd_demo/lib/libintercept.so.1.0 delete mode 100755 docker-test/intercept delete mode 100755 docker-test/lib/libintercept.so.1.0 delete mode 100644 docker-test/throughput-test/Dockerfile delete mode 100755 docker-test/throughput-test/build.sh delete mode 100644 docker-test/throughput-test/entrypoint.sh delete mode 100644 docker-test/throughput-test/generate_file.sh delete mode 100755 docker-test/throughput-test/intercept delete mode 100755 docker-test/throughput-test/libintercept.so.1.0 delete mode 100755 docker-test/throughput-test/liblwip.so delete mode 100755 docker-test/throughput-test/zerotier-cli delete mode 100755 docker-test/throughput-test/zerotier-one create mode 100644 docker-test/throughput/Dockerfile create mode 100755 docker-test/throughput/build.sh create mode 100644 docker-test/throughput/entrypoint.sh create mode 100644 docker-test/throughput/generate_file.sh create mode 100755 docker-test/throughput/intercept create mode 100755 docker-test/throughput/libintercept.so.1.0 create mode 100755 docker-test/throughput/liblwip.so create mode 100755 docker-test/throughput/zerotier-cli create mode 100755 docker-test/throughput/zerotier-one diff --git a/docker-test/._.DS_Store b/docker-test/._.DS_Store new file mode 100644 index 00000000..c9f90aab Binary files /dev/null and b/docker-test/._.DS_Store differ diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile deleted file mode 100644 index a5de2140..00000000 --- a/docker-test/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# A basic harnessed application example using ZeroTier-One and user-space IP stack -FROM fedora:20 - -MAINTAINER https://www.zerotier.com/ - -# Install Apache -RUN yum -y update && yum clean all -RUN yum -y install httpd && yum clean all - -# Add files -ADD zerotier-one / -ADD zerotier-cli / -ADD intercept / -ADD lib/libintercept.so.1.0 / -ADD lib/liblwip.so / -ADD htdocs/index.html / -ADD htdocs/ZeroTierIcon.png / - -RUN cp libintercept.so.1.0 lib/libintercept.so.1.0 -RUN cp liblwip.so lib/liblwip.so - -# Install sys-call intercept library -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 - -RUN echo "Apache" >> /var/www/html/index.html -EXPOSE 9993/udp - -RUN mv index.html /var/www/html/index.html -RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png - -# Start ZeroTier-One -RUN mkdir -p /var/lib/zerotier-one/networks.d -RUN touch /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf - -ADD entrypoint.sh /entrypoint.sh -RUN chmod -v +x /entrypoint.sh -CMD ["./entrypoint.sh"] diff --git a/docker-test/entrypoint.sh b/docker-test/entrypoint.sh deleted file mode 100644 index 3e8845b4..00000000 --- a/docker-test/entrypoint.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/ - -echo '***' -echo '*** ZeroTier Network Containers Preview' -echo '*** https://www.zerotier.com/' -echo '***' -echo '*** Starting ZeroTier network container host...' - -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' -#/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/8056c2e21c000001.conf ]; do - sleep 0.2 -done -while [ -z "$virtip4" ]; do - sleep 0.2 - virtip4=`/zerotier-cli listnetworks | grep -F 8056c2e21c000001 | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` -done - -echo '*** Starting Apache...' - -echo '***' -echo '*** Up and running at' $virtip4 '-- join network 8056c2e21c000001 and try:' -echo '*** > ping' $virtip4 -echo -n '*** > curl http://' -echo -n $virtip4 -echo '/' -echo '***' -echo "*** Be (a little) patient. It'll probably take 1-2 minutes to be reachable." -echo '***' -echo '*** Follow https://www.zerotier.com/blog for news and release announcements!' -echo '***' - -#while /bin/true; do -# sleep 1000000 -#done - -sleep 0.5 -rm -rf /run/httpd/* /tmp/httpd* -intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1 diff --git a/docker-test/htdocs/ZeroTierIcon.png b/docker-test/htdocs/ZeroTierIcon.png deleted file mode 100644 index 4d9641b3..00000000 Binary files a/docker-test/htdocs/ZeroTierIcon.png and /dev/null differ diff --git a/docker-test/htdocs/index.html b/docker-test/htdocs/index.html deleted file mode 100644 index 017e4493..00000000 --- a/docker-test/htdocs/index.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - ZeroTier Network Containers Preview - - - -

- -
-
-
-
-

ZeroTier Network Containers Preview

- (a.k.a. super bleeding edge pre-alphe pre-release demo) -
-
-
- -
-
-
- -
- -

This page is being served from a Docker container with its own private TCP/IP microservice.

- -

-It's connected to a virtual network, but if you "docker exec" into it and look around you won't find any special devices. No special privileges or configuration changes on the Docker host were needed. Everything is completely "stock" and completely self-contained. -

- -

-There's nothing special about the web server. It's just Apache. There's nothing special about the Linux image. It's based on a regular Fedora Docker base image. Other than Apache, the only thing this image contains is the ZeroTier network containers microservice and dynamic library. -

- -

-When Apache is run, our launcher script configures it to load a special dynamic library. This library intercepts calls to the Linux C networking API, redirecting network I/O to our private network stack microservice instead of the standard Linux kernel network path. This microservice takes care of the rest, automatically encapsulating traffic and sending it over the virtual network instead of the physical. -

- -

-It's a bit like how networking would work on a microkernel: modular, composable, portable, and independent. -

- -

-Network Containers allows a Docker (or LXC, CoreOS/rkt, runc, OpenVZ, SmartOS/Triton, bocker, or even just bare metal Linux) system to connect to virtual networks without requiring any special permissions or special configuration on the host node. Processes inside the container don't even need to run with root permissions. It's 100% user-space, making it ideal for multi-tenant deployments or any other situation where modifying the configuration of the host node is impossible or just inconvenient. -

- -

-Once properly tuned and optimized, Network Containers also has the potential to be much faster than tun/tap or pcap based network overlays. It imposes only a single context switch from application/service to virtual network microservice as opposed to at least four for tun/tap and pcap-based solutions, since the latter require two trips through the kernel network stack. We believe it may be possible to approach or even equal the performance of VXLAN/IPSec or other fully kernel-mode configurations, but with the ease and total independence of a fully container-based solution. -

- -

-We created this container image to show you a preview of one of the projects we've been working on at ZeroTier. We still have a good deal of packaging, testing, and performance optimization work to do before Network Containers will be ready for a real public beta release. Follow the blog or @zerotier for updates and announcements. -

- -

-P.S. If you want to use ZeroTier in Docker today, you can do it with the same ZeroTier One endpoint service you're using to access this network. The only catch is that you have to launch your containers with "--device=/dev/net/tun --cap-add=NET_ADMIN". Network Containers eliminates the need for these special options. -

- -
- -
- - - diff --git a/docker-test/httpd.conf b/docker-test/httpd.conf deleted file mode 100644 index 5f6f7107..00000000 --- a/docker-test/httpd.conf +++ /dev/null @@ -1,358 +0,0 @@ -# -# This is the main Apache HTTP server configuration file. It contains the -# configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# -# for a discussion of each configuration directive. -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so 'log/access_log' -# with ServerRoot set to '/www' will be interpreted by the -# server as '/www/log/access_log', where as '/log/access_log' will be -# interpreted as '/log/access_log'. - -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# Do not add a slash at the end of the directory path. If you point -# ServerRoot at a non-local disk, be sure to specify a local disk on the -# Mutex directive, if file-based mutexes are used. If you wish to share the -# same ServerRoot for multiple httpd daemons, you will need to change at -# least PidFile. -# -ServerRoot "/etc/httpd" - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, instead of the default. See also the -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses. -# -Listen 172.30.238.26:80 - -KeepAlive off - - - - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -#LoadModule mpm_worker_module /usr/lib64/httpd/modules/worker.so -# -Include conf.modules.d/*.conf - -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# It is usually good practice to create a dedicated user and group for -# running httpd, as with most system services. -# -User apache -Group apache - -# 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# definition. These values also provide defaults for -# any containers you may define later in the file. -# -# All of these directives may appear inside containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. admin@your-domain.com -# -ServerAdmin root@localhost - -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# -#ServerName www.example.com:80 - -# -# Deny access to the entirety of your server's filesystem. You must -# explicitly permit access to web content directories in other -# blocks below. -# - - AllowOverride none - Require all denied - - -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "/var/www/html" - -# -# Relax access to content within /var/www. -# - - AllowOverride None - # Allow open access: - Require all granted - - -# Further relax access to the default document root: - - # - # Possible values for the Options directive are "None", "All", - # or any combination of: - # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews - # - # Note that "MultiViews" must be named *explicitly* --- "Options All" - # doesn't give it to you. - # - # The Options directive is both complicated and important. Please see - # http://httpd.apache.org/docs/2.4/mod/core.html#options - # for more information. - # - Options Indexes FollowSymLinks - - # - # AllowOverride controls what directives may be placed in .htaccess files. - # It can be "All", "None", or any combination of the keywords: - # Options FileInfo AuthConfig Limit - # - AllowOverride None - - # - # Controls who can get stuff from this server. - # - Require all granted - - -# -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# - - DirectoryIndex index.html - - -# -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. -# - - Require all denied - - -# -# ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a -# container, that host's errors will be logged there and not here. -# -ErrorLog "logs/error_log" - -# -# LogLevel: Control the number of messages logged to the error_log. -# Possible values include: debug, info, notice, warn, error, crit, -# alert, emerg. -# -LogLevel warn - - - # - # The following directives define some format nicknames for use with - # a CustomLog directive (see below). - # - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined - LogFormat "%h %l %u %t \"%r\" %>s %b" common - - - # You need to enable mod_logio.c to use %I and %O - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - - - # - # The location and format of the access logfile (Common Logfile Format). - # If you do not define any access logfiles within a - # container, they will be logged here. Contrariwise, if you *do* - # define per- access logfiles, transactions will be - # logged therein and *not* in this file. - # - #CustomLog "logs/access_log" common - - # - # If you prefer a logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # - CustomLog "logs/access_log" combined - - - - # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client - # will make a new request for the document at its new location. - # Example: - # Redirect permanent /foo http://www.example.com/bar - - # - # Alias: Maps web paths into filesystem paths and is used to - # access content that does not live under the DocumentRoot. - # Example: - # Alias /webpath /full/filesystem/path - # - # If you include a trailing / on /webpath then the server will - # require it to be present in the URL. You will also likely - # need to provide a section to allow access to - # the filesystem path. - - # - # ScriptAlias: This controls which directories contain server scripts. - # ScriptAliases are essentially the same as Aliases, except that - # documents in the target directory are treated as applications and - # run by the server when requested rather than as documents sent to the - # client. The same rules about trailing "/" apply to ScriptAlias - # directives as to Alias. - # - ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" - - - -# -# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# - - AllowOverride None - Options None - Require all granted - - - - # - # TypesConfig points to the file containing the list of mappings from - # filename extension to MIME-type. - # - TypesConfig /etc/mime.types - - # - # AddType allows you to add to or override the MIME configuration - # file specified in TypesConfig for specific file types. - # - #AddType application/x-gzip .tgz - # - # AddEncoding allows you to have certain browsers uncompress - # information on the fly. Note: Not all browsers support this. - # - #AddEncoding x-compress .Z - #AddEncoding x-gzip .gz .tgz - # - # If the AddEncoding directives above are commented-out, then you - # probably should define those extensions to indicate media types: - # - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - # - # AddHandler allows you to map certain file extensions to "handlers": - # actions unrelated to filetype. These can be either built into the server - # or added with the Action directive (see below) - # - # To use CGI scripts outside of ScriptAliased directories: - # (You will also need to add "ExecCGI" to the "Options" directive.) - # - #AddHandler cgi-script .cgi - - # For type maps (negotiated resources): - #AddHandler type-map var - - # - # Filters allow you to process content before it is sent to the client. - # - # To parse .shtml files for server-side includes (SSI): - # (You will also need to add "Includes" to the "Options" directive.) - # - AddType text/html .shtml - AddOutputFilter INCLUDES .shtml - - -# -# Specify a default charset for all content served; this enables -# interpretation of all content as UTF-8 by default. To use the -# default browser choice (ISO-8859-1), or to allow the META tags -# in HTML content to override this choice, comment out this -# directive: -# -AddDefaultCharset UTF-8 - - - # - # The mod_mime_magic module allows the server to use various hints from the - # contents of the file itself to determine its type. The MIMEMagicFile - # directive tells the module where the hint definitions are located. - # - MIMEMagicFile conf/magic - - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# EnableMMAP and EnableSendfile: On systems that support it, -# memory-mapping or the sendfile syscall may be used to deliver -# files. This usually improves server performance, but must -# be turned off when serving from networked-mounted -# filesystems or if support for these functions is otherwise -# broken on your system. -# Defaults if commented: EnableMMAP On, EnableSendfile Off -# -#EnableMMAP off -EnableSendfile on - -# Supplemental configuration -# -# Load config files in the "/etc/httpd/conf.d" directory, if any. -IncludeOptional conf.d/*.conf diff --git a/docker-test/httpd_demo/Dockerfile b/docker-test/httpd_demo/Dockerfile new file mode 100644 index 00000000..a5de2140 --- /dev/null +++ b/docker-test/httpd_demo/Dockerfile @@ -0,0 +1,39 @@ +# A basic harnessed application example using ZeroTier-One and user-space IP stack +FROM fedora:20 + +MAINTAINER https://www.zerotier.com/ + +# Install Apache +RUN yum -y update && yum clean all +RUN yum -y install httpd && yum clean all + +# Add files +ADD zerotier-one / +ADD zerotier-cli / +ADD intercept / +ADD lib/libintercept.so.1.0 / +ADD lib/liblwip.so / +ADD htdocs/index.html / +ADD htdocs/ZeroTierIcon.png / + +RUN cp libintercept.so.1.0 lib/libintercept.so.1.0 +RUN cp liblwip.so lib/liblwip.so + +# Install sys-call intercept library +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 + +RUN echo "Apache" >> /var/www/html/index.html +EXPOSE 9993/udp + +RUN mv index.html /var/www/html/index.html +RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png + +# Start ZeroTier-One +RUN mkdir -p /var/lib/zerotier-one/networks.d +RUN touch /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf + +ADD entrypoint.sh /entrypoint.sh +RUN chmod -v +x /entrypoint.sh +CMD ["./entrypoint.sh"] diff --git a/docker-test/httpd_demo/entrypoint.sh b/docker-test/httpd_demo/entrypoint.sh new file mode 100644 index 00000000..3e8845b4 --- /dev/null +++ b/docker-test/httpd_demo/entrypoint.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/ + +echo '***' +echo '*** ZeroTier Network Containers Preview' +echo '*** https://www.zerotier.com/' +echo '***' +echo '*** Starting ZeroTier network container host...' + +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' +#/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/8056c2e21c000001.conf ]; do + sleep 0.2 +done +while [ -z "$virtip4" ]; do + sleep 0.2 + virtip4=`/zerotier-cli listnetworks | grep -F 8056c2e21c000001 | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` +done + +echo '*** Starting Apache...' + +echo '***' +echo '*** Up and running at' $virtip4 '-- join network 8056c2e21c000001 and try:' +echo '*** > ping' $virtip4 +echo -n '*** > curl http://' +echo -n $virtip4 +echo '/' +echo '***' +echo "*** Be (a little) patient. It'll probably take 1-2 minutes to be reachable." +echo '***' +echo '*** Follow https://www.zerotier.com/blog for news and release announcements!' +echo '***' + +#while /bin/true; do +# sleep 1000000 +#done + +sleep 0.5 +rm -rf /run/httpd/* /tmp/httpd* +intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1 diff --git a/docker-test/httpd_demo/htdocs/ZeroTierIcon.png b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png new file mode 100644 index 00000000..4d9641b3 Binary files /dev/null and b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png differ diff --git a/docker-test/httpd_demo/htdocs/index.html b/docker-test/httpd_demo/htdocs/index.html new file mode 100644 index 00000000..017e4493 --- /dev/null +++ b/docker-test/httpd_demo/htdocs/index.html @@ -0,0 +1,69 @@ + + + + + + + + ZeroTier Network Containers Preview + + + +

+ +
+
+
+
+

ZeroTier Network Containers Preview

+ (a.k.a. super bleeding edge pre-alphe pre-release demo) +
+
+
+ +
+
+
+ +
+ +

This page is being served from a Docker container with its own private TCP/IP microservice.

+ +

+It's connected to a virtual network, but if you "docker exec" into it and look around you won't find any special devices. No special privileges or configuration changes on the Docker host were needed. Everything is completely "stock" and completely self-contained. +

+ +

+There's nothing special about the web server. It's just Apache. There's nothing special about the Linux image. It's based on a regular Fedora Docker base image. Other than Apache, the only thing this image contains is the ZeroTier network containers microservice and dynamic library. +

+ +

+When Apache is run, our launcher script configures it to load a special dynamic library. This library intercepts calls to the Linux C networking API, redirecting network I/O to our private network stack microservice instead of the standard Linux kernel network path. This microservice takes care of the rest, automatically encapsulating traffic and sending it over the virtual network instead of the physical. +

+ +

+It's a bit like how networking would work on a microkernel: modular, composable, portable, and independent. +

+ +

+Network Containers allows a Docker (or LXC, CoreOS/rkt, runc, OpenVZ, SmartOS/Triton, bocker, or even just bare metal Linux) system to connect to virtual networks without requiring any special permissions or special configuration on the host node. Processes inside the container don't even need to run with root permissions. It's 100% user-space, making it ideal for multi-tenant deployments or any other situation where modifying the configuration of the host node is impossible or just inconvenient. +

+ +

+Once properly tuned and optimized, Network Containers also has the potential to be much faster than tun/tap or pcap based network overlays. It imposes only a single context switch from application/service to virtual network microservice as opposed to at least four for tun/tap and pcap-based solutions, since the latter require two trips through the kernel network stack. We believe it may be possible to approach or even equal the performance of VXLAN/IPSec or other fully kernel-mode configurations, but with the ease and total independence of a fully container-based solution. +

+ +

+We created this container image to show you a preview of one of the projects we've been working on at ZeroTier. We still have a good deal of packaging, testing, and performance optimization work to do before Network Containers will be ready for a real public beta release. Follow the blog or @zerotier for updates and announcements. +

+ +

+P.S. If you want to use ZeroTier in Docker today, you can do it with the same ZeroTier One endpoint service you're using to access this network. The only catch is that you have to launch your containers with "--device=/dev/net/tun --cap-add=NET_ADMIN". Network Containers eliminates the need for these special options. +

+ +
+ +
+ + + diff --git a/docker-test/httpd_demo/httpd.conf b/docker-test/httpd_demo/httpd.conf new file mode 100644 index 00000000..5f6f7107 --- /dev/null +++ b/docker-test/httpd_demo/httpd.conf @@ -0,0 +1,358 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so 'log/access_log' +# with ServerRoot set to '/www' will be interpreted by the +# server as '/www/log/access_log', where as '/log/access_log' will be +# interpreted as '/log/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/etc/httpd" + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +Listen 172.30.238.26:80 + +KeepAlive off + + + + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +#LoadModule mpm_worker_module /usr/lib64/httpd/modules/worker.so +# +Include conf.modules.d/*.conf + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User apache +Group apache + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/var/www/html" + +# +# Relax access to content within /var/www. +# + + AllowOverride None + # Allow open access: + Require all granted + + +# Further relax access to the default document root: + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/error_log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog "logs/access_log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + + + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig /etc/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + + + # + # The mod_mime_magic module allows the server to use various hints from the + # contents of the file itself to determine its type. The MIMEMagicFile + # directive tells the module where the hint definitions are located. + # + MIMEMagicFile conf/magic + + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults if commented: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +EnableSendfile on + +# Supplemental configuration +# +# Load config files in the "/etc/httpd/conf.d" directory, if any. +IncludeOptional conf.d/*.conf diff --git a/docker-test/httpd_demo/intercept b/docker-test/httpd_demo/intercept new file mode 100755 index 00000000..3eb27ff7 --- /dev/null +++ b/docker-test/httpd_demo/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/httpd_demo/lib/libintercept.so.1.0 b/docker-test/httpd_demo/lib/libintercept.so.1.0 new file mode 100755 index 00000000..61826641 Binary files /dev/null and b/docker-test/httpd_demo/lib/libintercept.so.1.0 differ diff --git a/docker-test/intercept b/docker-test/intercept deleted file mode 100755 index 3eb27ff7..00000000 --- a/docker-test/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/lib/libintercept.so.1.0 b/docker-test/lib/libintercept.so.1.0 deleted file mode 100755 index 61826641..00000000 Binary files a/docker-test/lib/libintercept.so.1.0 and /dev/null differ diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput-test/Dockerfile deleted file mode 100644 index 71549754..00000000 --- a/docker-test/throughput-test/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-test/build.sh b/docker-test/throughput-test/build.sh deleted file mode 100755 index 586c8931..00000000 --- a/docker-test/throughput-test/build.sh +++ /dev/null @@ -1,16 +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-test - -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-test/entrypoint.sh b/docker-test/throughput-test/entrypoint.sh deleted file mode 100644 index 00fdd2be..00000000 --- a/docker-test/throughput-test/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-test/generate_file.sh b/docker-test/throughput-test/generate_file.sh deleted file mode 100644 index fd84de32..00000000 --- a/docker-test/throughput-test/generate_file.sh +++ /dev/null @@ -1 +0,0 @@ -dd if=/dev/urandom of=/var/www/html/bigfile bs=100M count=1 diff --git a/docker-test/throughput-test/intercept b/docker-test/throughput-test/intercept deleted file mode 100755 index 3eb27ff7..00000000 --- a/docker-test/throughput-test/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-test/libintercept.so.1.0 b/docker-test/throughput-test/libintercept.so.1.0 deleted file mode 100755 index 7a451408..00000000 Binary files a/docker-test/throughput-test/libintercept.so.1.0 and /dev/null differ diff --git a/docker-test/throughput-test/liblwip.so b/docker-test/throughput-test/liblwip.so deleted file mode 100755 index 158169f1..00000000 Binary files a/docker-test/throughput-test/liblwip.so and /dev/null differ diff --git a/docker-test/throughput-test/zerotier-cli b/docker-test/throughput-test/zerotier-cli deleted file mode 100755 index 020ee665..00000000 Binary files a/docker-test/throughput-test/zerotier-cli and /dev/null differ diff --git a/docker-test/throughput-test/zerotier-one b/docker-test/throughput-test/zerotier-one deleted file mode 100755 index 020ee665..00000000 Binary files a/docker-test/throughput-test/zerotier-one and /dev/null differ diff --git a/docker-test/throughput/Dockerfile b/docker-test/throughput/Dockerfile new file mode 100644 index 00000000..71549754 --- /dev/null +++ b/docker-test/throughput/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/build.sh b/docker-test/throughput/build.sh new file mode 100755 index 00000000..586c8931 --- /dev/null +++ b/docker-test/throughput/build.sh @@ -0,0 +1,16 @@ +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-test + +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 new file mode 100644 index 00000000..00fdd2be --- /dev/null +++ b/docker-test/throughput/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/generate_file.sh b/docker-test/throughput/generate_file.sh new file mode 100644 index 00000000..fd84de32 --- /dev/null +++ b/docker-test/throughput/generate_file.sh @@ -0,0 +1 @@ +dd if=/dev/urandom of=/var/www/html/bigfile bs=100M count=1 diff --git a/docker-test/throughput/intercept b/docker-test/throughput/intercept new file mode 100755 index 00000000..3eb27ff7 --- /dev/null +++ b/docker-test/throughput/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/libintercept.so.1.0 b/docker-test/throughput/libintercept.so.1.0 new file mode 100755 index 00000000..7a451408 Binary files /dev/null and b/docker-test/throughput/libintercept.so.1.0 differ diff --git a/docker-test/throughput/liblwip.so b/docker-test/throughput/liblwip.so new file mode 100755 index 00000000..158169f1 Binary files /dev/null and b/docker-test/throughput/liblwip.so differ diff --git a/docker-test/throughput/zerotier-cli b/docker-test/throughput/zerotier-cli new file mode 100755 index 00000000..020ee665 Binary files /dev/null and b/docker-test/throughput/zerotier-cli differ diff --git a/docker-test/throughput/zerotier-one b/docker-test/throughput/zerotier-one new file mode 100755 index 00000000..020ee665 Binary files /dev/null and b/docker-test/throughput/zerotier-one differ diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index e17acbbf..b4e4eaaf 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -928,12 +928,12 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb) */ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len) { - dwr(5, " nc_sent()\n"); + //dwr(5, " nc_sent()\n"); Larg *l = (Larg*)arg; if(len) { l->conn->acked+=len; //dwr("W = %d, A = %d\n", l->conn->written, l->conn->acked); - dwr("ACK = %d\n", len); + //dwr("ACK = %d\n", len); l->tap->_phy.setNotifyReadable(l->conn->dataSock, true); l->tap->_phy.whack(); } @@ -1356,7 +1356,7 @@ void NetconEthernetTap::handle_connect(PhySocket *sock, void **uptr, struct conn void NetconEthernetTap::handle_write(TcpConnection *conn) { - dwr(5, " handle_write()\n"); + //dwr(5, " handle_write()\n"); float max = (float)TCP_SND_BUF; int r; -- cgit v1.2.3