diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-26 01:39:04 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-26 01:39:04 +0000 |
| commit | f25bbd6c56e55c4dca7239f0c56eb4b6bee1b155 (patch) | |
| tree | 323bedeee9352cd4efca022572f040746b2bf5bb /main/features.c | |
| parent | 854c4c64fe2851312b1e13857dcd18e743e07594 (diff) | |
AMI Bridge action: Get channel xfer config after we have found the second channel.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/features.c b/main/features.c index 2bb8ffd44..b9d2468e1 100644 --- a/main/features.c +++ b/main/features.c @@ -4390,10 +4390,7 @@ static int action_bridge(struct mansession *s, const struct message *m) astman_send_error(s, m, buf); return 0; } - xfer_cfg_a = ast_get_chan_features_xfer_config(chana); - xfer_cfg_b = ast_get_chan_features_xfer_config(chanb); - ast_channel_lock(chana); chana_name = ast_strdupa(ast_channel_name(chana)); chana_exten = ast_strdupa(ast_channel_exten(chana)); @@ -4410,6 +4407,7 @@ static int action_bridge(struct mansession *s, const struct message *m) astman_send_error(s, m, buf); return 0; } + xfer_cfg_b = ast_get_chan_features_xfer_config(chanb); ast_channel_lock(chanb); chanb_name = ast_strdupa(ast_channel_name(chanb)); chanb_exten = ast_strdupa(ast_channel_exten(chanb)); @@ -5061,8 +5059,8 @@ static int bridge_exec(struct ast_channel *chan, const char *data) } xfer_cfg = ast_get_chan_features_xfer_config(current_dest_chan); - - if (ast_bridge_add_channel(bridge, current_dest_chan, peer_features, ast_test_flag(&opts, BRIDGE_OPT_PLAYTONE), xfer_cfg ? xfer_cfg->xfersound : NULL)) { + if (ast_bridge_add_channel(bridge, current_dest_chan, peer_features, + ast_test_flag(&opts, BRIDGE_OPT_PLAYTONE), xfer_cfg ? xfer_cfg->xfersound : NULL)) { ast_bridge_features_destroy(peer_features); ast_bridge_features_cleanup(&chan_features); ast_bridge_destroy(bridge); |