Combined make-linux.mk and make-intercept.mk's installer section

make-linux.mk

@@ -99,12 +99,22 @@ one:	$(OBJS) one.o
 
 netcon: $(OBJS) one.o
 	# Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) 	-DZT_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -o zerotier-netcon-service $(OBJS) one.o $(LDLIBS) -ldl
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -o zerotier-netcon-service $(OBJS) one.o $(LDLIBS) -ldl
 	# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
 	cd netcon ; make -f make-liblwip.mk
 	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
 	cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o ../libzerotierintercept.so Intercept.c
 
+install-intercept:
+	cp libzerotierintercept.so /lib/libzerotierintercept.so
+	ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+	/usr/bin/install -c netcon/zerotier-intercept /usr/bin
+
+uninstall-intercept:
+	rm -r /lib/libzerotierintercept.so
+	rm -r /lib/libzerotierintercept
+	rm -r /usr/bin/zerotier-intercept
+
 selftest:	$(OBJS) selftest.o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS)
 	$(STRIP) zerotier-selftest

netcon/README.md

@@ -42,6 +42,7 @@ It is *likely* to work with other things but there are no guarantees. UDP, ICMP/
 Network Containers are currently only for Linux. To build the network container host and intercept library, from the base of the ZeroTier One tree type:
 
     make netcon
+    make install-intercept
 
 This will build a binary called *zerotier-netcon-service* and a library called *libzerotierintercept.so*. The former is the same as a regular ZeroTier One build except instead of creating virtual network ports using Linux's */dev/net/tun* interface, it instead creates instances of a user-space TCP/IP stack for each virtual network and provides RPC access to this stack via a Unix domain socket called */tmp/.ztnc_##NETWORK_ID##*. The latter is a library that can be loaded with the Linux *LD\_PRELOAD* environment variable or by placement into */etc/ld.so.preload* on a Linux system or container.
 
@@ -98,10 +99,11 @@ Or for CentOS/EPEL or Fedora:
 Now try:
 
     export LD_PRELOAD=/path/to/ZeroTierOne/libzerotierintercept.so
-		export ZT_NC_NWID=8056c2e21c000001
+	export ZT_NC_NWID=8056c2e21c000001
+	zerotier-intercept httpd
 
 
-Going to port 8080 on your machine won't work. Httpd is listening, but only inside the network container. To reach it, go to the other system where you joined the same network with a conventional ZeroTier instance and try:
+Going to port 80 on your machine won't work. Httpd is listening, but only inside the network container. To reach it, go to the other system where you joined the same network with a conventional ZeroTier instance and try:
 
     curl http://NETCON.INSTANCE.IP:8080/README.md
 

netcon/README.orig.md

