diff options
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rwxr-xr-x | src/configure | 28 | ||||
| -rw-r--r-- | src/linux/tunDevice.cpp | 68 | ||||
| -rw-r--r-- | src/linux/tunDevice.h | 63 | ||||
| -rw-r--r-- | src/ovpn/tunDevice.cpp (renamed from src/tunDevice.cpp) | 0 | ||||
| -rw-r--r-- | src/ovpn/tunDevice.h (renamed from src/tunDevice.h) | 0 |
6 files changed, 163 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index a1f102e..8046245 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,7 +18,7 @@ ifeq ($(TARGET),OpenBSD) LDFLAGS += -L/usr/local/lib endif - +ifndef NOOVPN OPENVPNDEPS = openvpn/tun.o \ openvpn/error.o \ openvpn/socket.o \ @@ -42,6 +42,7 @@ OPENVPNDEPS = openvpn/tun.o \ openvpn/base64.o \ openvpn/shaper.o \ openvpn/fragment.o +endif SOCKETDEPS = Sockets/libSockets.a @@ -287,14 +288,19 @@ anyrtpproxy: anytun @cd anyrtpproxy ; $(MAKE) distclean: cleanall +ifndef NOOVPN $(MAKE) --directory=$(CURDIR)/openvpn distclean +endif find . -name *.o -exec rm -f {} \; rm -f config.sub config.guess + rm -f tunDevice.cpp tunDevice.h cleanall: clean $(MAKE) --directory=$(CURDIR)/man clean $(MAKE) --directory=$(CURDIR)/Sockets clean +ifndef NOOVPN $(MAKE) --directory=$(CURDIR)/openvpn clean +endif rm -f Sockets/libSockets.a Sockets/Sockets-config clean: diff --git a/src/configure b/src/configure index 11cf0e1..9f6ff4b 100755 --- a/src/configure +++ b/src/configure @@ -1,5 +1,27 @@ #!/bin/sh -cd openvpn -./configure --disable-lzo --disable-crypto -cd .. +TARGET=$1 +if [ -z "$TARGET" ]; then + TARGET="ovpn" +fi + +case $TARGET in + linux) + rm -rf tunDevice.cpp + rm -rf tunDevice.h + ln -sf linux/tunDevice.cpp + ln -sf linux/tunDevice.h + ;; + ovpn) + rm -rf tunDevice.cpp + rm -rf tunDevice.cpp + ln -sf ovpn/tunDevice.cpp + ln -sf ovpn/tunDevice.h + cd openvpn + ./configure --disable-lzo --disable-crypto + cd .. + ;; + *) + echo "Usage: $0 (linux|ovpn)" + ;; +esac diff --git a/src/linux/tunDevice.cpp b/src/linux/tunDevice.cpp new file mode 100644 index 0000000..1d07826 --- /dev/null +++ b/src/linux/tunDevice.cpp @@ -0,0 +1,68 @@ +/* + * anytun + * + * The secure anycast tunneling protocol (satp) defines a protocol used + * for communication between any combination of unicast and anycast + * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel + * mode and allows tunneling of every ETHER TYPE protocol (e.g. + * ethernet, ip, arp ...). satp directly includes cryptography and + * message authentication based on the methodes used by SRTP. It is + * intended to deliver a generic, scaleable and secure solution for + * tunneling and relaying of packets of any protocol. + * + * + * Copyright (C) 2007 anytun.org <satp@wirdorange.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * 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 (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "tunDevice.h" +#include "threadUtils.hpp" + +TunDevice::TunDevice(const char* dev_name,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp) +{ + +} + +TunDevice::~TunDevice() +{ + +} + +short TunDevice::read(u_int8_t* buf, u_int32_t len) +{ + return 0; +} + +int TunDevice::write(u_int8_t* buf, u_int32_t len) +{ + return 0; +} + +char* TunDevice::getActualName() +{ + return NULL; +} + +u_int32_t TunDevice::getType() +{ + return TYPE_UNDEF; +} + +const char* TunDevice::getTypeString() +{ + return NULL; +} + diff --git a/src/linux/tunDevice.h b/src/linux/tunDevice.h new file mode 100644 index 0000000..ae286f7 --- /dev/null +++ b/src/linux/tunDevice.h @@ -0,0 +1,63 @@ +/* + * anytun + * + * The secure anycast tunneling protocol (satp) defines a protocol used + * for communication between any combination of unicast and anycast + * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel + * mode and allows tunneling of every ETHER TYPE protocol (e.g. + * ethernet, ip, arp ...). satp directly includes cryptography and + * message authentication based on the methodes used by SRTP. It is + * intended to deliver a generic, scaleable and secure solution for + * tunneling and relaying of packets of any protocol. + * + * + * Copyright (C) 2007 anytun.org <satp@wirdorange.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * 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 (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TUNDEVICE_H_ +#define _TUNDEVICE_H_ + +#include "buffer.h" +#include "threadUtils.hpp" + +class TunDevice +{ +public: + static const u_int32_t TYPE_UNDEF = 0; + static const u_int32_t TYPE_TUN = 1; + static const u_int32_t TYPE_TAP = 2; + + TunDevice(const char* dev,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp); + ~TunDevice(); + + void open(); + void close(); + bool isOpen(); + + short read(u_int8_t* buf, u_int32_t len); + int write(u_int8_t* buf, u_int32_t len); + + char* getActualName(); + u_int32_t getType(); + const char* getTypeString(); + +private: + void operator=(const TunDevice &src); + TunDevice(const TunDevice &src); +}; + +#endif diff --git a/src/tunDevice.cpp b/src/ovpn/tunDevice.cpp index b3c07b0..b3c07b0 100644 --- a/src/tunDevice.cpp +++ b/src/ovpn/tunDevice.cpp diff --git a/src/tunDevice.h b/src/ovpn/tunDevice.h index af08132..af08132 100644 --- a/src/tunDevice.h +++ b/src/ovpn/tunDevice.h |