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

[Commits to the Asterisk SCF project code repositories]

branch "party-id" has been updated
       via  79b290400e05f79f049b5b5cc087092f34813662 (commit)
       via  9625afe1685db25068b894fcbbe87bd6586e749c (commit)
      from  74e6bddde07e381181f09c6fd9091f223fb0b615 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |    2 +-
 src/SipSession.cpp         |   14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 79b290400e05f79f049b5b5cc087092f34813662
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Oct 13 11:46:49 2011 -0500

    Fix compiler errors and get outgoing headers set correctly.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index d233572..6e86c85 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -500,7 +500,7 @@ protected:
                 SuspendableWorkListenerPtr listener = 0;
                 SipAMICallbackPtr cb(new SipAMICallback(listener, mSession, this, false, true));
                 Ice::CallbackPtr d = Ice::newCallback(cb, &SipAMICallback::callback);
-                mSessionRouter->begin_routeSession(operationId, mSession->getSessionProxy(), mDestination, 0, d);
+                mSessionRouter->begin_routeSession(operationId, mSession->getSessionProxy(), mDestination, 0, mCallerID, d);
             }
         }
         catch (const Ice::CommunicatorDestroyedException &)
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index fefc4f7..6b3daaa 100755
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -890,7 +890,7 @@ public:
 
     void updateCallerID(const CallerPtr& caller, const Ice::Current&)
     {
-        AsteriskSCF::SessionCommunications::V1::SEssionCookies cookies;
+        AsteriskSCF::SessionCommunications::V1::SessionCookies cookies;
         cookies.push_back(caller);
 
         mSession->enqueueSessionWork(new SetCookiesOperation(cookies, mImplPriv, true));
@@ -2066,7 +2066,7 @@ private:
         pj_str_t referredByHdrStr;
         pj_cstr(&referredByHdrStr, "Referred-By");
         pj_str_t referredByValStr;
-        pj_cstr(&referredByValStr, referredBy->value.c_str());
+        pj_strset(&referredByValStr, (char *) referredBy->value.c_str(), referredBy->value.length());
 
         pjsip_generic_string_hdr *hdr =
             pjsip_generic_string_hdr_create(packet->pool, &referredByHdrStr, &referredByValStr);
@@ -2101,7 +2101,7 @@ private:
             std::stringstream ss;
             SipEndpointConfig &config = mSession->getEndpoint()->getConfig();
             ss << "\"" << callerName << "\" <" << callerNumber << "@" << config.sessionConfig.sourceAddress << ">;party=calling";
-            pj_cstr(&paiValue, ss.str().c_str());
+            pj_strset(&paiValue, (char *) ss.str().c_str(), ss.str().length());
 
             pjsip_generic_string_hdr *hdr =
                 pjsip_generic_string_hdr_create(packet->pool, &paiHeader, &paiValue);
@@ -2137,7 +2137,7 @@ private:
             std::stringstream ss;
             SipEndpointConfig &config = mSession->getEndpoint()->getConfig();
             ss << "\"" << fromName << "\" <" << fromNumber << "@" << config.sessionConfig.sourceAddress << ">;reason=unconditional;counter=1";
-            pj_cstr(&diversionValue, ss.str().c_str());
+            pj_strset(&diversionValue, (char *) ss.str().c_str(), ss.str().length());
 
             pjsip_generic_string_hdr *hdr =
                 pjsip_generic_string_hdr_create(packet->pool, &diversionHeader, &diversionValue);

commit 9625afe1685db25068b894fcbbe87bd6586e749c
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Oct 12 16:40:14 2011 -0500

    Add new SessionController method.

diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index cec0879..fefc4f7 100755
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -888,6 +888,14 @@ public:
         mSession->enqueueSessionWork(new SetCookiesOperation(cookies, mImplPriv, true));
     }
 
+    void updateCallerID(const CallerPtr& caller, const Ice::Current&)
+    {
+        AsteriskSCF::SessionCommunications::V1::SEssionCookies cookies;
+        cookies.push_back(caller);
+
+        mSession->enqueueSessionWork(new SetCookiesOperation(cookies, mImplPriv, true));
+    }
+
     /**
      * This operation provides notification that some other Session we are connected to
      * has been redirected. 

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


-- 
asterisk-scf/integration/sip.git