[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  13d70dab4b45eec6af3e1778ac3fc231d998fc8b (commit)
       via  bbebc330ce2bbed2f84d4682c9f5273cdd774741 (commit)
      from  d34a07273a0c02273546841de634ec8ddb5fde29 (commit)

Summary of changes:
 slice               |    2 +-
 src/SipEndpoint.cpp |    3 ++-
 src/SipEndpoint.h   |   15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 13d70dab4b45eec6af3e1778ac3fc231d998fc8b
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Aug 24 16:32:23 2010 -0300

    Store the signal callback proxy so that the PJ stuff can use it when invoking operations.

diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 16deeff..0252362 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -48,6 +48,7 @@ public:
 	   // Before we send the message we probably should populate the endpoint data... just in case
 	   mEndpoint->setDialog(dialog);
 	   mEndpoint->setInviteSession(inviteSession);
+	   mEndpoint->setSignalCallback(callback);
 
 	   // Boom! Houston, we have transmission.
 	   pjsip_inv_send_msg(inviteSession, packet);
diff --git a/src/SipEndpoint.h b/src/SipEndpoint.h
index 10148b0..1ad66fe 100644
--- a/src/SipEndpoint.h
+++ b/src/SipEndpoint.h
@@ -52,6 +52,16 @@ public:
     */
    pjsip_inv_session *getInviteSession() { return mInviteSession; };
 
+   /**
+    * Internal function which sets the signal callback proxy.
+    */
+   void setSignalCallback(const Hydra::Session::V1::SignalCallbackPrx& callback) { mSignalCallback = callback; };
+
+   /**
+    * Internal function which gets the signal callback proxy.
+    */
+   Hydra::Session::V1::SignalCallbackPrx getSignalCallback() { return mSignalCallback; };
+
 private:
    /**
     * An instance of signal commands.
@@ -87,6 +97,11 @@ private:
     * PJsip INVITE session for this endpoint.
     */
    pjsip_inv_session *mInviteSession;
+
+   /**
+    * A proxy to the signal callback interface we should invoke signal operations on.
+    */
+   Hydra::Session::V1::SignalCallbackPrx mSignalCallback;
 };
 
 }; //End namespace SipChannelService

commit bbebc330ce2bbed2f84d4682c9f5273cdd774741
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Aug 24 16:28:07 2010 -0300

    Update to use the fixed SessionIf slice.

diff --git a/slice b/slice
index 5d80463..d6b2777 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 5d804630eb1081d200e1408644b6af22a8a751f3
+Subproject commit d6b2777545b3b8eae7c5dc9b40a1ca3ff9e26a43
diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 38893ba..16deeff 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -13,7 +13,7 @@ class SipSignalCommands : public Hydra::Session::V1::SignalCommands
 public:
 	SipSignalCommands(SipEndpoint *endpoint) : mEndpoint(endpoint) { };
 
-	bool call(const Core::Endpoint::V1::EndpointIdPtr& caller, const Core::Endpoint::V1::EndpointIdPtr& destination, const Hydra::Session::V1::SignalCallbackPtr& callback, const Ice::Current&)
+	bool call(const Core::Endpoint::V1::EndpointIdPtr& caller, const Core::Endpoint::V1::EndpointIdPtr& destination, const Hydra::Session::V1::SignalCallbackPrx& callback, const Ice::Current&)
 	{
 	   pj_str_t local_uri, remote_uri;
 	   pjsip_dialog *dialog;

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


-- 
asterisk-scf/integration/sip.git