X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Foptions.h;h=5f7d0f80782222ccf5350e65207865e8dedb0d28;hb=4022c01b494945eff22115d535228d7f1c5f3369;hp=92fc89f814f55b61b17fe2a67609e83c3f4d7719;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git

diff --git a/src/options.h b/src/options.h
index 92fc89f..5f7d0f8 100644
--- a/src/options.h
+++ b/src/options.h
@@ -6,12 +6,12 @@
  *  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
+ *  message authentication based on the methods 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-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  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/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
  */
 
 #ifndef ANYTUN_options_h_INCLUDED
@@ -56,7 +69,7 @@ public:
   void init(std::string addrPort);
 
   std::string addr;
-	std::string port;
+  std::string port;
 };
 typedef std::list<OptionHost> HostList;
 std::istream& operator>>(std::istream& stream, OptionHost& host);
@@ -66,12 +79,12 @@ class OptionNetwork
 public:
   OptionNetwork() : net_addr(""), prefix_length(0) {};
   OptionNetwork(std::string network) { init(network); };
-  OptionNetwork(std::string n, u_int16_t p) : net_addr(n), prefix_length(p) {};
+  OptionNetwork(std::string n, uint16_t p) : net_addr(n), prefix_length(p) {};
 
   void init(std::string network);
 
   std::string net_addr;
-  u_int16_t prefix_length;
+  uint16_t prefix_length;
 };
 typedef std::list<OptionNetwork> NetworkList;
 std::istream& operator>>(std::istream& stream, OptionNetwork& network);
@@ -88,6 +101,7 @@ public:
 
   bool parse(int argc, char* argv[]);
   void parse_post();
+  void printVersion();
   void printUsage();
   void printOptions();
 
@@ -105,6 +119,8 @@ public:
   Options& setPidFile(std::string p);
 
   StringList getLogTargets();
+  bool getDebug();
+  Options& setDebug(bool d);
 
   std::string getFileName();
   Options& setFileName(std::string f);
@@ -128,7 +144,7 @@ public:
   Options& setLocalSyncAddr(std::string l);
   std::string getLocalSyncPort();
   Options& setLocalSyncPort(std::string l);
-	HostList getRemoteSyncHosts();
+  HostList getRemoteSyncHosts();
 
   std::string getDevName();
   Options& setDevName(std::string d);
@@ -151,8 +167,8 @@ public:
   Options& setCipher(std::string c);
   std::string getAuthAlgo();
   Options& setAuthAlgo(std::string a);
-  u_int32_t getAuthTagLength();
-  Options& setAuthTagLength(u_int32_t a);
+  uint32_t getAuthTagLength();
+  Options& setAuthTagLength(uint32_t a);
   std::string getKdPrf();
   Options& setKdPrf(std::string k);
   role_t getRole();
@@ -168,22 +184,11 @@ public:
 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;
+  Options(const Options& l);
+  void operator=(const Options& l);
 
   ::SharedMutex mutex;
 
-
   bool cluster_opts;
   bool connection_opts;
 
@@ -195,6 +200,7 @@ private:
   std::string pid_file_;
 
   StringList log_targets_;
+  bool debug_;
 
   std::string file_name_;
   OptionHost bind_to_;
@@ -204,7 +210,7 @@ private:
   OptionHost remote_;
 
   OptionHost local_sync_;
-	HostList remote_sync_hosts_;
+  HostList remote_sync_hosts_;
 
   std::string dev_name_;
   std::string dev_type_;
@@ -218,7 +224,7 @@ private:
 
   std::string cipher_;
   std::string auth_algo_;
-  u_int32_t auth_tag_length_;
+  uint32_t auth_tag_length_;
   std::string kd_prf_;
   role_t role_;
   std::string passphrase_;