diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-02-27 16:50:19 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-02-27 16:50:19 +0000 |
| commit | 1fac2fba4b8f3decd83d738e974280aa92b50bcc (patch) | |
| tree | 114ec337f0210035993f29b81d1c704ff1ad7242 /main/dial.c | |
| parent | 3cf09f40f749c8889de7d2b1aadf05d122ccba4f (diff) | |
Deprecated macro usage for connected line, redirecting, and CCSS
This commit adds GoSub alternatives to connected line, redirecting, and CCSS
macro hooks so that macro can finally be deprecated. This also adds
deprecation warnings for those features when used and in documentation.
Review: https://reviewboard.asterisk.org/r/1760/
(closes issue SWP-4256)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/dial.c')
| -rw-r--r-- | main/dial.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/dial.c b/main/dial.c index 3455ca329..fe8a74faf 100644 --- a/main/dial.c +++ b/main/dial.c @@ -437,13 +437,15 @@ static void handle_frame(struct ast_dial *dial, struct ast_dial_channel *channel break; case AST_CONTROL_CONNECTED_LINE: ast_verb(3, "%s connected line has changed, passing it to %s\n", ast_channel_name(channel->owner), ast_channel_name(chan)); - if (ast_channel_connected_line_macro(channel->owner, chan, fr, 1, 1)) { + if (ast_channel_connected_line_sub(channel->owner, chan, fr, 1) && + ast_channel_connected_line_macro(channel->owner, chan, fr, 1, 1)) { ast_indicate_data(chan, AST_CONTROL_CONNECTED_LINE, fr->data.ptr, fr->datalen); } break; case AST_CONTROL_REDIRECTING: ast_verb(3, "%s redirecting info has changed, passing it to %s\n", ast_channel_name(channel->owner), ast_channel_name(chan)); - if (ast_channel_redirecting_macro(channel->owner, chan, fr, 1, 1)) { + if (ast_channel_redirecting_sub(channel->owner, chan, fr, 1) && + ast_channel_redirecting_macro(channel->owner, chan, fr, 1, 1)) { ast_indicate_data(chan, AST_CONTROL_REDIRECTING, fr->data.ptr, fr->datalen); } break; |