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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  54e617e01bf4740ffc7d0d0c96ea24420d67893a (commit)
       via  2fcc99a6225e84783c208e29ea44d6ef21b916c4 (commit)
      from  bb61015d5c1ba60711988f6cdb63c88fc874d182 (commit)

Summary of changes:
 src/SipChannelServiceApp.cpp |    6 +++++-
 src/SipEndpoint.cpp          |    4 ++++
 2 files changed, 9 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 54e617e01bf4740ffc7d0d0c96ea24420d67893a
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed Aug 25 11:28:54 2010 -0300

    Instantiate PJSipSessionModule so our pjsip module gets registered, and change the number dialed to a full number for stupid phones.

diff --git a/src/SipChannelServiceApp.cpp b/src/SipChannelServiceApp.cpp
index 2a509ee..7b778d6 100644
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@ -15,6 +15,7 @@
 #include "SipChannelServiceEventPublisher.h"
 #include "SipChannelServiceEndpointLocator.h"
 #include "SipEndpointFactory.h"
+#include "PJSipSessionModule.h"
 
 using namespace std;
 using namespace Hydra::SipChannelService;
@@ -134,6 +135,7 @@ private:
    std::string mAppName;
    Ice::ObjectAdapterPtr mAdapter;
    ServiceLocatorManagementPrx mServiceLocatorManagement;
+   PJSipSessionModule* mSessionModule;
 
    Discovery::V1::ServiceManagementPrx mComponentServiceManagement;
    ComponentServicePtr mComponentService;
@@ -291,7 +293,7 @@ void SipChannelServiceApp::registerWithRoutingService()
    RegExSeq destinations;
 
    // Based on configuration we should populate destinations but for now just have destination 100 for testing
-   destinations.push_back("100");
+   destinations.push_back("18005558355");
 
    EndpointLocatorPrx locator = EndpointLocatorPrx::uncheckedCast(mAdapter->createDirectProxy(communicator()->stringToIdentity(EndpointLocatorObjectId)));
    mDataModelInstance.mRoutingServiceLocatorRegistry->addEndpointLocator("pjsip", destinations, locator);
@@ -391,6 +393,8 @@ void SipChannelServiceApp::initialize(const std::string appName)
 
       mAdapter->activate();
 
+      mSessionModule = new PJSipSessionModule();
+
    }
    catch(...)
    {

commit 2fcc99a6225e84783c208e29ea44d6ef21b916c4
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed Aug 25 11:28:18 2010 -0300

    Populate endpoint identity information.

diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index adefcc0..75d72a1 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -208,6 +208,10 @@ private:
  */
 SipEndpoint::SipEndpoint(Ice::ObjectAdapterPtr adapter, boost::shared_ptr<SipEndpointFactory> factory) : mAdapter(adapter), mEndpointFactory(factory)
 {
+   id = new Hydra::Core::Endpoint::V1::EndpointId();
+   id->endpointManagerId = "pjsip";
+   id->destinationId = "test";
+
    mSignalCommands = new SipSignalCommands(this);
    command = Hydra::Session::V1::SignalCommandsPrx::uncheckedCast(adapter->addWithUUID(mSignalCommands));
    mSignalCallbacks = new SipSignalCallback(this);

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


-- 
asterisk-scf/integration/sip.git