diff options
author | Jason Parker <jparker@digium.com> | 2013-05-22 18:11:57 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-05-22 18:11:57 +0000 |
commit | b6aac885be2d1afbaf8524a81f1ef953213958d9 (patch) | |
tree | 0db5fdca05e0dabce72f6e5585f96e297f52dca7 /main/dial.c | |
parent | 054efbc45a0f238b6d97bbb6bef7c5afbc93a18c (diff) |
Add dial events to app_queue and app_followme.
Also fixes an issue in app_dial, where the channels were swapped on dial events.
(closes issue ASTERISK-21551)
(closes issue ASTERISK-21550)
Review: https://reviewboard.asterisk.org/r/2549/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389492 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/dial.c')
-rw-r--r-- | main/dial.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/main/dial.c b/main/dial.c index 7008cd574..840f681d6 100644 --- a/main/dial.c +++ b/main/dial.c @@ -616,10 +616,7 @@ static int handle_timeout_trip(struct ast_dial *dial, struct timeval start) return new_timeout; } -/*! \since 12 - * \internal \brief Convert a hangup cause to a publishable dial status - */ -static const char *hangup_cause_to_dial_status(int hangup_cause) +const char *ast_hangup_cause_to_dial_status(int hangup_cause) { switch(hangup_cause) { case AST_CAUSE_BUSY: @@ -728,7 +725,7 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann } if (chan) ast_poll_channel_del(chan, channel->owner); - ast_channel_publish_dial(chan, who, channel->device, hangup_cause_to_dial_status(ast_channel_hangupcause(who))); + ast_channel_publish_dial(chan, who, channel->device, ast_hangup_cause_to_dial_status(ast_channel_hangupcause(who))); ast_hangup(who); channel->owner = NULL; continue; |