diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /apps/app_channelredirect.c | |
parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_channelredirect.c')
-rw-r--r-- | apps/app_channelredirect.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c index 8c98ed7b7..f636e0248 100644 --- a/apps/app_channelredirect.c +++ b/apps/app_channelredirect.c @@ -96,10 +96,6 @@ static int asyncgoto_exec(struct ast_channel *chan, const char *data) return 0; } - if (ast_channel_pbx(chan2)) { - ast_set_flag(ast_channel_flags(chan2), AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */ - } - res = ast_async_parseable_goto(chan2, args.label); chan2 = ast_channel_unref(chan2); |