[asterisk-commits] murf: branch murf/1.4-hexten r141018 - in /team/murf/1.4-hexten: apps/ includ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 3 16:34:52 CDT 2008
Author: murf
Date: Wed Sep 3 16:34:51 2008
New Revision: 141018
URL: http://svn.digium.com/view/asterisk?view=rev&rev=141018
Log:
changes up till now
Modified:
team/murf/1.4-hexten/apps/app_dial.c
team/murf/1.4-hexten/include/asterisk/channel.h
team/murf/1.4-hexten/main/pbx.c
team/murf/1.4-hexten/res/res_features.c
Modified: team/murf/1.4-hexten/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/1.4-hexten/apps/app_dial.c?view=diff&rev=141018&r1=141017&r2=141018
==============================================================================
--- team/murf/1.4-hexten/apps/app_dial.c (original)
+++ team/murf/1.4-hexten/apps/app_dial.c Wed Sep 3 16:34:51 2008
@@ -1741,6 +1741,8 @@
ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL);
if (ast_test_flag(peerflags, OPT_CALLER_PARK))
ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL);
+ if (ast_test_flag(peerflags, OPT_GO_ON))
+ ast_set_flag(&(config.features_caller), AST_FEATURE_NO_H_EXTEN);
config.timelimit = timelimit;
config.play_warning = play_warning;
Modified: team/murf/1.4-hexten/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/murf/1.4-hexten/include/asterisk/channel.h?view=diff&rev=141018&r1=141017&r2=141018
==============================================================================
--- team/murf/1.4-hexten/include/asterisk/channel.h (original)
+++ team/murf/1.4-hexten/include/asterisk/channel.h Wed Sep 3 16:34:51 2008
@@ -510,6 +510,10 @@
/*! This flag indicates that on a masquerade, an active stream should not
* be carried over */
AST_FLAG_MASQ_NOSTREAM = (1 << 15),
+ /*! This flag indicates that the hangup exten was run when the bridge terminated,
+ * a message aimed at preventing a subsequent hangup exten being run at the pbx_run
+ * level */
+ AST_FLAG_BRIDGE_HANGUP_RUN = (1 << 16),
};
/*! \brief ast_bridge_config flags */
@@ -520,6 +524,7 @@
AST_FEATURE_ATXFER = (1 << 3),
AST_FEATURE_AUTOMON = (1 << 4),
AST_FEATURE_PARKCALL = (1 << 5),
+ AST_FEATURE_NO_H_EXTEN = (1 << 6),
};
struct ast_bridge_config {
Modified: team/murf/1.4-hexten/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/murf/1.4-hexten/main/pbx.c?view=diff&rev=141018&r1=141017&r2=141018
==============================================================================
--- team/murf/1.4-hexten/main/pbx.c (original)
+++ team/murf/1.4-hexten/main/pbx.c Wed Sep 3 16:34:51 2008
@@ -2539,7 +2539,7 @@
ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name);
if (res != AST_PBX_KEEPALIVE)
ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING);
- if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) {
+ 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);
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))) {
@@ -2554,7 +2554,7 @@
}
}
ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP);
-
+ ast_clear_flag(c, AST_FLAG_BRIDGE_HANGUP_RUN); /* from one round to the next, make sure this gets cleared */
pbx_destroy(c->pbx);
c->pbx = NULL;
if (res != AST_PBX_KEEPALIVE)
Modified: team/murf/1.4-hexten/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/1.4-hexten/res/res_features.c?view=diff&rev=141018&r1=141017&r2=141018
==============================================================================
--- team/murf/1.4-hexten/res/res_features.c (original)
+++ team/murf/1.4-hexten/res/res_features.c Wed Sep 3 16:34:51 2008
@@ -1659,6 +1659,51 @@
}
before_you_go:
+ 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;
+ char savelastapp[AST_MAX_EXTENSION];
+ char savelastdata[AST_MAX_EXTENSION];
+ char save_exten[AST_MAX_EXTENSION];
+ int save_prio;
+
+ if (chan->cdr && ast_opt_end_cdr_before_h_exten) {
+ ast_cdr_end(bridge_cdr);
+ }
+ /* swap the bridge cdr and the chan cdr for a moment, and let the endbridge
+ dialplan code operate on it */
+ swapper = chan->cdr;
+ ast_copy_string(savelastapp, bridge_cdr->lastapp, sizeof(bridge_cdr->lastapp));
+ ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata));
+ ast_channel_lock(chan);
+ chan->cdr = bridge_cdr;
+ ast_copy_string(save_exten, chan->exten, sizeof(save_exten));
+ ast_copy_string(chan->exten, "h", sizeof(chan->exten));
+ save_prio = chan->priority;
+ chan->priority = 1;
+ ast_channel_unlock(chan);
+ while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
+ if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
+ /* Something bad happened, or a hangup has been requested. */
+ if (option_debug)
+ ast_log(LOG_DEBUG, "Spawn h extension (%s,%s,%d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
+ if (option_verbose > 1)
+ ast_verbose( VERBOSE_PREFIX_2 "Spawn h extension (%s, %s, %d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
+ break;
+ }
+ chan->priority++;
+ }
+ /* swap it back */
+ ast_channel_lock(chan);
+ ast_copy_string(chan->exten, save_exten, sizeof(chan->exten));
+ chan->priority = save_prio;
+ chan->cdr = swapper;
+ ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN);
+ ast_channel_unlock(chan);
+ /* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
+ ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
+ ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));
+ }
+
/* obey the NoCDR() wishes. */
if (!chan->cdr || (chan->cdr && !ast_test_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED))) {
More information about the asterisk-commits
mailing list