Module: sems Branch: rco/offer_answer Commit: e693615aab23a59efd6aa335098b828fa6c54736 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=e693615aab23a59efd6aa335098b828fa6c54736
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Tue Oct 19 18:05:28 2010 +0200 fixed: early_announce --- apps/early_announce/EarlyAnnounce.cpp | 2 +- apps/early_announce/EarlyAnnounce.h | 2 +- core/AmSipDialog.cpp | 17 ++++++----------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/apps/early_announce/EarlyAnnounce.cpp b/apps/early_announce/EarlyAnnounce.cpp index 65f72a1..3be9b34 100644 --- a/apps/early_announce/EarlyAnnounce.cpp +++ b/apps/early_announce/EarlyAnnounce.cpp @@ -340,7 +340,7 @@ EarlyAnnounceDialog::~EarlyAnnounceDialog() { } -void EarlyAnnounceDialog::onSessionStart(const AmSipRequest& req) +void EarlyAnnounceDialog::onEarlySessionStart() { // we can drop all received packets // this disables DTMF detection as well diff --git a/apps/early_announce/EarlyAnnounce.h b/apps/early_announce/EarlyAnnounce.h index f4ede8b..29ec5b6 100644 --- a/apps/early_announce/EarlyAnnounce.h +++ b/apps/early_announce/EarlyAnnounce.h @@ -75,7 +75,7 @@ public: ~EarlyAnnounceDialog(); void onInvite(const AmSipRequest& req); - void onSessionStart(const AmSipRequest& req); + void onEarlySessionStart(); void onBye(const AmSipRequest& req); void onCancel(); void onDtmf(int event, int duration_msec) {} diff --git a/core/AmSipDialog.cpp b/core/AmSipDialog.cpp index 5bb81c0..93b5e6f 100644 --- a/core/AmSipDialog.cpp +++ b/core/AmSipDialog.cpp @@ -470,14 +470,11 @@ int AmSipDialog::onTxReply(AmSipReply& reply) // update Offer/Answer state // TODO: support multipart mime - if(reply.content_type.empty()){ - - if((reply.cseq_method == "INVITE") || (reply.cseq_method == "UPDATE")){ + if((reply.cseq_method == "INVITE") || (reply.cseq_method == "UPDATE")){ - if(triggerOfferAnswer(reply.content_type, reply.body)){ - DBG("triggerOfferAnswer() failed\n"); - return -1; - } + if(triggerOfferAnswer(reply.content_type, reply.body)){ + DBG("triggerOfferAnswer() failed\n"); + return -1; } } @@ -785,10 +782,8 @@ int AmSipDialog::reply(const AmSipRequest& req, } } - if(!content_type.empty() && !body.empty()) { - reply.content_type = content_type; - reply.body = body; - } + reply.content_type = content_type; + reply.body = body; if(onTxReply(reply)){ DBG("onTxReply failed\n"); _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
