Module: sems Branch: master Commit: b1385545c92c4a3c92a2f6873c55500f090bbbdf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=b1385545c92c4a3c92a2f6873c55500f090bbbdf
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Mon Jul 18 19:34:39 2011 +0200 fixed onCancel to adapt to new AmSession API --- apps/examples/b2b_connect/b2b_connect.cpp | 2 +- apps/examples/b2b_connect/b2b_connect.h | 2 +- apps/gateway/GWSession.cpp | 4 ++-- apps/gateway/GWSession.h | 2 +- core/AmB2BSession.cpp | 2 +- core/AmB2BSession.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/examples/b2b_connect/b2b_connect.cpp b/apps/examples/b2b_connect/b2b_connect.cpp index cc2808f..2b88e60 100644 --- a/apps/examples/b2b_connect/b2b_connect.cpp +++ b/apps/examples/b2b_connect/b2b_connect.cpp @@ -220,7 +220,7 @@ void b2b_connectDialog::onBye(const AmSipRequest& req) } -void b2b_connectDialog::onCancel() +void b2b_connectDialog::onCancel(const AmSipRequest& req) { if(dlg.getStatus() == AmSipDialog::Pending) { DBG("Wait for leg B to terminate"); diff --git a/apps/examples/b2b_connect/b2b_connect.h b/apps/examples/b2b_connect/b2b_connect.h index 8bc908b..0c0a90b 100644 --- a/apps/examples/b2b_connect/b2b_connect.h +++ b/apps/examples/b2b_connect/b2b_connect.h @@ -68,7 +68,7 @@ class b2b_connectDialog : public AmB2ABCallerSession void onDtmf(int event, int duration); void onBye(const AmSipRequest& req); void onInvite(const AmSipRequest& req); - void onCancel(); + void onCancel(const AmSipRequest& req); protected: diff --git a/apps/gateway/GWSession.cpp b/apps/gateway/GWSession.cpp index 74d953c..116e4e9 100644 --- a/apps/gateway/GWSession.cpp +++ b/apps/gateway/GWSession.cpp @@ -65,10 +65,10 @@ void GWSession::onBye(const AmSipRequest& req) { AmSession::onBye(req); } -void GWSession::onCancel() { +void GWSession::onCancel(const AmSipRequest& req) { DBG("GWSession::onCancel\n"); int ret=((mISDNChannel*)m_OtherLeg)->hangup(); - AmSession::onCancel(); + AmSession::onCancel(req); } diff --git a/apps/gateway/GWSession.h b/apps/gateway/GWSession.h index 4ef9a7c..f0fabd4 100644 --- a/apps/gateway/GWSession.h +++ b/apps/gateway/GWSession.h @@ -25,7 +25,7 @@ static GWSession* CallFromOutside(std::string &fromnumber, std::string &tonum //virtual void onDtmf(int event, int duration); //virtual void onStart(){} void onInvite(const AmSipRequest& req); - void onCancel(); + void onCancel(const AmSipRequest& req); void onSessionStart(const AmSipRequest& req); void onSessionStart(const AmSipReply& reply); //virtual void onEarlySessionStart(const AmSipReply& reply){} diff --git a/core/AmB2BSession.cpp b/core/AmB2BSession.cpp index bdf7f31..20d8414 100644 --- a/core/AmB2BSession.cpp +++ b/core/AmB2BSession.cpp @@ -1032,7 +1032,7 @@ void AmB2BCallerSession::onInvite2xx(const AmSipReply& reply) AmB2BSession::onInvite2xx(reply); } -void AmB2BCallerSession::onCancel() +void AmB2BCallerSession::onCancel(const AmSipRequest& req) { terminateOtherLeg(); terminateLeg(); diff --git a/core/AmB2BSession.h b/core/AmB2BSession.h index ea3c0a2..7daee5d 100644 --- a/core/AmB2BSession.h +++ b/core/AmB2BSession.h @@ -312,7 +312,7 @@ class AmB2BCallerSession: public AmB2BSession // @see AmSession void onInvite(const AmSipRequest& req); void onInvite2xx(const AmSipReply& reply); - void onCancel(); + void onCancel(const AmSipRequest& req); // @see AmB2BSession void terminateLeg(); _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
