kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring up to date with poll changes.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-08-10 18:37:32 +00:00
parent cc6a96c580
commit e927902fe7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/dial.c
View File

@@ -289,6 +289,8 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann
ast_hangup(channel->owner); ast_hangup(channel->owner);
channel->owner = NULL; channel->owner = NULL;
} else { } else {
if (chan)
ast_poll_channel_add(chan, channel->owner);
res = 1; res = 1;
ast_verb(3, "Called %s\n", numsubst); ast_verb(3, "Called %s\n", numsubst);
} }
@@ -595,6 +597,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann
set_state(dial, AST_DIAL_RESULT_HANGUP); set_state(dial, AST_DIAL_RESULT_HANGUP);
break; break;
} }
if (chan)
ast_poll_channel_del(chan, channel->owner);
ast_hangup(who); ast_hangup(who);
channel->owner = NULL; channel->owner = NULL;
continue; continue;
@@ -616,6 +620,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann
AST_LIST_TRAVERSE(&dial->channels, channel, list) { AST_LIST_TRAVERSE(&dial->channels, channel, list) {
if (!channel->owner || channel->owner == who) if (!channel->owner || channel->owner == who)
continue; continue;
if (chan)
ast_poll_channel_del(chan, channel->owner);
ast_hangup(channel->owner); ast_hangup(channel->owner);
channel->owner = NULL; channel->owner = NULL;
} }
@@ -632,6 +638,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann
AST_LIST_TRAVERSE(&dial->channels, channel, list) { AST_LIST_TRAVERSE(&dial->channels, channel, list) {
if (!channel->owner) if (!channel->owner)
continue; continue;
if (chan)
ast_poll_channel_del(chan, channel->owner);
ast_hangup(channel->owner); ast_hangup(channel->owner);
channel->owner = NULL; channel->owner = NULL;
} }