diff options
Diffstat (limited to 'netcon')
| -rw-r--r-- | netcon/NetconEthernetTap.cpp | 4 | ||||
| -rw-r--r-- | netcon/NetconEthernetTap.hpp | 4 | ||||
| -rwxr-xr-x | netcon/docker-test/zerotier-cli | bin | 747928 -> 0 bytes | |||
| -rwxr-xr-x | netcon/docker-test/zerotier-intercept | 54 | ||||
| -rwxr-xr-x | netcon/docker-test/zerotier-one | bin | 747928 -> 0 bytes | |||
| -rw-r--r-- | netcon/make-intercept.mk | 53 |
6 files changed, 0 insertions, 115 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index 3f772883..f33e7ffa 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/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 diff --git a/netcon/NetconEthernetTap.hpp b/netcon/NetconEthernetTap.hpp index dd51a19d..f6fdb6e1 100644 --- a/netcon/NetconEthernetTap.hpp +++ b/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 diff --git a/netcon/docker-test/zerotier-cli b/netcon/docker-test/zerotier-cli Binary files differdeleted file mode 100755 index 95e82b3d..00000000 --- a/netcon/docker-test/zerotier-cli +++ /dev/null diff --git a/netcon/docker-test/zerotier-intercept b/netcon/docker-test/zerotier-intercept deleted file mode 100755 index 85e9fba1..00000000 --- a/netcon/docker-test/zerotier-intercept +++ /dev/null @@ -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 diff --git a/netcon/docker-test/zerotier-one b/netcon/docker-test/zerotier-one Binary files differdeleted file mode 100755 index 95e82b3d..00000000 --- a/netcon/docker-test/zerotier-one +++ /dev/null diff --git a/netcon/make-intercept.mk b/netcon/make-intercept.mk deleted file mode 100644 index 71d6d4dc..00000000 --- a/netcon/make-intercept.mk +++ /dev/null @@ -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 |