diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 22:36:57 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 22:36:57 +0000 |
| commit | 1c4fdfd503883d806ba05da5d0e9156b54a4d51b (patch) | |
| tree | 9f6767c938c54f0a60ab846d98a66569f9b2af4d /res | |
| parent | 8a84d91c4b7fae45cbcbbada6fdb5adc9f5ea3a7 (diff) | |
Add end_bridge_callback for app_follome and add AUTOLOOP flag to res_features
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@153270 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c index 18e7555ba..9e5d5054a 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1449,6 +1449,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; @@ -1716,6 +1717,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast config->end_bridge_callback(); } + 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]; @@ -1760,6 +1763,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) { |