merged options parser

1 files changed, 0 insertions, 318 deletions

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 <satp@wirdorange.org>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include <cstring>
-#include <iostream>
-#include <queue>
-#include <string>
-#include <sstream>
-
-#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<std::string> 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] <hostname|ip>    remote host" << std::endl;
-  std::cout << "              [-o|--remote-port] <port>           remote port" << std::endl;
-  std::cout << "              [-w|--window-size] <window size>    seqence number window size" << std::endl;
-  std::cout << "              [-m|--mux] <mux-id>                 the multiplex id to use" << std::endl;
-  std::cout << "              [-K|--key] <master key>             master key to use for encryption" << std::endl;
-  std::cout << "              [-A|--salt] <master salt>           master salt to use for encryption" << std::endl;
-//  std::cout << "              [-k|--kd-prf] <kd-prf type>         key derivation pseudo random function" << std::endl;
-  std::cout << "              [-T|--route] <net>/<prefix length>  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_;
-}