[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "srtp-support" updated.

[Commits to the Asterisk SCF project code repositories]

branch "srtp-support" has been updated
       via  f8d408d74e5c80cd8113668d839a66ada330dfeb (commit)
       via  238ee5ad1a3d833da6d79136fc93db8aaa19c060 (commit)
      from  a0d8f595e2426565e3011f2487b3767d602c9621 (commit)

Summary of changes:
 config/SipConfigurator.py |    2 +-
 src/PJSipManager.cpp      |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit f8d408d74e5c80cd8113668d839a66ada330dfeb
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 12 15:07:03 2011 -0230

    Added a little workaround to deal with unavailability of default udp transport at
    initialization (it *could* conceivably be configured in afterwards).

diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index b474e19..d0c9c88 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -218,8 +218,19 @@ void PJSipManager::initializeDefaultTransports(const Ice::PropertiesPtr& propert
     {
         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);
-    mTransports.insert(make_pair(defaultUDPTransport->id(), defaultUDPTransport));
+    if (defaultUDPTransport)
+    {
+        mTransports.insert(make_pair(defaultUDPTransport->id(), defaultUDPTransport));
+    }
+    else
+    {
+        logger(Error) << "Unable to create default transport";
+    }
 }
 
 PJSipManager::PJSipManager() :

commit 238ee5ad1a3d833da6d79136fc93db8aaa19c060
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 12 12:22:29 2011 -0230

    Add flag to allow underscores in identifiers.

diff --git a/config/SipConfigurator.py b/config/SipConfigurator.py
index 46064d5..3dca24c 100755
--- a/config/SipConfigurator.py
+++ b/config/SipConfigurator.py
@@ -22,7 +22,7 @@
 import Ice, Configurator, sys, os
 
 # Load our component specific configuration definitions
-Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice")
+Ice.loadSlice("--underscore -I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice")
 import AsteriskSCF.Configuration.SipSessionManager.V1
 
 

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git