Merge of netcon with edge and unification of make processes.

netcon/NetconEthernetTap.cpp

@@ -25,8 +25,6 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifdef ZT_ENABLE_NETCON
-
 #include <algorithm>
 #include <utility>
 #include <dlfcn.h>
@@ -1551,5 +1549,3 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
 }
 
 } // namespace ZeroTier
-
-#endif // ZT_ENABLE_NETCON

netcon/NetconEthernetTap.hpp

@@ -28,8 +28,6 @@
 #ifndef ZT_NETCONETHERNETTAP_HPP
 #define ZT_NETCONETHERNETTAP_HPP
 
-#ifdef ZT_ENABLE_NETCON
-
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -182,6 +180,4 @@ private:
 
 } // namespace ZeroTier
 
-#endif // ZT_ENABLE_NETCON
-
 #endif

netcon/docker-test/zerotier-intercept

@@ -1,54 +0,0 @@
-#!/bin/sh
-# usage:
-# /usr/bin/intercept program <args>
-
-if [ $# = 0 ] ; then
-   echo "$0: insufficient arguments"
-   exit
-fi
-
-case "$1" in
-	on)
-		if [ -z "$LD_PRELOAD" ]
-			then
-				export LD_PRELOAD="/lib/libzerotierintercept.so.1.0"
-			else
-				echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
-				export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
-		fi
-	;;
-	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libzerotierintercept.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/libzerotierintercept.so.1.0"
-		else
-			echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libzerotierintercept.so.1.0 $LD_PRELOAD"
-		fi
-
-		if [ $# = 0 ]
-		then
-			${SHELL:-/bin/sh}
-		fi
-
-		if [ $# -gt 0 ]
-		then
-			exec "$@"
-		fi
-	;;
-esac
-
-#EOF

netcon/make-intercept.mk

@@ -1,53 +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
-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)
-
-install:
-	cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
-	ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
-	/usr/bin/install -c zerotier-intercept /usr/bin
-
-uninstall:
-	rm -r /lib/libzerotierintercept.so.1.0
-	rm -r /lib/libzerotierintercept
-	rm -r /usr/bin/zerotier-intercept