From 6f1742b504d08a097f220c5562c02e107dc7af83 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 12 Apr 2008 12:38:51 +0000 Subject: cleaned up confusing names for different options --- src/Makefile | 22 ++-- src/anyConfOptions.cpp | 317 ++++++++++++++++++++++++++++++++++++++++++++++++ src/anyConfOptions.h | 108 +++++++++++++++++ src/anyCtrOptions.cpp | 303 +++++++++++++++++++++++++++++++++++++++++++++ src/anyCtrOptions.h | 99 +++++++++++++++ src/anyCtrSocket.cpp | 49 ++++++++ src/anyCtrSocket.h | 27 +++++ src/anyctrOptions.cpp | 317 ------------------------------------------------ src/anyctrOptions.h | 108 ----------------- src/anymuxOptions.cpp | 303 --------------------------------------------- src/anymuxOptions.h | 99 --------------- src/anytun-config.cpp | 2 +- src/anytun-controld.cpp | 4 +- src/muxSocket.cpp | 49 -------- src/muxSocket.h | 27 ----- 15 files changed, 917 insertions(+), 917 deletions(-) create mode 100644 src/anyConfOptions.cpp create mode 100644 src/anyConfOptions.h create mode 100644 src/anyCtrOptions.cpp create mode 100644 src/anyCtrOptions.h create mode 100644 src/anyCtrSocket.cpp create mode 100644 src/anyCtrSocket.h delete mode 100644 src/anyctrOptions.cpp delete mode 100644 src/anyctrOptions.h delete mode 100644 src/anymuxOptions.cpp delete mode 100644 src/anymuxOptions.h delete mode 100644 src/muxSocket.cpp delete mode 100644 src/muxSocket.h diff --git a/src/Makefile b/src/Makefile index f71f6f2..7d54ac1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -82,13 +82,13 @@ OBJS = tunDevice.o \ $(OPENVPNDEPS) \ $(SOCKETDEPS) -ANYMUXOBJS = muxSocket.o \ - anymuxOptions.o \ +ANYCTROBJS = anyCtrSocket.o \ + anyCtrOptions.o \ signalController.o \ log.o \ $(SOCKETDEPS) -ANYCTROBJS = log.o \ +ANYCONFOBJS = log.o \ buffer.o \ keyDerivation.o \ mpi.o \ @@ -103,7 +103,7 @@ ANYCTROBJS = log.o \ anyrtpproxy/callIdQueue.o \ syncRtpCommand.o \ PracticalSocket.o \ - anyctrOptions.o \ + anyConfOptions.o \ router.o \ routingTable.o \ seqWindow.o \ @@ -127,11 +127,11 @@ anytun: $(OBJS) anytun.o anytun-showtables: $(OBJS) anytun-showtables.o $(LD) $(OBJS) anytun-showtables.o -o $@ $(LDFLAGS) -anytun-config: $(ANYCTROBJS) anytun-config.o - $(LD) $(ANYCTROBJS) anytun-config.o -o $@ $(LDFLAGS) +anytun-config: $(ANYCONFOBJS) anytun-config.o + $(LD) $(ANYCONFOBJS) anytun-config.o -o $@ $(LDFLAGS) -anytun-controld: $(ANYMUXOBJS) anytun-controld.o - $(LD) $(ANYMUXOBJS) anytun-controld.o -o $@ $(LDFLAGS) +anytun-controld: $(ANYCTROBJS) anytun-controld.o + $(LD) $(ANYCTROBJS) anytun-controld.o -o $@ $(LDFLAGS) tunDevice.o: tunDevice.cpp tunDevice.h $(C++) $(CCFLAGS) $< -c @@ -163,13 +163,13 @@ encryptedPacket.o: encryptedPacket.cpp encryptedPacket.h buffer.h cipher.o: cipher.cpp cipher.h buffer.h $(C++) $(CCFLAGS) $< -c -muxSocket.o: muxSocket.cpp muxSocket.h +anyCtrSocket.o: anyCtrSocket.cpp anyCtrSocket.h $(C++) $(CCFLAGS) $< -c -anymuxOptions.o: anymuxOptions.cpp anymuxOptions.h +anyCtrOptions.o: anyCtrOptions.cpp anyCtrOptions.h $(C++) $(CCFLAGS) $< -c -anyctrOptions.o: anyctrOptions.cpp anyctrOptions.h +anyConfOptions.o: anyConfOptions.cpp anyConfOptions.h $(C++) $(CCFLAGS) $< -c authAlgo.o: authAlgo.cpp authAlgo.h buffer.h diff --git a/src/anyConfOptions.cpp b/src/anyConfOptions.cpp new file mode 100644 index 0000000..bde873a --- /dev/null +++ b/src/anyConfOptions.cpp @@ -0,0 +1,317 @@ +/* + * 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 +#include +#include + +#include "datatypes.h" +#include "anyConfOptions.h" + +Options* Options::inst = NULL; +Mutex Options::instMutex; +Options& gOpt = Options::instance(); + +Options& Options::instance() +{ + Lock lock(instMutex); + static instanceCleaner c; + if(!inst) + inst = new Options(); + + return *inst; +} + +Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0)) +{ + progname_ = "anytun-config"; + remote_addr_ = ""; + remote_port_ = 4444; + seq_window_size_ = 100; + kd_prf_ = "aes-ctr"; + mux_ = 0; +} + +Options::~Options() +{ +} + +#define PARSE_BOOL_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + VALUE = true; + +#define PARSE_INVERSE_BOOL_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + VALUE = false; + +#define PARSE_SCALAR_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + std::stringstream tmp; \ + tmp << argv[i+1]; \ + tmp >> VALUE; \ + argc--; \ + i++; \ + } + +#define PARSE_SCALAR_PARAM2(SHORT, LONG, VALUE1, VALUE2) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 2 || \ + argv[i+1][0] == '-' || argv[i+2][0] == '-') \ + return false; \ + std::stringstream tmp; \ + tmp << argv[i+1] << " " << argv[i+2]; \ + tmp >> VALUE1; \ + tmp >> VALUE2; \ + argc-=2; \ + i+=2; \ + } + +#define PARSE_HEXSTRING_PARAM_SEC(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + VALUE = Buffer(std::string(argv[i+1])); \ + for(size_t j=0; j < strlen(argv[i+1]); ++j) \ + argv[i+1][j] = '#'; \ + argc--; \ + i++; \ + } + +#define PARSE_CSLIST_PARAM(SHORT, LONG, LIST) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + std::stringstream tmp(argv[i+1]); \ + while (tmp.good()) \ + { \ + std::string tmp_line; \ + getline(tmp,tmp_line,','); \ + LIST.push(tmp_line); \ + } \ + argc--; \ + i++; \ + } + +bool Options::parse(int argc, char* argv[]) +{ + Lock lock(mutex); + + progname_ = argv[0]; + argc--; + std::queue route_queue; + for(int i=1; argc > 0; ++i) + { + std::string str(argv[i]); + argc--; + + if(str == "-h" || str == "--help") + return false; + PARSE_SCALAR_PARAM("-r","--remote-host", remote_addr_) + PARSE_SCALAR_PARAM("-o","--remote-port", remote_port_) + PARSE_SCALAR_PARAM("-w","--window-size", seq_window_size_) + PARSE_SCALAR_PARAM("-m","--mux", mux_) + PARSE_HEXSTRING_PARAM_SEC("-K","--key", key_) + PARSE_HEXSTRING_PARAM_SEC("-A","--salt", salt_) + PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_) + PARSE_CSLIST_PARAM("-R","--route", route_queue) + else + return false; + } + + while(!route_queue.empty()) + { + std::stringstream tmp_stream(route_queue.front()); + OptionRoute rt; + getline(tmp_stream,rt.net_addr,'/'); + if(!tmp_stream.good()) + return false; + tmp_stream >> rt.prefix_length; + route_queue.pop(); + routes_.push_back(rt); + } + return true; +} + +void Options::printUsage() +{ + std::cout << "USAGE:" << std::endl; + std::cout << "anytun-config" << std::endl; + std::cout << " [-h|--help] prints this..." << std::endl; + std::cout << " [-r|--remote-host] remote host" << std::endl; + std::cout << " [-o|--remote-port] remote port" << std::endl; + std::cout << " [-w|--window-size] seqence number window size" << std::endl; + std::cout << " [-m|--mux] the multiplex id to use" << std::endl; + std::cout << " [-K|--key] master key to use for encryption" << std::endl; + std::cout << " [-A|--salt] master salt to use for encryption" << std::endl; +// std::cout << " [-k|--kd-prf] key derivation pseudo random function" << std::endl; + std::cout << " [-R|--route] add a route to connection, can be invoked several times" << std::endl; +} + +void Options::printOptions() +{ + Lock lock(mutex); + std::cout << "Options:" << std::endl; + std::cout << "remote_addr='" << remote_addr_ << "'" << std::endl; + std::cout << "remote_port='" << remote_port_ << "'" << std::endl; + std::cout << "seq_window_size='" << seq_window_size_ << "'" << std::endl; + std::cout << "mux_id='" << mux_ << "'" << std::endl; + std::cout << "key=" << key_.getHexDumpOneLine() << std::endl; + std::cout << "salt=" << salt_.getHexDumpOneLine() << std::endl; + std::cout << "kd_prf='" << kd_prf_ << "'" << std::endl; + + std::cout << "routes:" << std::endl; + RouteList::const_iterator rit; + for(rit = routes_.begin(); rit != routes_.end(); ++rit) + std::cout << " " << rit->net_addr << "/" << rit->prefix_length << std::endl; +} + +std::string Options::getProgname() +{ + Lock lock(mutex); + return progname_; +} + + +Options& Options::setProgname(std::string p) +{ + Lock lock(mutex); + progname_ = p; + return *this; +} + + +std::string Options::getRemoteAddr() +{ + Lock lock(mutex); + return remote_addr_; +} + +Options& Options::setRemoteAddr(std::string r) +{ + Lock lock(mutex); + remote_addr_ = r; + return *this; +} + +u_int16_t Options::getRemotePort() +{ + return remote_port_; +} + +Options& Options::setRemotePort(u_int16_t r) +{ + remote_port_ = r; + return *this; +} + +Options& Options::setRemoteAddrPort(std::string addr, u_int16_t port) +{ + Lock lock(mutex); + remote_addr_ = addr; + remote_port_ = port; + return *this; +} + +window_size_t Options::getSeqWindowSize() +{ + return seq_window_size_; +} + +Options& Options::setSeqWindowSize(window_size_t s) +{ + seq_window_size_ = s; + return *this; +} + + +std::string Options::getKdPrf() +{ + Lock lock(mutex); + return kd_prf_; +} + +Options& Options::setKdPrf(std::string k) +{ + Lock lock(mutex); + kd_prf_ = k; + return *this; +} + +u_int16_t Options::getMux() +{ + Lock lock(mutex); + return mux_; +} + +Options& Options::setMux(u_int16_t m) +{ + Lock lock(mutex); + mux_ = m; + return *this; +} + +Buffer Options::getKey() +{ + Lock lock(mutex); + return key_; +} + +Options& Options::setKey(std::string k) +{ + Lock lock(mutex); + key_ = k; + return *this; +} + +Buffer Options::getSalt() +{ + Lock lock(mutex); + return salt_; +} + +Options& Options::setSalt(std::string s) +{ + Lock lock(mutex); + salt_ = s; + return *this; +} + +RouteList Options::getRoutes() +{ + Lock lock(mutex); + return routes_; +} diff --git a/src/anyConfOptions.h b/src/anyConfOptions.h new file mode 100644 index 0000000..bea749b --- /dev/null +++ b/src/anyConfOptions.h @@ -0,0 +1,108 @@ +/* + * 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 _ANY_CONF_OPTIONS_H_ +#define _ANY_CONF_OPTIONS_H_ + +#include "datatypes.h" +#include "buffer.h" +#include "threadUtils.hpp" +#include + +typedef struct OptionRoute +{ + std::string net_addr; + uint16_t prefix_length; +}; + +typedef std::list RouteList; + +class Options +{ +public: + static Options& instance(); + + bool parse(int argc, char* argv[]); + void printUsage(); + void printOptions(); + + std::string getProgname(); + Options& setProgname(std::string p); + std::string getRemoteAddr(); + Options& setRemoteAddr(std::string r); + u_int16_t getRemotePort(); + Options& setRemotePort(u_int16_t r); + Options& setRemoteAddrPort(std::string addr, u_int16_t port); + + window_size_t getSeqWindowSize(); + Options& setSeqWindowSize(window_size_t s); + std::string getKdPrf(); + Options& setKdPrf(std::string k); + Options& setMux(u_int16_t m); + u_int16_t getMux(); + Options& setKey(std::string k); + Buffer getKey(); + Options& setSalt(std::string s); + Buffer getSalt(); + RouteList getRoutes(); + +private: + Options(); + ~Options(); + Options(const Options &l); + void operator=(const Options &l); + + static Options* inst; + static Mutex instMutex; + class instanceCleaner { + public: ~instanceCleaner() { + if(Options::inst != 0) + delete Options::inst; + } + }; + friend class instanceCleaner; + + Mutex mutex; + + std::string progname_; + std::string remote_addr_; + u_int16_t remote_port_; + window_size_t seq_window_size_; + std::string kd_prf_; + u_int16_t mux_; + Buffer key_; + Buffer salt_; + + RouteList routes_; +}; + +extern Options& gOpt; + +#endif diff --git a/src/anyCtrOptions.cpp b/src/anyCtrOptions.cpp new file mode 100644 index 0000000..4f03031 --- /dev/null +++ b/src/anyCtrOptions.cpp @@ -0,0 +1,303 @@ +/* + * 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 +#include +#include + +#include "datatypes.h" +#include "anyCtrOptions.h" + +Options* Options::inst = NULL; +Mutex Options::instMutex; +Options& gOpt = Options::instance(); + +Options& Options::instance() +{ + Lock lock(instMutex); + static instanceCleaner c; + if(!inst) + inst = new Options(); + + return *inst; +} + +Options::Options() +{ + progname_ = "anytun-controld"; + file_name_ = ""; + daemonize_ = true; + chroot_ = false; + username_ = "nobody"; + chroot_dir_ = "/var/run/anytun-controld"; + pid_file_ = ""; + bind_to_addr_ = "127.0.0.1"; + bind_to_port_ = 4445; +} + +Options::~Options() +{ +} + +#define PARSE_BOOL_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + VALUE = true; + +#define PARSE_INVERSE_BOOL_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + VALUE = false; + +#define PARSE_SCALAR_PARAM(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + std::stringstream tmp; \ + tmp << argv[i+1]; \ + tmp >> VALUE; \ + argc--; \ + i++; \ + } + +#define PARSE_SCALAR_PARAM2(SHORT, LONG, VALUE1, VALUE2) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 2 || \ + argv[i+1][0] == '-' || argv[i+2][0] == '-') \ + return false; \ + std::stringstream tmp; \ + tmp << argv[i+1] << " " << argv[i+2]; \ + tmp >> VALUE1; \ + tmp >> VALUE2; \ + argc-=2; \ + i+=2; \ + } + +#define PARSE_HEXSTRING_PARAM_SEC(SHORT, LONG, VALUE) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + VALUE = Buffer(std::string(argv[i+1])); \ + for(size_t j=0; j < strlen(argv[i+1]); ++j) \ + argv[i+1][j] = '#'; \ + argc--; \ + i++; \ + } + +#define PARSE_CSLIST_PARAM(SHORT, LONG, LIST) \ + else if(str == SHORT || str == LONG) \ + { \ + if(argc < 1 || argv[i+1][0] == '-') \ + return false; \ + std::stringstream tmp(argv[i+1]); \ + while (tmp.good()) \ + { \ + std::string tmp_line; \ + getline(tmp,tmp_line,','); \ + LIST.push(tmp_line); \ + } \ + argc--; \ + i++; \ + } + +bool Options::parse(int argc, char* argv[]) +{ + Lock lock(mutex); + + progname_ = argv[0]; + argc--; + + std::string control_host(""); + for(int i=1; argc > 0; ++i) + { + std::string str(argv[i]); + argc--; + + if(str == "-h" || str == "--help") + return false; + PARSE_SCALAR_PARAM("-f","--file", file_name_) + PARSE_INVERSE_BOOL_PARAM("-D","--nodaemonize", daemonize_) + PARSE_BOOL_PARAM("-C","--chroot", chroot_) + PARSE_SCALAR_PARAM("-u","--username", username_) + PARSE_SCALAR_PARAM("-H","--chroot-dir", chroot_dir_) + PARSE_SCALAR_PARAM("-P","--write-pid", pid_file_) + PARSE_SCALAR_PARAM("-X","--control-host", control_host) + else + return false; + } + + if(control_host != "") { + std::stringstream tmp_stream(control_host); + getline(tmp_stream,bind_to_addr_,':'); + if(!tmp_stream.good()) + return false; + tmp_stream >> bind_to_port_; + } + + return true; +} + +void Options::printUsage() +{ + std::cout << "USAGE:" << std::endl; + std::cout << "anytun-controld [-h|--help] prints this..." << std::endl; + std::cout << " [-D|--nodaemonize] don't run in background" << std::endl; + std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl; + std::cout << " [-u|--username] if chroot change to this user" << std::endl; + std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; + std::cout << " [-P|--write-pid] write pid to this file" << std::endl; + std::cout << " [-f|--file] path to file" << std::endl; + +} + +void Options::printOptions() +{ + Lock lock(mutex); + std::cout << "Options:" << std::endl; + std::cout << "daemonize=" << daemonize_ << std::endl; + std::cout << "chroot=" << chroot_ << std::endl; + std::cout << "username='" << username_ << "'" << std::endl; + std::cout << "chroot_dir='" << chroot_dir_ << "'" << std::endl; + std::cout << "pid_file='" << pid_file_ << "'" << std::endl; +} + +std::string Options::getProgname() +{ + Lock lock(mutex); + return progname_; +} + + +Options& Options::setProgname(std::string p) +{ + Lock lock(mutex); + progname_ = p; + return *this; +} + +bool Options::getDaemonize() +{ + return daemonize_; +} + +Options& Options::setDaemonize(bool d) +{ + daemonize_ = d; + return *this; +} + +bool Options::getChroot() +{ + return chroot_; +} + +Options& Options::setChroot(bool c) +{ + chroot_ = c; + return *this; +} + +std::string Options::getUsername() +{ + Lock lock(mutex); + return username_; +} + +Options& Options::setUsername(std::string u) +{ + Lock lock(mutex); + username_ = u; + return *this; +} + +std::string Options::getChrootDir() +{ + Lock lock(mutex); + return chroot_dir_; +} + +Options& Options::setChrootDir(std::string c) +{ + Lock lock(mutex); + chroot_dir_ = c; + return *this; +} + +std::string Options::getPidFile() +{ + Lock lock(mutex); + return pid_file_; +} + +Options& Options::setPidFile(std::string p) +{ + Lock lock(mutex); + pid_file_ = p; + return *this; +} + +std::string Options::getFileName() +{ + Lock lock(mutex); + return file_name_; +} + +Options& Options::setFileName(std::string f) +{ + Lock lock(mutex); + file_name_ = f; + return *this; +} + +std::string Options::getBindToAddr() +{ + Lock lock(mutex); + return bind_to_addr_; +} + +Options& Options::setBindToAddr(std::string b) +{ + Lock lock(mutex); + bind_to_addr_ = b; + return *this; +} + +uint16_t Options::getBindToPort() +{ + return bind_to_port_; +} + +Options& Options::setBindToPort(uint16_t b) +{ + bind_to_port_ = b; + return *this; +} diff --git a/src/anyCtrOptions.h b/src/anyCtrOptions.h new file mode 100644 index 0000000..933e9f2 --- /dev/null +++ b/src/anyCtrOptions.h @@ -0,0 +1,99 @@ +/* + * 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 _ANY_CTR_OPTIONS_H_ +#define _ANY_CTR_OPTIONS_H_ + +#include "datatypes.h" +#include "buffer.h" +#include "threadUtils.hpp" +#include + +class Options +{ +public: + static Options& instance(); + + bool parse(int argc, char* argv[]); + void printUsage(); + void printOptions(); + + std::string getProgname(); + Options& setProgname(std::string p); + bool getDaemonize(); + Options& setDaemonize(bool d); + bool getChroot(); + Options& setChroot(bool b); + std::string getUsername(); + Options& setUsername(std::string u); + std::string getChrootDir(); + Options& setChrootDir(std::string c); + std::string getPidFile(); + Options& setPidFile(std::string p); + std::string getFileName(); + Options& setFileName(std::string f); + std::string getBindToAddr(); + Options& setBindToAddr(std::string b); + uint16_t getBindToPort(); + Options& setBindToPort(uint16_t b); + + +private: + Options(); + ~Options(); + Options(const Options &l); + void operator=(const Options &l); + + static Options* inst; + static Mutex instMutex; + class instanceCleaner { + public: ~instanceCleaner() { + if(Options::inst != 0) + delete Options::inst; + } + }; + friend class instanceCleaner; + + Mutex mutex; + + std::string bind_to_addr_; + uint16_t bind_to_port_; + std::string progname_; + bool daemonize_; + bool chroot_; + std::string username_; + std::string chroot_dir_; + std::string pid_file_; + std::string file_name_; +}; + +extern Options& gOpt; + +#endif diff --git a/src/anyCtrSocket.cpp b/src/anyCtrSocket.cpp new file mode 100644 index 0000000..d3bec07 --- /dev/null +++ b/src/anyCtrSocket.cpp @@ -0,0 +1,49 @@ +#include +#include +#include +#include + +#include "anyCtrOptions.h" + +#include "Sockets/Utility.h" +#include "anyCtrSocket.h" + + +#ifdef SOCKETS_NAMESPACE +using namespace SOCKETS_NAMESPACE; +#endif // SOCKETS_NAMESPACE + + +MuxSocket::MuxSocket(ISocketHandler& h) : TcpSocket(h), filename_(gOpt.getFileName()) +{ + SetConnectTimeout(12); +} + + +void MuxSocket::OnAccept() +{ + std::ifstream file(filename_.c_str()); + if( file.is_open() ) + { + std::string line; + while( !file.eof() ) + { + getline( file, line ); + Send( line ); + } + file.close(); + } + + //TODO Locking here +} + +//void StatusSocket::InitSSLServer() +//{ +// InitializeContext("server.pem", "keypwd", SSLv23_method()); +//} +// +// +//void StatusSocket::Init() +//{ +// EnableSSL(); +//} diff --git a/src/anyCtrSocket.h b/src/anyCtrSocket.h new file mode 100644 index 0000000..e32c45d --- /dev/null +++ b/src/anyCtrSocket.h @@ -0,0 +1,27 @@ +#ifndef _MUXSOCKET_H +#define _MUXSOCKET_H + +#include "Sockets/TcpSocket.h" +#include "Sockets/ISocketHandler.h" + +#ifdef SOCKETS_NAMESPACE +using namespace SOCKETS_NAMESPACE; +#endif // SOCKETS_NAMESPACE + + +class MuxSocket : public TcpSocket +{ +public: + MuxSocket(ISocketHandler&); + + void OnAccept(); +// void Init(); + +// void InitSSLServer(); + +private: + std::string filename_; +}; + + +#endif // _SYNCSOCKET_H diff --git a/src/anyctrOptions.cpp b/src/anyctrOptions.cpp deleted file mode 100644 index c8f29e7..0000000 --- a/src/anyctrOptions.cpp +++ /dev/null @@ -1,317 +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 -#include -#include - -#include "datatypes.h" -#include "anyctrOptions.h" - -Options* Options::inst = NULL; -Mutex Options::instMutex; -Options& gOpt = Options::instance(); - -Options& Options::instance() -{ - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) - inst = new Options(); - - return *inst; -} - -Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0)) -{ - progname_ = "anytun-config"; - remote_addr_ = ""; - remote_port_ = 4444; - seq_window_size_ = 100; - kd_prf_ = "aes-ctr"; - mux_ = 0; -} - -Options::~Options() -{ -} - -#define PARSE_BOOL_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - VALUE = true; - -#define PARSE_INVERSE_BOOL_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - VALUE = false; - -#define PARSE_SCALAR_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - std::stringstream tmp; \ - tmp << argv[i+1]; \ - tmp >> VALUE; \ - argc--; \ - i++; \ - } - -#define PARSE_SCALAR_PARAM2(SHORT, LONG, VALUE1, VALUE2) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 2 || \ - argv[i+1][0] == '-' || argv[i+2][0] == '-') \ - return false; \ - std::stringstream tmp; \ - tmp << argv[i+1] << " " << argv[i+2]; \ - tmp >> VALUE1; \ - tmp >> VALUE2; \ - argc-=2; \ - i+=2; \ - } - -#define PARSE_HEXSTRING_PARAM_SEC(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - VALUE = Buffer(std::string(argv[i+1])); \ - for(size_t j=0; j < strlen(argv[i+1]); ++j) \ - argv[i+1][j] = '#'; \ - argc--; \ - i++; \ - } - -#define PARSE_CSLIST_PARAM(SHORT, LONG, LIST) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - std::stringstream tmp(argv[i+1]); \ - while (tmp.good()) \ - { \ - std::string tmp_line; \ - getline(tmp,tmp_line,','); \ - LIST.push(tmp_line); \ - } \ - argc--; \ - i++; \ - } - -bool Options::parse(int argc, char* argv[]) -{ - Lock lock(mutex); - - progname_ = argv[0]; - argc--; - std::queue route_queue; - for(int i=1; argc > 0; ++i) - { - std::string str(argv[i]); - argc--; - - if(str == "-h" || str == "--help") - return false; - PARSE_SCALAR_PARAM("-r","--remote-host", remote_addr_) - PARSE_SCALAR_PARAM("-o","--remote-port", remote_port_) - PARSE_SCALAR_PARAM("-w","--window-size", seq_window_size_) - PARSE_SCALAR_PARAM("-m","--mux", mux_) - PARSE_HEXSTRING_PARAM_SEC("-K","--key", key_) - PARSE_HEXSTRING_PARAM_SEC("-A","--salt", salt_) - PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_) - PARSE_CSLIST_PARAM("-R","--route", route_queue) - else - return false; - } - - while(!route_queue.empty()) - { - std::stringstream tmp_stream(route_queue.front()); - OptionRoute rt; - getline(tmp_stream,rt.net_addr,'/'); - if(!tmp_stream.good()) - return false; - tmp_stream >> rt.prefix_length; - route_queue.pop(); - routes_.push_back(rt); - } - return true; -} - -void Options::printUsage() -{ - std::cout << "USAGE:" << std::endl; - std::cout << "anytun-config" << std::endl; - std::cout << " [-h|--help] prints this..." << std::endl; - std::cout << " [-r|--remote-host] remote host" << std::endl; - std::cout << " [-o|--remote-port] remote port" << std::endl; - std::cout << " [-w|--window-size] seqence number window size" << std::endl; - std::cout << " [-m|--mux] the multiplex id to use" << std::endl; - std::cout << " [-K|--key] master key to use for encryption" << std::endl; - std::cout << " [-A|--salt] master salt to use for encryption" << std::endl; -// std::cout << " [-k|--kd-prf] key derivation pseudo random function" << std::endl; - std::cout << " [-R|--route] add a route to connection, can be invoked several times" << std::endl; -} - -void Options::printOptions() -{ - Lock lock(mutex); - std::cout << "Options:" << std::endl; - std::cout << "remote_addr='" << remote_addr_ << "'" << std::endl; - std::cout << "remote_port='" << remote_port_ << "'" << std::endl; - std::cout << "seq_window_size='" << seq_window_size_ << "'" << std::endl; - std::cout << "mux_id='" << mux_ << "'" << std::endl; - std::cout << "key=" << key_.getHexDumpOneLine() << std::endl; - std::cout << "salt=" << salt_.getHexDumpOneLine() << std::endl; - std::cout << "kd_prf='" << kd_prf_ << "'" << std::endl; - - std::cout << "routes:" << std::endl; - RouteList::const_iterator rit; - for(rit = routes_.begin(); rit != routes_.end(); ++rit) - std::cout << " " << rit->net_addr << "/" << rit->prefix_length << std::endl; -} - -std::string Options::getProgname() -{ - Lock lock(mutex); - return progname_; -} - - -Options& Options::setProgname(std::string p) -{ - Lock lock(mutex); - progname_ = p; - return *this; -} - - -std::string Options::getRemoteAddr() -{ - Lock lock(mutex); - return remote_addr_; -} - -Options& Options::setRemoteAddr(std::string r) -{ - Lock lock(mutex); - remote_addr_ = r; - return *this; -} - -u_int16_t Options::getRemotePort() -{ - return remote_port_; -} - -Options& Options::setRemotePort(u_int16_t r) -{ - remote_port_ = r; - return *this; -} - -Options& Options::setRemoteAddrPort(std::string addr, u_int16_t port) -{ - Lock lock(mutex); - remote_addr_ = addr; - remote_port_ = port; - return *this; -} - -window_size_t Options::getSeqWindowSize() -{ - return seq_window_size_; -} - -Options& Options::setSeqWindowSize(window_size_t s) -{ - seq_window_size_ = s; - return *this; -} - - -std::string Options::getKdPrf() -{ - Lock lock(mutex); - return kd_prf_; -} - -Options& Options::setKdPrf(std::string k) -{ - Lock lock(mutex); - kd_prf_ = k; - return *this; -} - -u_int16_t Options::getMux() -{ - Lock lock(mutex); - return mux_; -} - -Options& Options::setMux(u_int16_t m) -{ - Lock lock(mutex); - mux_ = m; - return *this; -} - -Buffer Options::getKey() -{ - Lock lock(mutex); - return key_; -} - -Options& Options::setKey(std::string k) -{ - Lock lock(mutex); - key_ = k; - return *this; -} - -Buffer Options::getSalt() -{ - Lock lock(mutex); - return salt_; -} - -Options& Options::setSalt(std::string s) -{ - Lock lock(mutex); - salt_ = s; - return *this; -} - -RouteList Options::getRoutes() -{ - Lock lock(mutex); - return routes_; -} diff --git a/src/anyctrOptions.h b/src/anyctrOptions.h deleted file mode 100644 index 0e37242..0000000 --- a/src/anyctrOptions.h +++ /dev/null @@ -1,108 +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 _ANYCTR_OPTIONS_H_ -#define _ANYCTR_OPTIONS_H_ - -#include "datatypes.h" -#include "buffer.h" -#include "threadUtils.hpp" -#include - -typedef struct OptionRoute -{ - std::string net_addr; - uint16_t prefix_length; -}; - -typedef std::list RouteList; - -class Options -{ -public: - static Options& instance(); - - bool parse(int argc, char* argv[]); - void printUsage(); - void printOptions(); - - std::string getProgname(); - Options& setProgname(std::string p); - std::string getRemoteAddr(); - Options& setRemoteAddr(std::string r); - u_int16_t getRemotePort(); - Options& setRemotePort(u_int16_t r); - Options& setRemoteAddrPort(std::string addr, u_int16_t port); - - window_size_t getSeqWindowSize(); - Options& setSeqWindowSize(window_size_t s); - std::string getKdPrf(); - Options& setKdPrf(std::string k); - Options& setMux(u_int16_t m); - u_int16_t getMux(); - Options& setKey(std::string k); - Buffer getKey(); - Options& setSalt(std::string s); - Buffer getSalt(); - RouteList getRoutes(); - -private: - Options(); - ~Options(); - Options(const Options &l); - void operator=(const Options &l); - - static Options* inst; - static Mutex instMutex; - class instanceCleaner { - public: ~instanceCleaner() { - if(Options::inst != 0) - delete Options::inst; - } - }; - friend class instanceCleaner; - - Mutex mutex; - - std::string progname_; - std::string remote_addr_; - u_int16_t remote_port_; - window_size_t seq_window_size_; - std::string kd_prf_; - u_int16_t mux_; - Buffer key_; - Buffer salt_; - - RouteList routes_; -}; - -extern Options& gOpt; - -#endif diff --git a/src/anymuxOptions.cpp b/src/anymuxOptions.cpp deleted file mode 100644 index c892e26..0000000 --- a/src/anymuxOptions.cpp +++ /dev/null @@ -1,303 +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 -#include -#include - -#include "datatypes.h" -#include "anymuxOptions.h" - -Options* Options::inst = NULL; -Mutex Options::instMutex; -Options& gOpt = Options::instance(); - -Options& Options::instance() -{ - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) - inst = new Options(); - - return *inst; -} - -Options::Options() -{ - progname_ = "anytun-controld"; - file_name_ = ""; - daemonize_ = true; - chroot_ = false; - username_ = "nobody"; - chroot_dir_ = "/var/run/anytun-controld"; - pid_file_ = ""; - bind_to_addr_ = "127.0.0.1"; - bind_to_port_ = 4445; -} - -Options::~Options() -{ -} - -#define PARSE_BOOL_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - VALUE = true; - -#define PARSE_INVERSE_BOOL_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - VALUE = false; - -#define PARSE_SCALAR_PARAM(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - std::stringstream tmp; \ - tmp << argv[i+1]; \ - tmp >> VALUE; \ - argc--; \ - i++; \ - } - -#define PARSE_SCALAR_PARAM2(SHORT, LONG, VALUE1, VALUE2) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 2 || \ - argv[i+1][0] == '-' || argv[i+2][0] == '-') \ - return false; \ - std::stringstream tmp; \ - tmp << argv[i+1] << " " << argv[i+2]; \ - tmp >> VALUE1; \ - tmp >> VALUE2; \ - argc-=2; \ - i+=2; \ - } - -#define PARSE_HEXSTRING_PARAM_SEC(SHORT, LONG, VALUE) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - VALUE = Buffer(std::string(argv[i+1])); \ - for(size_t j=0; j < strlen(argv[i+1]); ++j) \ - argv[i+1][j] = '#'; \ - argc--; \ - i++; \ - } - -#define PARSE_CSLIST_PARAM(SHORT, LONG, LIST) \ - else if(str == SHORT || str == LONG) \ - { \ - if(argc < 1 || argv[i+1][0] == '-') \ - return false; \ - std::stringstream tmp(argv[i+1]); \ - while (tmp.good()) \ - { \ - std::string tmp_line; \ - getline(tmp,tmp_line,','); \ - LIST.push(tmp_line); \ - } \ - argc--; \ - i++; \ - } - -bool Options::parse(int argc, char* argv[]) -{ - Lock lock(mutex); - - progname_ = argv[0]; - argc--; - - std::string control_host(""); - for(int i=1; argc > 0; ++i) - { - std::string str(argv[i]); - argc--; - - if(str == "-h" || str == "--help") - return false; - PARSE_SCALAR_PARAM("-f","--file", file_name_) - PARSE_INVERSE_BOOL_PARAM("-D","--nodaemonize", daemonize_) - PARSE_BOOL_PARAM("-C","--chroot", chroot_) - PARSE_SCALAR_PARAM("-u","--username", username_) - PARSE_SCALAR_PARAM("-H","--chroot-dir", chroot_dir_) - PARSE_SCALAR_PARAM("-P","--write-pid", pid_file_) - PARSE_SCALAR_PARAM("-X","--control-host", control_host) - else - return false; - } - - if(control_host != "") { - std::stringstream tmp_stream(control_host); - getline(tmp_stream,bind_to_addr_,':'); - if(!tmp_stream.good()) - return false; - tmp_stream >> bind_to_port_; - } - - return true; -} - -void Options::printUsage() -{ - std::cout << "USAGE:" << std::endl; - std::cout << "anytun-controld [-h|--help] prints this..." << std::endl; - std::cout << " [-D|--nodaemonize] don't run in background" << std::endl; - std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl; - std::cout << " [-u|--username] if chroot change to this user" << std::endl; - std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; - std::cout << " [-P|--write-pid] write pid to this file" << std::endl; - std::cout << " [-f|--file] path to file" << std::endl; - -} - -void Options::printOptions() -{ - Lock lock(mutex); - std::cout << "Options:" << std::endl; - std::cout << "daemonize=" << daemonize_ << std::endl; - std::cout << "chroot=" << chroot_ << std::endl; - std::cout << "username='" << username_ << "'" << std::endl; - std::cout << "chroot_dir='" << chroot_dir_ << "'" << std::endl; - std::cout << "pid_file='" << pid_file_ << "'" << std::endl; -} - -std::string Options::getProgname() -{ - Lock lock(mutex); - return progname_; -} - - -Options& Options::setProgname(std::string p) -{ - Lock lock(mutex); - progname_ = p; - return *this; -} - -bool Options::getDaemonize() -{ - return daemonize_; -} - -Options& Options::setDaemonize(bool d) -{ - daemonize_ = d; - return *this; -} - -bool Options::getChroot() -{ - return chroot_; -} - -Options& Options::setChroot(bool c) -{ - chroot_ = c; - return *this; -} - -std::string Options::getUsername() -{ - Lock lock(mutex); - return username_; -} - -Options& Options::setUsername(std::string u) -{ - Lock lock(mutex); - username_ = u; - return *this; -} - -std::string Options::getChrootDir() -{ - Lock lock(mutex); - return chroot_dir_; -} - -Options& Options::setChrootDir(std::string c) -{ - Lock lock(mutex); - chroot_dir_ = c; - return *this; -} - -std::string Options::getPidFile() -{ - Lock lock(mutex); - return pid_file_; -} - -Options& Options::setPidFile(std::string p) -{ - Lock lock(mutex); - pid_file_ = p; - return *this; -} - -std::string Options::getFileName() -{ - Lock lock(mutex); - return file_name_; -} - -Options& Options::setFileName(std::string f) -{ - Lock lock(mutex); - file_name_ = f; - return *this; -} - -std::string Options::getBindToAddr() -{ - Lock lock(mutex); - return bind_to_addr_; -} - -Options& Options::setBindToAddr(std::string b) -{ - Lock lock(mutex); - bind_to_addr_ = b; - return *this; -} - -uint16_t Options::getBindToPort() -{ - return bind_to_port_; -} - -Options& Options::setBindToPort(uint16_t b) -{ - bind_to_port_ = b; - return *this; -} diff --git a/src/anymuxOptions.h b/src/anymuxOptions.h deleted file mode 100644 index dfbc213..0000000 --- a/src/anymuxOptions.h +++ /dev/null @@ -1,99 +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 _ANYMUX_OPTIONS_H_ -#define _ANYMUX_OPTIONS_H_ - -#include "datatypes.h" -#include "buffer.h" -#include "threadUtils.hpp" -#include - -class Options -{ -public: - static Options& instance(); - - bool parse(int argc, char* argv[]); - void printUsage(); - void printOptions(); - - std::string getProgname(); - Options& setProgname(std::string p); - bool getDaemonize(); - Options& setDaemonize(bool d); - bool getChroot(); - Options& setChroot(bool b); - std::string getUsername(); - Options& setUsername(std::string u); - std::string getChrootDir(); - Options& setChrootDir(std::string c); - std::string getPidFile(); - Options& setPidFile(std::string p); - std::string getFileName(); - Options& setFileName(std::string f); - std::string getBindToAddr(); - Options& setBindToAddr(std::string b); - uint16_t getBindToPort(); - Options& setBindToPort(uint16_t b); - - -private: - Options(); - ~Options(); - Options(const Options &l); - void operator=(const Options &l); - - static Options* inst; - static Mutex instMutex; - class instanceCleaner { - public: ~instanceCleaner() { - if(Options::inst != 0) - delete Options::inst; - } - }; - friend class instanceCleaner; - - Mutex mutex; - - std::string bind_to_addr_; - uint16_t bind_to_port_; - std::string progname_; - bool daemonize_; - bool chroot_; - std::string username_; - std::string chroot_dir_; - std::string pid_file_; - std::string file_name_; -}; - -extern Options& gOpt; - -#endif diff --git a/src/anytun-config.cpp b/src/anytun-config.cpp index 733487a..de1dad1 100644 --- a/src/anytun-config.cpp +++ b/src/anytun-config.cpp @@ -38,7 +38,7 @@ #include "keyDerivation.h" #include "keyDerivationFactory.h" #include "signalController.h" -#include "anyctrOptions.h" +#include "anyConfOptions.h" #include "connectionList.h" #include "routingTable.h" #include "networkAddress.h" diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp index 204694e..1d12ab7 100644 --- a/src/anytun-controld.cpp +++ b/src/anytun-controld.cpp @@ -39,9 +39,9 @@ #include "log.h" #include "signalController.h" -#include "anymuxOptions.h" +#include "anyCtrOptions.h" -#include "muxSocket.h" +#include "anyCtrSocket.h" #include "Sockets/ListenSocket.h" #include "Sockets/SocketHandler.h" diff --git a/src/muxSocket.cpp b/src/muxSocket.cpp deleted file mode 100644 index 0e0a43f..0000000 --- a/src/muxSocket.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include -#include - -#include "anymuxOptions.h" - -#include "Sockets/Utility.h" -#include "muxSocket.h" - - -#ifdef SOCKETS_NAMESPACE -using namespace SOCKETS_NAMESPACE; -#endif // SOCKETS_NAMESPACE - - -MuxSocket::MuxSocket(ISocketHandler& h) : TcpSocket(h), filename_(gOpt.getFileName()) -{ - SetConnectTimeout(12); -} - - -void MuxSocket::OnAccept() -{ - std::ifstream file(filename_.c_str()); - if( file.is_open() ) - { - std::string line; - while( !file.eof() ) - { - getline( file, line ); - Send( line ); - } - file.close(); - } - - //TODO Locking here -} - -//void StatusSocket::InitSSLServer() -//{ -// InitializeContext("server.pem", "keypwd", SSLv23_method()); -//} -// -// -//void StatusSocket::Init() -//{ -// EnableSSL(); -//} diff --git a/src/muxSocket.h b/src/muxSocket.h deleted file mode 100644 index e32c45d..0000000 --- a/src/muxSocket.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _MUXSOCKET_H -#define _MUXSOCKET_H - -#include "Sockets/TcpSocket.h" -#include "Sockets/ISocketHandler.h" - -#ifdef SOCKETS_NAMESPACE -using namespace SOCKETS_NAMESPACE; -#endif // SOCKETS_NAMESPACE - - -class MuxSocket : public TcpSocket -{ -public: - MuxSocket(ISocketHandler&); - - void OnAccept(); -// void Init(); - -// void InitSSLServer(); - -private: - std::string filename_; -}; - - -#endif // _SYNCSOCKET_H -- cgit v1.2.3