From 70268b03c27052c7560df3a8ad0744c53dd41fb6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 8 May 2008 20:21:27 +0000 Subject: added own tun device implementation for linux --- src/Makefile | 8 ++- src/configure | 28 +++++++- src/linux/tunDevice.cpp | 68 +++++++++++++++++++ src/linux/tunDevice.h | 63 ++++++++++++++++++ src/ovpn/tunDevice.cpp | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ovpn/tunDevice.h | 66 +++++++++++++++++++ src/tunDevice.cpp | 172 ------------------------------------------------ src/tunDevice.h | 66 ------------------- 8 files changed, 401 insertions(+), 242 deletions(-) create mode 100644 src/linux/tunDevice.cpp create mode 100644 src/linux/tunDevice.h create mode 100644 src/ovpn/tunDevice.cpp create mode 100644 src/ovpn/tunDevice.h delete mode 100644 src/tunDevice.cpp delete mode 100644 src/tunDevice.h 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 + * + * 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 + * + * 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/ovpn/tunDevice.cpp b/src/ovpn/tunDevice.cpp new file mode 100644 index 0000000..b3c07b0 --- /dev/null +++ b/src/ovpn/tunDevice.cpp @@ -0,0 +1,172 @@ +/* + * 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 + * + * 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 +#include + +extern "C" { +#include "openvpn/config.h" +#include "openvpn/syshead.h" +#include "openvpn/tun.h" +} + +#include "tunDevice.h" +#include "threadUtils.hpp" + + +TunDevice::TunDevice(const char* dev_name,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp) +{ + dev_ = NULL; + +// init_tun (const char *dev, /* --dev option */ +// const char *dev_type, /* --dev-type option */ +// const char *ifconfig_local_parm, /* --ifconfig parm 1 */ +// const char *ifconfig_remote_netmask_parm, /* --ifconfig parm 2 */ +// in_addr_t local_public, +// in_addr_t remote_public, +// const bool strict_warn, +// struct env_set *es) + +// init_tun_post (struct tuntap *tt, +// const struct frame *frame, +// const struct tuntap_options *options) + +// open_tun (const char *dev, +// const char *dev_type, +// const char *dev_node, +// bool ipv6, +// struct tuntap *tt) + +// ------------------------------------------- + +// c->c1.tuntap = init_tun (c->options.dev, +// c->options.dev_type, +// c->options.ifconfig_local, +// c->options.ifconfig_remote_netmask, +// addr_host (&c->c1.link_socket_addr.local), +// addr_host (&c->c1.link_socket_addr.remote), +// !c->options.ifconfig_nowarn, +// c->c2.es); + +// init_tun_post (c->c1.tuntap, +// &c->c2.frame, +// &c->options.tuntap_options); + +// open_tun (c->options.dev, +// c->options.dev_type, +// c->options.dev_node, +// c->options.tun_ipv6, +// c->c1.tuntap); + + + + in_addr_t lp, rp; + +// lp = inet_addr("192.168.198.1"); +// rp = inet_addr("192.168.199.1"); + + dev_ = init_tun(dev_name, dev_type, ifcfg_lp, ifcfg_rnmp, lp, rp, 0, NULL); + struct frame frame; + struct tuntap_options options; + +#ifdef TARGET_LINUX + options.txqueuelen = 100; +#endif + + init_tun_post(dev_, &frame, &options); + if(!dev_) + throw std::runtime_error("can't init tun/tap device"); + + open_tun (dev_name, NULL, NULL, true, dev_); + do_ifconfig(dev_, dev_->actual_name, 1400, NULL); +} + +TunDevice::~TunDevice() +{ + if(dev_) + close_tun(dev_); +} + +short TunDevice::read(u_int8_t* buf, u_int32_t len) +{ + if(!dev_) + return -1; + + struct pollfd pfd[1]; + pfd[0].fd = tun_event_handle(dev_); + pfd[0].events = POLLIN | POLLPRI; + pfd[0].revents = 0; + poll(pfd, 1, -1); + Lock lock(io_mutex_); + return read_tun(dev_, buf, len); +} + +int TunDevice::write(u_int8_t* buf, u_int32_t len) +{ + if(!dev_) + return -1; + Lock lock(io_mutex_); + return write_tun(dev_, buf, len); +} + +char* TunDevice::getActualName() +{ + if(!dev_) + return NULL; + + return dev_->actual_name; +} + +u_int32_t TunDevice::getType() +{ + if(!dev_) + return TYPE_UNDEF; + + switch(dev_->type) + { + case DEV_TYPE_TUN: return TYPE_TUN; + case DEV_TYPE_TAP: return TYPE_TAP; + } + return TYPE_UNDEF; +} + +const char* TunDevice::getTypeString() +{ + if(!dev_) + return NULL; + + switch(dev_->type) + { + case DEV_TYPE_UNDEF: return "undef"; break; + case DEV_TYPE_TUN: return "tun"; break; + case DEV_TYPE_TAP: return "tap"; break; + } + return NULL; +} diff --git a/src/ovpn/tunDevice.h b/src/ovpn/tunDevice.h new file mode 100644 index 0000000..af08132 --- /dev/null +++ b/src/ovpn/tunDevice.h @@ -0,0 +1,66 @@ +/* + * 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 + * + * 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); + + Mutex io_mutex_; + struct tuntap *dev_; +}; + +#endif diff --git a/src/tunDevice.cpp b/src/tunDevice.cpp deleted file mode 100644 index b3c07b0..0000000 --- a/src/tunDevice.cpp +++ /dev/null @@ -1,172 +0,0 @@ -/* - * 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 - * - * 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 -#include - -extern "C" { -#include "openvpn/config.h" -#include "openvpn/syshead.h" -#include "openvpn/tun.h" -} - -#include "tunDevice.h" -#include "threadUtils.hpp" - - -TunDevice::TunDevice(const char* dev_name,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp) -{ - dev_ = NULL; - -// init_tun (const char *dev, /* --dev option */ -// const char *dev_type, /* --dev-type option */ -// const char *ifconfig_local_parm, /* --ifconfig parm 1 */ -// const char *ifconfig_remote_netmask_parm, /* --ifconfig parm 2 */ -// in_addr_t local_public, -// in_addr_t remote_public, -// const bool strict_warn, -// struct env_set *es) - -// init_tun_post (struct tuntap *tt, -// const struct frame *frame, -// const struct tuntap_options *options) - -// open_tun (const char *dev, -// const char *dev_type, -// const char *dev_node, -// bool ipv6, -// struct tuntap *tt) - -// ------------------------------------------- - -// c->c1.tuntap = init_tun (c->options.dev, -// c->options.dev_type, -// c->options.ifconfig_local, -// c->options.ifconfig_remote_netmask, -// addr_host (&c->c1.link_socket_addr.local), -// addr_host (&c->c1.link_socket_addr.remote), -// !c->options.ifconfig_nowarn, -// c->c2.es); - -// init_tun_post (c->c1.tuntap, -// &c->c2.frame, -// &c->options.tuntap_options); - -// open_tun (c->options.dev, -// c->options.dev_type, -// c->options.dev_node, -// c->options.tun_ipv6, -// c->c1.tuntap); - - - - in_addr_t lp, rp; - -// lp = inet_addr("192.168.198.1"); -// rp = inet_addr("192.168.199.1"); - - dev_ = init_tun(dev_name, dev_type, ifcfg_lp, ifcfg_rnmp, lp, rp, 0, NULL); - struct frame frame; - struct tuntap_options options; - -#ifdef TARGET_LINUX - options.txqueuelen = 100; -#endif - - init_tun_post(dev_, &frame, &options); - if(!dev_) - throw std::runtime_error("can't init tun/tap device"); - - open_tun (dev_name, NULL, NULL, true, dev_); - do_ifconfig(dev_, dev_->actual_name, 1400, NULL); -} - -TunDevice::~TunDevice() -{ - if(dev_) - close_tun(dev_); -} - -short TunDevice::read(u_int8_t* buf, u_int32_t len) -{ - if(!dev_) - return -1; - - struct pollfd pfd[1]; - pfd[0].fd = tun_event_handle(dev_); - pfd[0].events = POLLIN | POLLPRI; - pfd[0].revents = 0; - poll(pfd, 1, -1); - Lock lock(io_mutex_); - return read_tun(dev_, buf, len); -} - -int TunDevice::write(u_int8_t* buf, u_int32_t len) -{ - if(!dev_) - return -1; - Lock lock(io_mutex_); - return write_tun(dev_, buf, len); -} - -char* TunDevice::getActualName() -{ - if(!dev_) - return NULL; - - return dev_->actual_name; -} - -u_int32_t TunDevice::getType() -{ - if(!dev_) - return TYPE_UNDEF; - - switch(dev_->type) - { - case DEV_TYPE_TUN: return TYPE_TUN; - case DEV_TYPE_TAP: return TYPE_TAP; - } - return TYPE_UNDEF; -} - -const char* TunDevice::getTypeString() -{ - if(!dev_) - return NULL; - - switch(dev_->type) - { - case DEV_TYPE_UNDEF: return "undef"; break; - case DEV_TYPE_TUN: return "tun"; break; - case DEV_TYPE_TAP: return "tap"; break; - } - return NULL; -} diff --git a/src/tunDevice.h b/src/tunDevice.h deleted file mode 100644 index af08132..0000000 --- a/src/tunDevice.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 - * - * 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); - - Mutex io_mutex_; - struct tuntap *dev_; -}; - -#endif -- cgit v1.2.3