[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  95bd53d28b55060313f48abe9b995233a2509ff6 (commit)
       via  fcc16190bf5c0957f6871f7df8fd45f2c39bcc51 (commit)
      from  6ab960efbb1c904e2ad56931db978f5bc7ffa7b3 (commit)

Summary of changes:
 src/SipChannelServiceApp.cpp             |   12 ++++++++++++
 src/SipChannelServiceEndpointLocator.cpp |    2 +-
 src/SipChannelServiceEndpointLocator.h   |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 95bd53d28b55060313f48abe9b995233a2509ff6
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 22:26:06 2010 -0300

    Be gone whitespace!

diff --git a/src/SipChannelServiceEndpointLocator.cpp b/src/SipChannelServiceEndpointLocator.cpp
index 99ddac3..3b4710c 100644
--- a/src/SipChannelServiceEndpointLocator.cpp
+++ b/src/SipChannelServiceEndpointLocator.cpp
@@ -6,7 +6,7 @@ namespace SipChannelService
 {
 
 /**
- * Default constructor. 
+ * Default constructor.
  */
 SipChannelServiceEndpointLocator::SipChannelServiceEndpointLocator()
 {
diff --git a/src/SipChannelServiceEndpointLocator.h b/src/SipChannelServiceEndpointLocator.h
index d167c1f..732963a 100644
--- a/src/SipChannelServiceEndpointLocator.h
+++ b/src/SipChannelServiceEndpointLocator.h
@@ -23,7 +23,7 @@ public:  // Overrides of EndpointLocator
    /**
     * The Routing Service will call this method when it needs to lookup an endpoint that
     * we have indicated that we are managing.
-    */ 
+    */
    virtual ::Hydra::Core::Endpoint::V1::EndpointSeq lookup(const ::std::string& destination, const ::Ice::Current& = ::Ice::Current());
 
 private:

commit fcc16190bf5c0957f6871f7df8fd45f2c39bcc51
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 22:16:09 2010 -0300

    Deregister from the routing service when shutting down.

diff --git a/src/SipChannelServiceApp.cpp b/src/SipChannelServiceApp.cpp
index 781a4ba..949f04c 100644
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@ -115,6 +115,7 @@ private:
    void locateRoutingService();
    void locateBridgeService();
    void registerWithRoutingService();
+   void deregisterFromRoutingService();
 
    bool mDone;
    std::string mAppName;
@@ -285,6 +286,14 @@ void SipChannelServiceApp::registerWithRoutingService()
 }
 
 /**
+ * Deregister our own Endpoint Locator from the Routing SErvice.
+ */
+void SipChannelServiceApp::deregisterFromRoutingService()
+{
+   mDataModelInstance.mRoutingServiceLocatorRegistry->removeEndpointLocator("pjsip");
+}
+
+/**
  * Get a reference to the Routing Service interface that we care about, and cache it in the Data Model.
  * This will allow us to lookup endpoints anywhere in the Asterisk SCF system.
  */
@@ -399,6 +408,9 @@ int SipChannelServiceApp::run(int argc, char* argv[])
    // Remove our interfaces from the service locator.
    deregisterFromServiceLocator();
 
+   // Remove our endpoint locator from the routing service.
+   deregisterFromRoutingService();
+
    // Give our singleton a chance to shut down gracefully.
    mDataModelInstance.cleanup();
 

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


-- 
asterisk-scf/integration/sip.git