[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  7e28b5c4d0d651ca391be8d77aeeaaddb61814e3 (commit)
       via  3ad15d54d69ac71b718ab18f36611e80d09f54e3 (commit)
      from  1abad6694e0a22498d264b09584d7e6922a76953 (commit)

Summary of changes:
 local-slice/SipStateReplicationIf.ice |    1 +
 src/SipStateReplicatorListener.cpp    |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 7e28b5c4d0d651ca391be8d77aeeaaddb61814e3
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Sep 21 10:07:17 2010 -0300

    Remove old TODO comment.

diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index dc12e6a..afeb749 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -67,7 +67,6 @@ public:
 	 {
 	    if (i == mStateItems.end())
 	    {
-	       // TODO: Use value in state item to find endpoint
 	       SipChannelServiceDataModel &dataModel = SipChannelServiceDataModel::getInstance();
 	       boost::shared_ptr<SipEndpointFactory> factory = dataModel.getEndpointFactory();
 	       SipEndpointPtr endpoint = factory->findByName(session->mEndpointName);

commit 3ad15d54d69ac71b718ab18f36611e80d09f54e3
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Sep 21 10:06:43 2010 -0300

    Add endpoint name to session state item and use it to find the endpoint that is used to create the replica session.

diff --git a/local-slice/SipStateReplicationIf.ice b/local-slice/SipStateReplicationIf.ice
index 326994a..90ac4a2 100644
--- a/local-slice/SipStateReplicationIf.ice
+++ b/local-slice/SipStateReplicationIf.ice
@@ -92,6 +92,7 @@ module V1
    {
       //XXX There probably needs to be a lot more specified
 	  //here, but frankly I have no clue.
+      string mEndpointName;
       Ice::Identity mSessionObjectId;
       Ice::Identity mMediaSessionObjectId;
       AsteriskSCF::Media::V1::StreamSourceSeq mSources;
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index 7faccc6..dc12e6a 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -12,7 +12,9 @@
 #include <boost/shared_ptr.hpp>
 
 #include "SipStateReplicator.h"
+#include "SipChannelServiceDataModel.h"
 #include "SipEndpoint.h"
+#include "SipEndpointFactory.h"
 #include "SipSession.h"
 
 namespace AsteriskSCF
@@ -66,7 +68,9 @@ public:
 	    if (i == mStateItems.end())
 	    {
 	       // TODO: Use value in state item to find endpoint
-	       SipEndpointPtr endpoint;
+	       SipChannelServiceDataModel &dataModel = SipChannelServiceDataModel::getInstance();
+	       boost::shared_ptr<SipEndpointFactory> factory = dataModel.getEndpointFactory();
+	       SipEndpointPtr endpoint = factory->findByName(session->mEndpointName);
 
 	       // If we lack the endpoint (due to misconfiguration) we can't procceed
 	       if (endpoint == 0)

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


-- 
asterisk-scf/integration/sip.git