diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-06-25 13:03:17 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-06-25 13:03:17 +0000 |
| commit | a1e219ef51dc37fbf570382d2d3861bd876414b2 (patch) | |
| tree | 32ed3c62e66c358cd3d24554cbe0361f3e77d09d /apps/app_dial.c | |
| parent | 13b470d704285b596caab33039fdf1b063bbcf9d (diff) | |
CEL refactoring cleanup
This change removes AST_CEL_BRIDGE_UPDATE since it should no longer be
used because masquerade situations are now accounted for in other ways.
This also refactors usage of AST_CEL_FORWARD to be produced by a Dial
message which has been extended with a "forward" field.
(closes issue ASTERISK-21566)
Review: https://reviewboard.asterisk.org/r/2635/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index c75eb2d3a..806859011 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -859,8 +859,6 @@ static void do_forward(struct chanlist *o, struct cause_args *num, ast_clear_flag64(o, OPT_IGNORE_CONNECTEDLINE); } - ast_cel_report_event(in, AST_CEL_FORWARD, NULL, ast_channel_call_forward(c), NULL); - /* Before processing channel, go ahead and check for forwarding */ ast_verb(3, "Now forwarding %s to '%s/%s' (thanks to %s)\n", ast_channel_name(in), tech, stuff, ast_channel_name(c)); /* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */ @@ -1004,7 +1002,8 @@ static void do_forward(struct chanlist *o, struct cause_args *num, ast_channel_unlock(c); ast_channel_lock_both(original, in); - ast_channel_publish_dial(in, original, NULL, "CANCEL"); + ast_channel_publish_dial_forward(in, original, NULL, "CANCEL", + ast_channel_call_forward(c)); ast_channel_unlock(in); ast_channel_unlock(original); |