diff options
| -rw-r--r-- | main/pbx.c | 4 | ||||
| -rw-r--r-- | res/res_features.c | 36 |
2 files changed, 40 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c index f4e5a150c..88a6567ca 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2539,7 +2539,10 @@ static int __ast_pbx_run(struct ast_channel *c) 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); +#ifdef HANGUP_EXTEN_EXECUTION_MOVED_TO_res_features if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) { + /* end before h exten was here */ + 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))) { @@ -2553,6 +2556,7 @@ static int __ast_pbx_run(struct ast_channel *c) c->priority++; } } +#endif ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP); pbx_destroy(c->pbx); diff --git a/res/res_features.c b/res/res_features.c index 75e1ccbd9..101ce09a0 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1659,6 +1659,42 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } before_you_go: + if (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]; + + 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)); + chan->cdr = bridge_cdr; + ast_channel_lock(chan); + ast_copy_string(chan->exten, "h", sizeof(chan->exten)); + 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 */ + chan->cdr = swapper; + /* 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))) { |