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

[Commits to the Asterisk SCF project code repositories]

branch "configuration" has been updated
       via  04e2c162bc7f6cd6b9bceb74089d1a9a29148b59 (commit)
       via  0c1ba29dc6631ac5ce38a3d2629fe17afcd39627 (commit)
      from  df6502431fb6d495c88eb9a223820f063432bd7e (commit)

Summary of changes:
 local-slice/SipConfigurationIf.ice |    6 +++---
 src/SipSessionManagerApp.cpp       |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 04e2c162bc7f6cd6b9bceb74089d1a9a29148b59
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Apr 11 18:20:38 2011 -0300

    Fix visitor generation issue with some specific endpoint configuration items.

diff --git a/local-slice/SipConfigurationIf.ice b/local-slice/SipConfigurationIf.ice
index 5e6dc0b..58cae24 100644
--- a/local-slice/SipConfigurationIf.ice
+++ b/local-slice/SipConfigurationIf.ice
@@ -109,7 +109,7 @@ module V1
    /**
     * Host information configuration item
     */
-   class SipHostItem extends SipConfigurationItem
+   ["visitor:SipConfigurationItemVisitor"] class SipHostItem extends SipConfigurationItem
    {
       /**
        * String containing the IP address or string address
@@ -125,14 +125,14 @@ module V1
    /**
     * Source transport address configuration item
     */
-   class SipSourceTransportAddressItem extends SipHostItem
+   ["visitor:SipConfigurationItemVisitor"] class SipSourceTransportAddressItem extends SipHostItem
    {
    };
 
    /**
     * Target destination address configuration item
     */
-   class SipTargetDestinationAddressItem extends SipHostItem
+   ["visitor:SipConfigurationItemVisitor"] class SipTargetDestinationAddressItem extends SipHostItem
    {
    };
 

commit 0c1ba29dc6631ac5ce38a3d2629fe17afcd39627
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Apr 11 16:13:51 2011 -0300

    Fix a bug where the routing id was not present before being used.

diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index c896e1c..134dca2 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -336,8 +336,6 @@ void SipSessionManager::registerWithRoutingService()
 
     mEndpointFactory->generateRoutingDestinations(destinations);
 
-    mRoutingId = mCommunicator->getProperties()->getPropertyWithDefault("Sip.RoutingId", "pjsip");
-
     EndpointLocatorPrx locator = EndpointLocatorPrx::uncheckedCast(mGlobalAdapter->createDirectProxy(mCommunicator->stringToIdentity(EndpointLocatorObjectId)));
     mRoutingServiceLocatorRegistry->addEndpointLocator(mRoutingId, destinations, locator);
 }
@@ -366,6 +364,9 @@ void SipSessionManager::locateRoutingService()
 
     AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> pw(mServiceLocator, genericparams, lg);
     mRoutingServiceLocatorRegistry = pw;
+
+    // This exists here since it may need to be known before actually contacting the routing service
+    mRoutingId = mCommunicator->getProperties()->getPropertyWithDefault("Sip.RoutingId", "pjsip");
 }
 
 void SipSessionManager::locateStateReplicator()

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


-- 
asterisk-scf/integration/sip.git