X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2Fanyrtpproxy%2FrtpSessionTable.cpp;h=de7b03196c6637c0eea2ca1d948f6b1fb9cc694e;hp=934cf8cdeadfd80f618adbeaa3ef705d63dbf151;hb=ef0cacf2508418915d3f64b04003be3c13fed3cc;hpb=ece844834d2cecc028ce81ca283f5d441088580e diff --git a/src/anyrtpproxy/rtpSessionTable.cpp b/src/anyrtpproxy/rtpSessionTable.cpp index 934cf8c..de7b031 100644 --- a/src/anyrtpproxy/rtpSessionTable.cpp +++ b/src/anyrtpproxy/rtpSessionTable.cpp @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -43,8 +43,9 @@ RtpSessionTable& RtpSessionTable::instance() { Lock lock(instMutex); static instanceCleaner c; - if(!inst) + if(!inst) { inst = new RtpSessionTable(); + } return *inst; } @@ -55,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 ret = map_.insert(RtpSessionMap::value_type(call_id, NULL)); @@ -87,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"); } @@ -109,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()