[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  337d252631934a48399d4e74ed56a7604da36135 (commit)
       via  53946dcc3799c012a6c03c09586753405ffe1134 (commit)
      from  bbcd0748bdf2595e6da8fb7eb1c3597061a04790 (commit)

Summary of changes:
 src/SipEndpoint.cpp |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit 337d252631934a48399d4e74ed56a7604da36135
Merge: 53946dc bbcd074
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 15:49:29 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/sip


commit 53946dcc3799c012a6c03c09586753405ffe1134
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 15:49:05 2010 -0300

    Make the parameters match reality.

diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 339dbcc..e88be9a 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -7,15 +7,17 @@ namespace SipChannelService
 
 class SipSignalCommands : public Hydra::Session::V1::SignalCommands
 {
-	bool call(Core::Endpoint::V1::EndpointId caller, Core::Endpoint::V1::EndpointId destination, SignalCallback callback)
+public:
+	bool call(const Core::Endpoint::V1::EndpointIdPtr& caller, const Core::Endpoint::V1::EndpointIdPtr& destination, const Hydra::Session::V1::SignalCallbackPtr& callback, const Ice::Current&)
 	{
 		//stub
 		//I'm not sure what this callback is supposed to do. Am
 		//I supposed to make an outgoing call? If so, what am
 		//I supposed to do with the "caller" and "callback"
 		//parameters?
+		return true;
 	}
-	void terminate(Core::Endpoint::V1::EndpointId caller)
+	void terminate(const Core::Endpoint::V1::EndpointIdPtr& caller, const Ice::Current&)
 	{
 		//stub
 		//What's the difference between this and
@@ -25,7 +27,8 @@ class SipSignalCommands : public Hydra::Session::V1::SignalCommands
 
 class SipSignalCallback : public Hydra::Session::V1::SignalCallback
 {
-	void ring(Core::Endpoint::V1::EndpointId ep)
+public:
+	void ring(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//Look up SipSessionEndpoint
@@ -46,7 +49,7 @@ class SipSignalCallback : public Hydra::Session::V1::SignalCallback
 		//just modify the previous transaction's tdata
 		//as shown in PJSIP developer's guide 10.3.1
 	}
-	void connected(Core::Endpoint::V1::EndpointId ep)
+	void connected(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//Similar to ring()
@@ -54,7 +57,7 @@ class SipSignalCallback : public Hydra::Session::V1::SignalCallback
 		//including an SDP answer, or an SDP offer
 		//in some odd situations.
 	}
-	void terminated(Core::Endpoint::V1::EndpointId ep, ResponseCode response)
+	void terminated(const Core::Endpoint::V1::EndpointIdPtr& ep, const Hydra::Session::V1::ResponseCodePtr& response, const Ice::Current&)
 	{
 		//stub
 		//There was some confusion about this when Ken and
@@ -69,17 +72,17 @@ class SipSignalCallback : public Hydra::Session::V1::SignalCallback
 		//pjsip_dlg_send_request
 		//pjsip_dlg_dec_session
 	}
-	void busy(Core::Endpoint::V1::EndpointId ep)
+	void busy(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//Similar to ring, but send a 486
 	}
-	void congestion(Core::Endpoint::V1::EndpointId ep, ResponseCode response)
+	void congestion(const Core::Endpoint::V1::EndpointIdPtr& ep, const Hydra::Session::V1::ResponseCodePtr& response, const Ice::Current&)
 	{
 		//stub
 		//Similar to ring, but send a 500
 	}
-	void hold(Core::Endpoint::V1::EndpointId ep)
+	void hold(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//This one's interesting. Like with
@@ -91,18 +94,18 @@ class SipSignalCallback : public Hydra::Session::V1::SignalCallback
 		//API instead of the base dialog API. It may
 		//be a bit inflexible though.
 	}
-	void unhold(Core::Endpoint::V1::EndpointId ep)
+	void unhold(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//Similar to hold() but use sendrcv attribute
 		//for reinvite.
-	{
-	void flash(Core::Endpoint::V1::EndpointId ep)
+	}
+	void flash(const Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current&)
 	{
 		//stub
 		//I...don't know :(
 	}
-	void progress(Core::Endpoint::V1::EndpointId ep, ResponseCode response)
+	void progress(const Core::Endpoint::V1::EndpointIdPtr& ep, const Hydra::Session::V1::ResponseCodePtr& response, const Ice::Current&)
 	{
 		//stub
 		//Similar to connected(), but the response code
@@ -114,8 +117,8 @@ class SipSignalCallback : public Hydra::Session::V1::SignalCallback
  */
 SipEndpoint::SipEndpoint()
 {
-	command = &_sipSignalCommands;
-	callback = &_sipSignalCallback;
+//	command = &_sipSignalCommands;
+//	callback = &_sipSignalCallback;
 	// XXX Should also set the id field here, too, and add it to
 	// a list of endpoints. Maybe that's what the factory does?
 }

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


-- 
asterisk-scf/integration/sip.git