diff options
| author | Terry Wilson <twilson@digium.com> | 2008-10-31 18:55:33 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2008-10-31 18:55:33 +0000 |
| commit | 5fe37e47c6a0f9a256e9e5668d2fd0f94d5c7504 (patch) | |
| tree | 88c419c36f1dbffe6e003489a19683b9008f3f12 /main | |
| parent | 46abb39ca242746bfbceb1ee315cb68fa3e84243 (diff) | |
Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten. Added a callback function to handle setting variables, etc. from w/in the bridging code. Calls back into a nested function within the function calling ast_bridge_call
(closes issue #13793)
Reported by: greenfieldtech
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 0d3e2c64c..82b85669c 100644 --- a/main/features.c +++ b/main/features.c @@ -2119,6 +2119,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast int diff; int hasfeatures=0; int hadfeatures=0; + int autoloopflag; struct ast_option_header *aoh; struct ast_bridge_config backup_config; struct ast_cdr *bridge_cdr = NULL; @@ -2379,11 +2380,16 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } before_you_go: + if (res != AST_PBX_KEEPALIVE && config->end_bridge_callback) { + config->end_bridge_callback(); + } /* run the hangup exten on the chan object IFF it was NOT involved in a parking situation * if it were, then chan belongs to a different thread now, and might have been hung up long * ago. */ + autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP); + ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP); if (res != AST_PBX_KEEPALIVE && !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]; @@ -2427,6 +2433,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast 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); /* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */ if (res != AST_PBX_KEEPALIVE) { |