X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanyrtpproxy%2Foptions.h;h=328d2a9c7fa21c2516157b46970963de8cd2fec9;hb=326bc57905738d0bd416ce3d0d7cc79b14ef7a4a;hp=af09d4f7fb8390263adbf73899e7d500726285a7;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/anyrtpproxy/options.h b/src/anyrtpproxy/options.h
index af09d4f..328d2a9 100644
--- a/src/anyrtpproxy/options.h
+++ b/src/anyrtpproxy/options.h
@@ -6,19 +6,20 @@
  *  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-2008 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.
  *
  *  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.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,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 _OPTIONS_H_
@@ -36,8 +50,7 @@
 #include <list>
 #include <sstream>
 
-typedef struct OptionConnectTo
-{
+typedef struct OptionConnectTo {
   std::string host;
   std::string port;
 };
@@ -50,16 +63,15 @@ public:
   Host(std::string addr, std::string port) : addr_(addr), port_(port) {}
   Host(std::string addr_port) {
     splitAndSetAddrPort(addr_port);
-  } 
-  std::string toString() const
-  {
+  }
+  std::string toString() const {
     std::ostringstream oss;
     oss << addr_ << ":" << port_;
     return oss.str();
   }
-  
+
   std::string addr_;
-	std::string port_;
+  std::string port_;
 
 protected:
   void splitAndSetAddrPort(std::string addr_port);
@@ -88,28 +100,31 @@ public:
   std::string getLocalAddr();
   Options& setLocalAddr(std::string l);
   std::string getLocalSyncAddr();
-	Options& setLocalSyncAddr(std::string l);
+  Options& setLocalSyncAddr(std::string l);
   std::string getLocalSyncPort();
-	Options& setLocalSyncPort(std::string l);
-  u_int16_t getRtpStartPort();
-	Options& setRtpStartPort(u_int16_t l);
-  u_int16_t getRtpEndPort();
-	Options& setRtpEndPort(u_int16_t l);
+  Options& setLocalSyncPort(std::string l);
+  uint16_t getRtpStartPort();
+  Options& setRtpStartPort(uint16_t l);
+  uint16_t getRtpEndPort();
+  Options& setRtpEndPort(uint16_t l);
   ConnectToList getConnectTo();
 
 private:
   Options();
   ~Options();
-  Options(const Options &l);
-  void operator=(const Options &l);
+  Options(const Options& l);
+  void operator=(const Options& l);
   bool sanityCheck();
 
   static Options* inst;
   static ::Mutex instMutex;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-      if(Options::inst != 0)
+  class instanceCleaner
+  {
+  public:
+    ~instanceCleaner() {
+      if(Options::inst != 0) {
         delete Options::inst;
+      }
     }
   };
   friend class instanceCleaner;
@@ -124,12 +139,12 @@ private:
   std::string chroot_dir_;
   std::string pid_file_;
   bool daemonize_;
-	std::string local_sync_addr_;
-	std::string local_sync_port_;
+  std::string local_sync_addr_;
+  std::string local_sync_port_;
   std::string local_addr_;
-	u_int16_t rtp_start_port_;
-	u_int16_t rtp_end_port_;
-	ConnectToList connect_to_;
+  uint16_t rtp_start_port_;
+  uint16_t rtp_end_port_;
+  ConnectToList connect_to_;
   Host control_interface_;
 };