Imported Upstream version 0.3.5

[anytun.git] / src / anyrtpproxy / rtpSessionTable.h

diff --git a/src/anyrtpproxy/rtpSessionTable.h b/src/anyrtpproxy/rtpSessionTable.h
index 49a062f..211363c 100644 (file)
--- a/src/anyrtpproxy/rtpSessionTable.h
+++ b/src/anyrtpproxy/rtpSessionTable.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 _RTPSESSIONTABLE_H
@@ -43,31 +56,34 @@ typedef std::map<std::string,RtpSession*> RtpSessionMap;
 class RtpSessionTable
 {
 public:
-       static RtpSessionTable& instance();
-       RtpSessionTable();
-       ~RtpSessionTable();
-       void delSession(const std::string & call_id);
-       bool empty();
-       void clear();
+  static RtpSessionTable& instance();
+  RtpSessionTable();
+  ~RtpSessionTable();
+  void delSession(const std::string& call_id);
+  bool empty();
+  void clear();
   ::Mutex& getMutex();
-       RtpSessionMap::iterator getBeginUnlocked();
-       RtpSessionMap::iterator getEndUnlocked();
-       RtpSession& getOrNewSession(const std::string & call_id, bool& isnew);
-       RtpSession& getOrNewSessionUnlocked(const std::string & call_id, bool& isnew);
-       RtpSession& getSession(const std::string & call_id);
+  RtpSessionMap::iterator getBeginUnlocked();
+  RtpSessionMap::iterator getEndUnlocked();
+  RtpSession& getOrNewSession(const std::string& call_id, bool& isnew);
+  RtpSession& getOrNewSessionUnlocked(const std::string& call_id, bool& isnew);
+  RtpSession& getSession(const std::string& call_id);
 
 private:
   static ::Mutex instMutex;
-       static RtpSessionTable* inst;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-     if(RtpSessionTable::inst != 0)
-       delete RtpSessionTable::inst;
-   }
-       };
-       RtpSessionTable(const RtpSessionTable &s);
-  void operator=(const RtpSessionTable &s);
-       RtpSessionMap map_;
+  static RtpSessionTable* inst;
+  class instanceCleaner
+  {
+  public:
+    ~instanceCleaner() {
+      if(RtpSessionTable::inst != 0) {
+        delete RtpSessionTable::inst;
+      }
+    }
+  };
+  RtpSessionTable(const RtpSessionTable& s);
+  void operator=(const RtpSessionTable& s);
+  RtpSessionMap map_;
   ::Mutex mutex_;
 };