[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jul 26 12:58:44 CDT 2011
branch "master" has been updated
via 14ab7604cb0ee0582db6b5a41ee9ba3687524ac2 (commit)
from d5456aa0f5700ef9d53821e9695411fa2e0801fd (commit)
Summary of changes:
src/PJSipManager.cpp | 31 -------------------------------
src/PJSipManager.h | 2 --
2 files changed, 0 insertions(+), 33 deletions(-)
- Log -----------------------------------------------------------------
commit 14ab7604cb0ee0582db6b5a41ee9ba3687524ac2
Author: Brent Eagles <beagles at digium.com>
Date: Tue Jul 26 15:26:29 2011 -0230
Remove creation of UDP transport by default.
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index eab06d5..1618b4e 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -99,7 +99,6 @@ static void *monitorThread(void *endpt)
PJSipManagerPtr AsteriskSCF::SipSessionManager::PJSipManager::create(const Ice::PropertiesPtr& properties)
{
PJSipManagerPtr result(new PJSipManager);
- result->initializeDefaultTransports(properties);
STUNModulePtr stunModule = STUNModule::create(result, properties, logger);
result->addModule("STUN", stunModule);
return result;
@@ -259,36 +258,6 @@ pj_pool_t* PJSipManager::getMemoryPool()
return mMemoryPool;
}
-void PJSipManager::initializeDefaultTransports(const Ice::PropertiesPtr& properties)
-{
- string bindAddress = properties->getPropertyWithDefault("Sip.Transport.UdpBindAddr", "0.0.0.0:5060");
- string addressPart;
- int portPart = 5060;
- size_t colon = bindAddress.rfind(':');
- if (colon != string::npos)
- {
- addressPart = bindAddress.substr(0, colon);
- portPart = boost::lexical_cast<int>(bindAddress.substr(colon+1));
- }
- else
- {
- addressPart = bindAddress;
- }
- //
- // It is entirely possible that the default transport is instantiable. We'll eat this error for
- // now, but it might be better to abort out.
- //
- TransportPtr defaultUDPTransport = createUDPTransport(shared_from_this(), addressPart, portPart);
- if (defaultUDPTransport)
- {
- mTransports.insert(make_pair(defaultUDPTransport->id(), defaultUDPTransport));
- }
- else
- {
- logger(Error) << "Unable to create default transport";
- }
-}
-
PJSipManager::PJSipManager() :
mEndpoint(0),
mSessionModule(0),
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index f18bc9c..e26acf1 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -144,8 +144,6 @@ private:
SipModuleMap mModules;
std::map<std::string, TransportPtr> mTransports;
- void initializeDefaultTransports(const Ice::PropertiesPtr& properties);
-
PJSipManager();
};
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list