Module: sems Branch: rco/offer_answer Commit: f841f2c62426ef271aa090b48ebb1ba76fffe94f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=f841f2c62426ef271aa090b48ebb1ba76fffe94f
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Fri Apr 15 13:53:18 2011 +0200 offer_answer: merge fixes. --- apps/ivr/IvrSipReply.cpp | 4 ++-- apps/sbc/SBC.cpp | 2 +- apps/sbc/SBC.h | 2 +- core/AmB2BSession.cpp | 2 +- core/AmB2BSession.h | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/ivr/IvrSipReply.cpp b/apps/ivr/IvrSipReply.cpp index 80c29cc..4eeb994 100644 --- a/apps/ivr/IvrSipReply.cpp +++ b/apps/ivr/IvrSipReply.cpp @@ -75,7 +75,7 @@ IvrSipReply_dealloc(IvrSipReply* self) def_IvrSipReply_GETTER(IvrSipReply_getreason, reason) -//def_IvrSipReply_GETTER(IvrSipReply_getnext_request_uri, next_request_uri) +def_IvrSipReply_GETTER(IvrSipReply_getcontact, contact) def_IvrSipReply_GETTER(IvrSipReply_gethdrs, hdrs) def_IvrSipReply_GETTER(IvrSipReply_getfrom_tag, from_tag) def_IvrSipReply_GETTER(IvrSipReply_getto_tag, to_tag) @@ -97,7 +97,7 @@ IvrSipReply_getcode(IvrSipReply *self, void *closure) static PyGetSetDef IvrSipReply_getset[] = { {(char*)"code", (getter)IvrSipReply_getcode, NULL, (char*)"code", NULL}, {(char*)"reason", (getter)IvrSipReply_getreason, NULL, (char*)"reason", NULL}, - {(char*)"next_request_uri",(getter)IvrSipReply_getnext_request_uri, NULL, (char*)"next_request_uri", NULL}, + {(char*)"contact",(getter)IvrSipReply_getcontact, NULL, (char*)"contact", NULL}, {(char*)"route", (getter)IvrSipReply_getroute, NULL, (char*)"route", NULL}, {(char*)"hdrs", (getter)IvrSipReply_gethdrs, NULL, (char*)"hdrs", NULL}, {(char*)"body", (getter)IvrSipReply_getbody, NULL, (char*)"body", NULL}, diff --git a/apps/sbc/SBC.cpp b/apps/sbc/SBC.cpp index a4a305e..dd0dc35 100644 --- a/apps/sbc/SBC.cpp +++ b/apps/sbc/SBC.cpp @@ -874,7 +874,7 @@ void SBCDialog::onBye(const AmSipRequest& req) } -void SBCDialog::onCancel() +void SBCDialog::onCancel(const AmSipRequest& cancel) { dlg.reply(cancel.cseq, 487, "Request terminated"); stopCall(); diff --git a/apps/sbc/SBC.h b/apps/sbc/SBC.h index 91be015..0752f38 100644 --- a/apps/sbc/SBC.h +++ b/apps/sbc/SBC.h @@ -132,7 +132,7 @@ class SBCDialog : public AmB2BCallerSession void process(AmEvent* ev); void onBye(const AmSipRequest& req); void onInvite(const AmSipRequest& req); - void onCancel(); + void onCancel(const AmSipRequest& cancel); protected: int relayEvent(AmEvent* ev); diff --git a/core/AmB2BSession.cpp b/core/AmB2BSession.cpp index fef7d5b..52550f7 100644 --- a/core/AmB2BSession.cpp +++ b/core/AmB2BSession.cpp @@ -858,7 +858,7 @@ void AmB2BCallerSession::onB2BEvent(B2BEvent* ev) DBG("Discarding B2BSipReply from other leg (other_id empty)\n"); DBG("reply code=%i; method=%s; callid=%s; from_tag=%s; " "to_tag=%s; cseq=%i\n", - reply.code,reply.method.c_str(),reply.callid.c_str(),reply.from_tag.c_str(), + reply.code,reply.cseq_method.c_str(),reply.callid.c_str(),reply.from_tag.c_str(), reply.to_tag.c_str(),reply.cseq); return; } diff --git a/core/AmB2BSession.h b/core/AmB2BSession.h index c539c3f..9e526de 100644 --- a/core/AmB2BSession.h +++ b/core/AmB2BSession.h @@ -308,7 +308,6 @@ class AmB2BCallerSession: public AmB2BSession // @see AmSession void onInvite(const AmSipRequest& req); - void onSessionStart(const AmSipRequest& req); void onCancel(const AmSipRequest& cancel); // @see AmB2BSession _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
