[asterisk-commits] murf: branch murf/cdr-debug-1.4 r172311 - in /team/murf/cdr-debug-1.4: ./ app...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 29 09:01:31 CST 2009
Author: murf
Date: Thu Jan 29 09:01:31 2009
New Revision: 172311
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=172311
Log:
Merged revisions 172030,172169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r172030 | murf | 2009-01-28 11:51:16 -0700 (Wed, 28 Jan 2009) | 46 lines
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
........
r172169 | oej | 2009-01-29 01:48:18 -0700 (Thu, 29 Jan 2009) | 16 lines
Make sure that we always add the hangupcause headers. In some cases, the owner was disconnected before we checked for the cause.
This patch implements a temporary storage in the pvt and use that instead.
The code is based on ideas from code from Adomjan in issue #13385 (Add support for Reason: header)
Thanks to Klaus Darillion for testing!
(closes issue #14294)
related to issue #13385
Reported by: klaus3000 and adomjan
Patches:
bug14294b.diff uploaded by oej (license 306)
Based on 20080829_chan_sip.c-q850reason_header.patch uploaded by adomjan (license 487)
Tested by: oej, klaus3000
........
Modified:
team/murf/cdr-debug-1.4/ (props changed)
team/murf/cdr-debug-1.4/apps/app_channelredirect.c
team/murf/cdr-debug-1.4/channels/chan_sip.c
team/murf/cdr-debug-1.4/include/asterisk/channel.h
team/murf/cdr-debug-1.4/main/manager.c
team/murf/cdr-debug-1.4/main/pbx.c
team/murf/cdr-debug-1.4/res/res_features.c
Propchange: team/murf/cdr-debug-1.4/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/murf/cdr-debug-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 29 09:01:31 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-171993
+/branches/1.4:1-172310
Modified: team/murf/cdr-debug-1.4/apps/app_channelredirect.c
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/apps/app_channelredirect.c?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/apps/app_channelredirect.c (original)
+++ team/murf/cdr-debug-1.4/apps/app_channelredirect.c Thu Jan 29 09:01:31 2009
@@ -108,6 +108,11 @@
if (option_debug > 1)
ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
+ if (chan2->pbx) {
+ ast_channel_lock(chan2);
+ ast_set_flag(chan2, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
+ ast_channel_unlock(chan2);
+ }
if (ast_async_goto_if_exists(chan2, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio))
ast_log(LOG_WARNING, "%s failed for %s\n", app, args.channel);
else
Modified: team/murf/cdr-debug-1.4/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/channels/chan_sip.c?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/channels/chan_sip.c (original)
+++ team/murf/cdr-debug-1.4/channels/chan_sip.c Thu Jan 29 09:01:31 2009
@@ -1028,6 +1028,7 @@
struct sip_pvt *next; /*!< Next dialog in chain */
struct sip_invite_param *options; /*!< Options for INVITE */
int autoframing;
+ int hangupcause; /*!< Storage of hangupcause copied from our owner before we disconnect from the AST channel (only used at hangup) */
} *iflist = NULL;
/*! Max entires in the history list for a sip_pvt */
@@ -3539,6 +3540,10 @@
return 0;
}
+ /* Store hangupcause locally in PVT so we still have it before disconnect */
+ if (p->owner)
+ p->hangupcause = p->owner->hangupcause;
+
if (ast_test_flag(&p->flags[0], SIP_DEFER_BYE_ON_TRANSFER)) {
if (ast_test_flag(&p->flags[0], SIP_INC_COUNT) || ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {
if (option_debug && sipdebug)
@@ -3589,7 +3594,7 @@
stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
- append_history(p, needcancel ? "Cancel" : "Hangup", "Cause %s", p->owner ? ast_cause2str(p->owner->hangupcause) : "Unknown");
+ append_history(p, needcancel ? "Cancel" : "Hangup", "Cause %s", p->owner ? ast_cause2str(p->hangupcause) : "Unknown");
/* Disconnect */
if (p->vad)
@@ -3641,7 +3646,7 @@
}
} else { /* Incoming call, not up */
const char *res;
- if (ast->hangupcause && (res = hangup_cause2sip(ast->hangupcause)))
+ if (p->hangupcause && (res = hangup_cause2sip(p->hangupcause)))
transmit_response_reliable(p, res, &p->initreq);
else
transmit_response_reliable(p, "603 Declined", &p->initreq);
@@ -7998,11 +8003,11 @@
}
/* If we are hanging up and know a cause for that, send it in clear text to make
debugging easier. */
- if (sipmethod == SIP_BYE && p->owner && p->owner->hangupcause) {
+ if (sipmethod == SIP_BYE) {
char buf[10];
- add_header(&resp, "X-Asterisk-HangupCause", ast_cause2str(p->owner->hangupcause));
- snprintf(buf, sizeof(buf), "%d", p->owner->hangupcause);
+ add_header(&resp, "X-Asterisk-HangupCause", ast_cause2str(p->hangupcause));
+ snprintf(buf, sizeof(buf), "%d", p->hangupcause);
add_header(&resp, "X-Asterisk-HangupCauseCode", buf);
}
Modified: team/murf/cdr-debug-1.4/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/include/asterisk/channel.h?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/include/asterisk/channel.h (original)
+++ team/murf/cdr-debug-1.4/include/asterisk/channel.h Thu Jan 29 09:01:31 2009
@@ -514,6 +514,10 @@
* a message aimed at preventing a subsequent hangup exten being run at the pbx_run
* level */
AST_FLAG_BRIDGE_HANGUP_RUN = (1 << 16),
+ /*! This flag indicates that the hangup exten should NOT be run when the
+ * bridge terminates, this will allow the hangup in the pbx loop to be run instead.
+ * */
+ AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 17),
};
/*! \brief ast_bridge_config flags */
Modified: team/murf/cdr-debug-1.4/main/manager.c
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/main/manager.c?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/main/manager.c (original)
+++ team/murf/cdr-debug-1.4/main/manager.c Thu Jan 29 09:01:31 2009
@@ -1672,13 +1672,24 @@
ast_channel_unlock(chan2);
return 0;
}
+ if (chan->pbx) {
+ ast_channel_lock(chan);
+ ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
+ ast_channel_unlock(chan);
+ }
res = ast_async_goto(chan, context, exten, pi);
if (!res) {
if (!ast_strlen_zero(name2)) {
- if (chan2)
+ if (chan2) {
+ if (chan2->pbx) {
+ ast_channel_lock(chan2);
+ ast_set_flag(chan2, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
+ ast_channel_unlock(chan2);
+ }
res = ast_async_goto(chan2, context, exten, pi);
- else
+ } else {
res = -1;
+ }
if (!res)
astman_send_ack(s, m, "Dual Redirect successful");
else
Modified: team/murf/cdr-debug-1.4/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/main/pbx.c?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/main/pbx.c (original)
+++ team/murf/cdr-debug-1.4/main/pbx.c Thu Jan 29 09:01:31 2009
@@ -2550,6 +2550,9 @@
ast_log(LOG_NOTICE,"About to consider the H extension\n");
if ((res != AST_PBX_KEEPALIVE) && !ast_test_flag(c, AST_FLAG_BRIDGE_HANGUP_RUN) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) {
set_ext_pri(c, "h", 1);
+ if (c->cdr && ast_opt_end_cdr_before_h_exten) {
+ ast_cdr_end(c->cdr);
+ }
while(ast_exists_extension(c, c->context, c->exten, c->priority, c->cid.cid_num)) {
if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num))) {
/* Something bad happened, or a hangup has been requested. */
Modified: team/murf/cdr-debug-1.4/res/res_features.c
URL: http://svn.digium.com/svn-view/asterisk/team/murf/cdr-debug-1.4/res/res_features.c?view=diff&rev=172311&r1=172310&r2=172311
==============================================================================
--- team/murf/cdr-debug-1.4/res/res_features.c (original)
+++ team/murf/cdr-debug-1.4/res/res_features.c Thu Jan 29 09:01:31 2009
@@ -758,18 +758,20 @@
pbx_builtin_setvar_helper(transferer, "BLINDTRANSFER", transferee->name);
pbx_builtin_setvar_helper(transferee, "BLINDTRANSFER", transferer->name);
res=finishup(transferee);
- if (!transferer->cdr) {
+ if (!transferer->cdr) { /* this code should never get called (in a perfect world) */
transferer->cdr=ast_cdr_alloc();
- if (transferer) {
+ if (transferer->cdr) {
ast_log(LOG_NOTICE,"calling cdr_int, cdr_start\n");
ast_cdr_init(transferer->cdr, transferer); /* initilize our channel's cdr */
ast_cdr_start(transferer->cdr);
}
}
if (transferer->cdr) {
- ast_log(LOG_NOTICE,"calling cdr_setdest, cdr_setapp\n");
- ast_cdr_setdestchan(transferer->cdr, transferee->name);
- ast_cdr_setapp(transferer->cdr, "BLINDTRANSFER","");
+ struct ast_cdr *swap = transferer->cdr;
+ /* swap cdrs-- it will save us some time & work */
+ transferer->cdr = transferee->cdr;
+ transferee->cdr = swap;
+ ast_log(LOG_NOTICE,"SWAPPED CDR's between %s and %s\n", transferer->name, transferee->name);
}
if (!transferee->pbx) {
/* Doh! Use our handy async_goto functions */
@@ -781,6 +783,7 @@
res = -1;
} else {
/* Set the channel's new extension, since it exists, using transferer context */
+ ast_set_flag(transferee, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
set_c_e_p(transferee, transferer_real_context, xferto, 0);
}
check_goto_on_transfer(transferer);
@@ -1569,9 +1572,11 @@
ast_cdr_answer(bridge_cdr);
ast_cdr_answer(chan_cdr); /* for the sake of cli status checks */
}
- ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
- if (peer_cdr) {
- ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED);
+ if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT)) {
+ ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
+ if (peer_cdr) {
+ ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED);
+ }
}
}
@@ -1748,19 +1753,30 @@
log_cdr(peer->cdr, "AFTER bridge PEER CDR");
new_chan_cdr = pick_unlocked_cdr(chan->cdr); /* the proper chan cdr, if there are forked cdrs */
new_peer_cdr = pick_unlocked_cdr(peer->cdr); /* the proper chan cdr, if there are forked cdrs */
+
+ if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT)) {
+ ast_clear_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT); /* its job is done */
+ if (bridge_cdr) {
+ ast_cdr_discard(bridge_cdr);
+ /* QUESTION: should we copy bridge_cdr fields to the peer before we throw it away? */
+ }
+ return res; /* if we shouldn't do the h-exten, we shouldn't do the bridge cdr, either! */
+ }
+
if (config->end_bridge_callback) {
config->end_bridge_callback(config->end_bridge_callback_data);
}
- autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
- ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
- if (!ast_test_flag(&(config->features_caller),AST_FEATURE_NO_H_EXTEN) && ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) {
+ if (!ast_test_flag(&(config->features_caller),AST_FEATURE_NO_H_EXTEN) &&
+ ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) {
struct ast_cdr *swapper = NULL;
char savelastapp[AST_MAX_EXTENSION];
char savelastdata[AST_MAX_EXTENSION];
char save_exten[AST_MAX_EXTENSION];
int save_prio;
+ autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
+ ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
if (bridge_cdr && ast_opt_end_cdr_before_h_exten) {
ast_cdr_end(bridge_cdr);
}
@@ -1802,9 +1818,9 @@
ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));
}
- }
- ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
-
+ ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
+ }
+
/* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */
new_chan_cdr = pick_unlocked_cdr(chan->cdr); /* the proper chan cdr, if there are forked cdrs */
if (bridge_cdr && new_chan_cdr && ast_test_flag(new_chan_cdr, AST_CDR_FLAG_POST_DISABLED)) {
@@ -1895,6 +1911,7 @@
ast_cdr_specialized_reset(peer_cdr,0); /* nothing changed, reset the peer_cdr */
}
}
+
return res;
}
More information about the asterisk-commits
mailing list