X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanyrtpproxy%2FrtpSessionTable.cpp;h=de7b03196c6637c0eea2ca1d948f6b1fb9cc694e;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=923786626eeaa4543d41c56bd3eece2836f5ac68;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/anyrtpproxy/rtpSessionTable.cpp b/src/anyrtpproxy/rtpSessionTable.cpp
index 9237866..de7b031 100644
--- a/src/anyrtpproxy/rtpSessionTable.cpp
+++ b/src/anyrtpproxy/rtpSessionTable.cpp
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 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
@@ -42,8 +43,9 @@ RtpSessionTable& RtpSessionTable::instance()
 {
   Lock lock(instMutex);
   static instanceCleaner c;
-  if(!inst)
+  if(!inst) {
     inst = new RtpSessionTable();
+  }
 
   return *inst;
 }
@@ -54,31 +56,33 @@ RtpSessionTable::RtpSessionTable()
 
 RtpSessionTable::~RtpSessionTable()
 {
-} 
+}
 
-void RtpSessionTable::delSession(const std::string & call_id)
+void RtpSessionTable::delSession(const std::string& call_id)
 {
   Lock lock(mutex_);
 
   RtpSessionMap::iterator it = map_.find(call_id);
-  if(it!=map_.end())
+  if(it!=map_.end()) {
     delete it->second;
+  }
 
   map_.erase(it);
 }
 
-RtpSession& RtpSessionTable::getOrNewSession(const std::string & call_id, bool& is_new)
+RtpSession& RtpSessionTable::getOrNewSession(const std::string& call_id, bool& is_new)
 {
   Lock lock(mutex_);
   return getOrNewSessionUnlocked(call_id, is_new);
 }
 
-RtpSession& RtpSessionTable::getOrNewSessionUnlocked(const std::string & call_id, bool& is_new)
+RtpSession& RtpSessionTable::getOrNewSessionUnlocked(const std::string& call_id, bool& is_new)
 {
   is_new = false;
   RtpSessionMap::iterator it = map_.find(call_id);
-  if(it!=map_.end())
+  if(it!=map_.end()) {
     return *(it->second);
+  }
 
   is_new = true;
   std::pair<RtpSessionMap::iterator, bool> ret = map_.insert(RtpSessionMap::value_type(call_id, NULL));
@@ -86,11 +90,12 @@ RtpSession& RtpSessionTable::getOrNewSessionUnlocked(const std::string & call_id
   return *(ret.first->second);
 }
 
-RtpSession& RtpSessionTable::getSession(const std::string & call_id)
+RtpSession& RtpSessionTable::getSession(const std::string& call_id)
 {
   RtpSessionMap::iterator it = map_.find(call_id);
-  if(it!=map_.end())
+  if(it!=map_.end()) {
     return *(it->second);
+  }
 
   throw std::runtime_error("session not found");
 }
@@ -108,13 +113,13 @@ RtpSessionMap::iterator RtpSessionTable::getEndUnlocked()
 void RtpSessionTable::clear()
 {
   Lock lock(mutex_);
-	map_.clear();
+  map_.clear();
 }
 
 bool RtpSessionTable::empty()
 {
   Lock lock(mutex_);
-	return map_.empty();
+  return map_.empty();
 }
 
 Mutex& RtpSessionTable::getMutex()