@@ -1,139 +0,0 @@
-ZeroTier Network Containers
-======
-
-### Functional Overview:
-
-This system exists as a dynamically-linked library, and a service/IP-stack built into ZeroTier
-
-If you care about the technicals,
-
-The intercept is compiled as a shared library and installed in some user-accessible directory. When you want to intercept
-a user application you dynamically link the shared library to the application during runtime. When the application starts, the
-intercept's global constructor is called which sets up a hidden pipe which is used to communicate remote procedure calls (RPC) to the host Netcon service running in the background.
-
-When an RPC for a socket() is received by the Netcon service from the intercepted application, the Netcon service will ask the lwIP stack for a new PCB structure (used to represent a connection), if the system permits its allocation, it will be passed to Netcon where a PCB/socket table entry will be created. The table is used for mapping [callbacks from lwIP] and [RPCs from the intercept] to the correct connections.
-
-Upon the first call to a intercept-overriden system call, a Unix-domain socket is opened between the Netcon service and the application's intercept. This socket provides us the ability to pass file descriptors of newly-created socketpairs to the intercept (used as the read/write buffer). More specifically, after the socketpair creation, one end is kept in a table entry in Netcon and one end is sent to the intercept.
-
-### Building from Source (and Installing)
-
-Build zerotier-intercept library:
-
-    make -f make-intercept.mk
-
-Install:
-
-    make -f make-intercept.mk install
-
-Build LWIP library:
-
-    make -f make-liblwip.mk
-
-Run automated tests (from netcon/docker-test/ directory):
-
-    ./build.sh
-    ./test.sh
-
-
-
-
-### Running
-
-To intercept a specific application (requires an already running instance of Zerotier-One with Network Containers enabled):
-
-    zerotier-intercept my_app
-
-
-### Unit Tests
-
-To run unit tests:
-
-1) Set up your own network, use its network id as follows:
-
-2) Place a blank network config file in this directory (e.g. "e5cd7a9e1c5311ab.conf")
- - This will be used to inform test-specific scripts what network to use for testing
-
-3) run build.sh
- - Builds ZeroTier-One with Network Containers enabled
- - Builds LWIP library
- - Builds intercept library
- - Copies all aformentioned files into unit test directory to be used for building docker files
-
-4) run test.sh
- - Will execute each unit test's (test.sh) one at a time and populate _results/
-
-
-### Anatomy of a unit test
-
-A) Each unit test's test.sh will:
- - temporarily copy all built files into local directory
- - build test container
- - build monitor container
- - remove temporary files
- - run each container and perform test and monitoring specified in netcon_entrypoint.sh and monitor_entrypoint.sh
-
-B) Results will be written to the 'netcon/docker-test/_results/' directory
- - Results will be a combination of raw and formatted dumps to files whose names reflect the test performed
- - In the event of failure, 'FAIL.' will be appended to the result file's name
-  - (e.g. FAIL.my_application_1.0.2.x86_64)
- - In the event of success, 'OK.' will be appended
-
-
-### Compatibility
-
-Network Containers have been tested with the following:
-
-	sshd                     [ WORKS as of 20151112]
-	ssh                      [ WORKS as of 20151112]
-	sftp                     [ WORKS as of 20151022]
-	curl                     [ WORKS as of 20151021]
-	apache (debug mode)      [ WORKS as of 20150810]
-	apache (prefork MPM)     [ WORKS as of 20151123] (2.4.6-31.x86-64 on Centos 7), (2.4.16-1.x84-64 on F22), (2.4.17-3.x86-64 on F22)
-	nginx                    [ WORKS as of 20151123] Broken on Centos 7, unreliable on Fedora 23
-	nodejs                   [ WORKS as of 20151123]
-	java                     [ WORKS as of 20151010]
-	MongoDB                  [ WORKS as of 20151028]
-	Redis-server             [ WORKS as of 20151123]
-
-Future:
-
-	GET many different files via HTTP (web stress)
-	LARGE continuous transfer (e.g. /dev/urandom all night)
-	Open and close many TCP connections constantly
-	Simulate packet loss (can be done with iptables)
-	Many parallel TCP transfers
-	Multithreaded software (e.g. apache in thread mode)
-	UDP support
-
-
-
-### Extended Version Notes
-
-20151028 Added MongoDB support:
-
-	- Added logic (RPC_MAP_REQ) to check whether a given AF_LOCAL socket is mapped to anything
-	inside the service instance.
-
-20151027 Added Redis-server support:
-
-	- Added extra logic to detect socket re-issuing and consequent service-side double mapping.
-	Redis appears to try to set its initial listen socket to IPV6 only, this currently fails. As
-	a result, Redis will close the socket and re-open it. The server will now test for closures
-	during mapping and will eliminate any mappings to broken pipes.
-
-20151021 Added Node.js support:
-
-	- syscall(long number, ...) is now intercepted and re-directs the __NR_accept4 call to our intercepted accept4() function
-
-	- accept() now returns -EAGAIN in the case that we cannot read a signal byte from the descriptor linked to the service. This
-	is because the uv__server_io() function in libuv used by Node.js looks for this return value upon failure, without it we
-	were observing an innfinite loop in the I/O polling code in libuv.
-
-	- accept4() now correctly sets given flags for descriptor returned by accept()
-
-	- setsockopt() was modified to return success on any call with the following conditions:
-	level == IPPROTO_TCP || (level == SOL_SOCKET && option_name == SO_KEEPALIVE)
-	This might be unnecessary or might need a better workaround
-
-	- Careful attention should be given to how arguments are passed in the intercepted syscall() function, this differs for
-	32/64-bit systems

netcon/make-intercept.mk

@@ -1,50 +0,0 @@
-#
-# ZeroTier One - Network Virtualization Everywhere
-# Copyright (C) 2011-2015  ZeroTier, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# --
-#
-# ZeroTier may be used and distributed under the terms of the GPLv3, which
-# are available at: http://www.gnu.org/licenses/gpl-3.0.html
-#
-# If you would like to embed ZeroTier into a commercial application or
-# redistribute it in a modified binary form, please contact ZeroTier Networks
-# LLC. Start here: http://www.zerotier.com/
-#
-
-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
-COMMON = Common
-OBJS= Intercept.o
-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 $(LIBS)
-
-install:
-	cp ../libzerotierintercept.so /lib/libzerotierintercept.so
-	ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
-	/usr/bin/install -c zerotier-intercept /usr/bin
-
-uninstall:
-	rm -r /lib/libzerotierintercept.so
-	rm -r /lib/libzerotierintercept
-	rm -r /usr/bin/zerotier-intercept