From 9e0b7d81ba534ef469b751b59a6f222329f8f674 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 28 Jan 2009 10:53:05 +0000 Subject: merged options parser --- src/Makefile | 10 ++ src/anyConfOptions.cpp | 318 ------------------------------------------ src/anyConfOptions.h | 109 --------------- src/anyCtrOptions.cpp | 364 ------------------------------------------------ src/anyCtrOptions.h | 102 -------------- src/anytun-config.cpp | 14 +- src/anytun-controld.cpp | 24 +++- src/anytun.cpp | 1 + src/options.cpp | 136 ++++++++++++++---- 9 files changed, 146 insertions(+), 932 deletions(-) delete mode 100644 src/anyConfOptions.cpp delete mode 100644 src/anyConfOptions.h delete mode 100644 src/anyCtrOptions.cpp delete mode 100644 src/anyCtrOptions.h diff --git a/src/Makefile b/src/Makefile index 396b255..87da130 100644 --- a/src/Makefile +++ b/src/Makefile @@ -64,6 +64,7 @@ SYNCOBJS= syncServer.o \ ANYCTROBJS = signalController.o \ anyCtrOptions.o \ + buffer.o \ log.o \ syncTcpConnection.o \ syncServer.o @@ -131,6 +132,15 @@ anytun-config: $(ANYCONFOBJS) anytun-config.o anytun-controld: $(ANYCTROBJS) anytun-controld.o $(LD) $(ANYCTROBJS) anytun-controld.o -o $@ $(LDFLAGS) +options.o: options.cpp + $(CXX) -DANYTUN_OPTIONS $(CXXFLAGS) $< -c -o $@ + +anyCtrOptions.o: options.cpp + $(CXX) -DANYCTR_OPTIONS $(CXXFLAGS) $< -c -o $@ + +anyConfOptions.o: options.cpp + $(CXX) -DANYCONF_OPTIONS $(CXXFLAGS) $< -c -o $@ + %.o: %.cpp $(CXX) $(CXXFLAGS) $< -c diff --git a/src/anyConfOptions.cpp b/src/anyConfOptions.cpp deleted file mode 100644 index 0cc0c7c..0000000 --- a/src/anyConfOptions.cpp +++ /dev/null @@ -1,318 +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-2008 Othmar Gsenger, Erwin Nindl, - * Christian Pointner - * - * This file is part of Anytun. - * - * Anytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Anytun 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 anytun. If not, see . - */ - -#include -#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("-T","--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 [-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 << " [-T|--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; -} - -std::string Options::getRemotePort() -{ - return remote_port_; -} - -Options& Options::setRemotePort(std::string r) -{ - remote_port_ = r; - return *this; -} - -Options& Options::setRemoteAddrPort(std::string addr, std::string 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 deleted file mode 100644 index fdcec70..0000000 --- a/src/anyConfOptions.h +++ /dev/null @@ -1,109 +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-2008 Othmar Gsenger, Erwin Nindl, - * Christian Pointner - * - * This file is part of Anytun. - * - * Anytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Anytun 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 anytun. If not, see . - */ - -#ifndef _ANY_CONF_OPTIONS_H_ -#define _ANY_CONF_OPTIONS_H_ - -#include "datatypes.h" -#include "buffer.h" -#include "threadUtils.hpp" -#include - -typedef struct -{ - std::string net_addr; - u_int16_t prefix_length; -} OptionRoute; - -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); - std::string getRemotePort(); - Options& setRemotePort(std::string r); - Options& setRemoteAddrPort(std::string addr, std::string 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_; - std::string 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 deleted file mode 100644 index 5626aec..0000000 --- a/src/anyCtrOptions.cpp +++ /dev/null @@ -1,364 +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-2008 Othmar Gsenger, Erwin Nindl, - * Christian Pointner - * - * This file is part of Anytun. - * - * Anytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Anytun 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 anytun. If not, see . - */ - -#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_ = "2323"; -} - -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 != "") - return splitAndSetHostPort(control_host); - - return true; -} - -bool Options::splitAndSetHostPort(std::string hostPort) -{ - if(hostPort.length() >= 2 && hostPort[0] == ':' && hostPort[1] != ':') { - bind_to_addr_ = ""; - hostPort.erase(0,1); - std::stringstream tmp_stream(hostPort); - tmp_stream >> bind_to_port_; - return true; - } - - size_t pos = hostPort.find_first_of("["); - - if(pos != std::string::npos && pos != 0) - return false; // an [ was found but not at the beginning - - bool hasPort = false; - if(pos != std::string::npos) { - hostPort.erase(pos, 1); - pos = hostPort.find_first_of("]"); - - if(pos == std::string::npos) - return false; // no trailing ] although an leading [ was found - - if(pos < hostPort.length()-2) { - - if(hostPort[pos+1] != ':') - return false; // wrong port delimieter - - hostPort[pos+1] = '/'; - hasPort = true; - } - else if(pos != hostPort.length()-1) - return false; // to few characters left - - hostPort.erase(pos, 1); - } - else { - pos = hostPort.find_first_of(":"); - if(pos != std::string::npos && pos == hostPort.find_last_of(":")) { - // an ':' has been found and it is the only one -> assuming port present - hasPort = true; - hostPort[pos] = '/'; - } - } - - if(hasPort) { - std::stringstream tmp_stream(hostPort); - - getline(tmp_stream, bind_to_addr_, '/'); - if(!tmp_stream.good()) - return false; - - tmp_stream >> bind_to_port_; - } - else { - bind_to_addr_ = hostPort; - bind_to_port_ = "2323"; // default sync 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; - std::cout << " [-X|--control-host] < [:] | : >" << std::endl; - std::cout << " local tcp port and or ip address to bind to" << 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::cout << "bind_to_addr_='" << bind_to_addr_ << "'" << std::endl; - std::cout << "bind_to_port_='" << bind_to_port_ << "'" << 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; -} - -std::string Options::getBindToPort() -{ - return bind_to_port_; -} - -Options& Options::setBindToPort(std::string b) -{ - bind_to_port_ = b; - return *this; -} diff --git a/src/anyCtrOptions.h b/src/anyCtrOptions.h deleted file mode 100644 index d4789c3..0000000 --- a/src/anyCtrOptions.h +++ /dev/null @@ -1,102 +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-2008 Othmar Gsenger, Erwin Nindl, - * Christian Pointner - * - * This file is part of Anytun. - * - * Anytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Anytun 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 anytun. If not, see . - */ - -#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); - std::string getBindToPort(); - Options& setBindToPort(std::string 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; - - bool splitAndSetHostPort(std::string hostPort); - - Mutex mutex; - - std::string bind_to_addr_; - std::string 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 c5763b0..e5cd8b1 100644 --- a/src/anytun-config.cpp +++ b/src/anytun-config.cpp @@ -38,7 +38,7 @@ #include "buffer.h" #include "keyDerivation.h" #include "keyDerivationFactory.h" -#include "anyConfOptions.h" +#include "options.h" #include "connectionList.h" #include "routingTable.h" #include "networkAddress.h" @@ -87,8 +87,18 @@ void createConnection(const PacketSourceEndpoint & remote_end, ConnectionList & int main(int argc, char* argv[]) { int ret=0; - if(!gOpt.parse(argc, argv)) + try { + bool result = gOpt.parse(argc, argv); + if(!result) { + gOpt.printUsage(); + exit(0); + } + } + catch(syntax_error& e) + { + std::cerr << e << std::endl; +// cLog.msg(Log::PRIO_NOTICE) << "exitting after syntax error"; gOpt.printUsage(); exit(-1); } diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp index 64f7570..c73abbd 100644 --- a/src/anytun-controld.cpp +++ b/src/anytun-controld.cpp @@ -41,7 +41,7 @@ #include "log.h" #include "signalController.h" -#include "anyCtrOptions.h" +#include "options.h" #include "syncServer.h" #include "daemon.hpp" @@ -97,16 +97,26 @@ int main(int argc, char* argv[]) bool daemonized=false; try { - - if(!gOpt.parse(argc, argv)) + cLog.setLogName("anytun-controld"); + cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started..."; + + try + { + bool result = gOpt.parse(argc, argv); + if(!result) { + cLog.msg(Log::PRIO_NOTICE) << "printing help text and exitting"; + gOpt.printUsage(); + exit(0); + } + } + catch(syntax_error& e) { + std::cerr << e << std::endl; + cLog.msg(Log::PRIO_NOTICE) << "exitting after syntax error"; gOpt.printUsage(); exit(-1); } - - cLog.setLogName("anytun-controld"); - cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started..."; - + std::ifstream file( gOpt.getFileName().c_str() ); if( file.is_open() ) file.close(); diff --git a/src/anytun.cpp b/src/anytun.cpp index eb695cf..19c4587 100644 --- a/src/anytun.cpp +++ b/src/anytun.cpp @@ -332,6 +332,7 @@ int main(int argc, char* argv[]) { bool result = gOpt.parse(argc, argv); if(!result) { + cLog.msg(Log::PRIO_NOTICE) << "printing help text and exitting"; gOpt.printUsage(); exit(0); } diff --git a/src/options.cpp b/src/options.cpp index c738281..ba49711 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -140,12 +140,20 @@ Options& Options::instance() Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0)) { +#if defined(ANYCTR_OPTIONS) + progname_ = "anytun-controld"; + chroot_dir_ = "/var/run/anytun-controld"; +#elif defined(ANYCONF_OPTIONS) + progname_ = "anytun-config"; + chroot_dir_ = "/var/run/anytun-config"; +#else progname_ = "anytun"; + chroot_dir_ = "/var/run/anytun"; +#endif daemonize_ = true; chroot_ = false; username_ = "nobody"; - chroot_dir_ = "/var/run/anytun"; pid_file_ = ""; file_name_ = ""; @@ -311,21 +319,39 @@ bool Options::parse(int argc, char* argv[]) if(str == "-h" || str == "--help") return false; -#ifndef NO_DAEMON + +#if defined(ANYTUN_OPTIONS) || defined(ANYCTR_OPTIONS) + + #ifndef NO_DAEMON 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_) + #endif + #endif +#if defined(ANYCTR_OPTIONS) -// PARSE_SCALAR_PARAM("-f","--file", file_name_) -// PARSE_SCALAR_PARAM("-X","--control-host", bind_to_) + PARSE_SCALAR_PARAM("-f","--file", file_name_) + PARSE_SCALAR_PARAM("-X","--control-host", bind_to_) + +#endif +#if defined(ANYTUN_OPTIONS) PARSE_SCALAR_PARAM("-i","--interface", local_.addr) PARSE_SCALAR_PARAM("-p","--port", local_.port) + PARSE_SCALAR_PARAM("-s","--sender-id", sender_id_) + +#endif +#if defined(ANYTUN_OPTIONS) || defined(ANYCONF_OPTIONS) + PARSE_SCALAR_PARAM("-r","--remote-host", remote_.addr) PARSE_SCALAR_PARAM("-o","--remote-port", remote_.port) + +#endif +#if defined(ANYTUN_OPTIONS) + PARSE_SCALAR_PARAM("-I","--sync-interface", local_sync_.addr) PARSE_SCALAR_PARAM("-S","--sync-port", local_sync_.port) PARSE_CSLIST_PARAM("-M","--sync-hosts", remote_sync_hosts_, OptionHost) @@ -334,27 +360,38 @@ bool Options::parse(int argc, char* argv[]) PARSE_SCALAR_PARAM("-d","--dev", dev_name_) PARSE_SCALAR_PARAM("-t","--type", dev_type_) PARSE_SCALAR_PARAM2("-n","--ifconfig", ifconfig_param_local_, ifconfig_param_remote_netmask_) -#ifndef NO_EXEC + #ifndef NO_EXEC PARSE_SCALAR_PARAM("-x","--post-up-script", post_up_script_) + #endif + #endif -#ifndef NO_ROUTING +#if defined(ANYTUN_OPTIONS) || defined(ANYCONF_OPTIONS) + + #ifndef NO_ROUTING PARSE_CSLIST_PARAM("-R","--route", routes_, OptionRoute) -#endif + #endif - PARSE_SCALAR_PARAM("-s","--sender-id", sender_id_) PARSE_SCALAR_PARAM("-m","--mux", mux_) PARSE_SCALAR_PARAM("-w","--window-size", seq_window_size_) -#ifndef NO_CRYPT - PARSE_SCALAR_PARAM("-c","--cipher", cipher_) - PARSE_SCALAR_PARAM("-a","--auth-algo", auth_algo_) + #ifndef NO_CRYPT PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_) - PARSE_SIGNED_INT_PARAM("-l","--ld-kdr", ld_kdr_tmp) -#ifndef NO_PASSPHRASE +// PARSE_SIGNED_INT_PARAM("-l","--ld-kdr", ld_kdr_tmp) + #ifndef NO_PASSPHRASE PARSE_PHRASE_PARAM_SEC("-E","--passphrase", passphrase_) -#endif + #endif PARSE_HEXSTRING_PARAM_SEC("-K","--key", key_) PARSE_HEXSTRING_PARAM_SEC("-A","--salt", salt_) + #endif + +#endif +#if defined(ANYTUN_OPTIONS) + + #ifndef NO_CRYPT + PARSE_SCALAR_PARAM("-c","--cipher", cipher_) + PARSE_SCALAR_PARAM("-a","--auth-algo", auth_algo_) + #endif + #endif else throw syntax_error(str, 0); @@ -375,24 +412,50 @@ bool Options::parse(int argc, char* argv[]) void Options::printUsage() { std::cout << "USAGE:" << std::endl; + +#if defined(ANYCTR_OPTIONS) + std::cout << "anytun-controld " << std::endl; +#elif defined(ANYCONF_OPTIONS) + std::cout << "anytun-config " << std::endl; +#else std::cout << "anytun " << std::endl; +#endif + std::cout << " [-h|--help] prints this..." << std::endl; -#ifndef NO_DAEMON + +#if defined(ANYTUN_OPTIONS) || defined(ANYCTR_OPTIONS) + + #ifndef NO_DAEMON 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; + #endif + #endif +#if defined(ANYCTR_OPTIONS) -// std::cout << " [-f|--file] path to input file" << std::endl; -// std::cout << " [-X|--control-host] < [:] | : >" << std::endl; -// std::cout << " local tcp port and or ip address to bind to" << std::endl; + std::cout << " [-f|--file] path to input file" << std::endl; + std::cout << " [-X|--control-host] < [:] | : >" << std::endl; + std::cout << " local tcp port and or ip address to bind to" << std::endl; + +#endif +#if defined(ANYTUN_OPTIONS) std::cout << " [-i|--interface] local anycast ip address to bind to" << std::endl; std::cout << " [-p|--port] local anycast(data) port to bind to" << std::endl; + std::cout << " [-s|--sender-id ] the sender id to use" << std::endl; + +#endif +#if defined(ANYTUN_OPTIONS) || defined(ANYCONF_OPTIONS) + std::cout << " [-r|--remote-host] remote host" << std::endl; std::cout << " [-o|--remote-port] remote port" << std::endl; + +#endif +#if defined(ANYTUN_OPTIONS) + std::cout << " [-I|--sync-interface] local unicast(sync) ip address to bind to" << std::endl; std::cout << " [-S|--sync-port] local unicast(sync) port to bind to" << std::endl; std::cout << " [-M|--sync-hosts] [:][,[:][...]]"<< std::endl; @@ -404,25 +467,38 @@ void Options::printUsage() std::cout << " [-t|--type] device type" << std::endl; std::cout << " [-n|--ifconfig] the local address for the tun/tap device" << std::endl; std::cout << " the remote address(tun) or netmask(tap)" << std::endl; -#ifndef NO_EXEC + #ifndef NO_EXEC std::cout << " [-x|--post-up-script]