mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 03:04:19 +00:00
Bring up to date with poll changes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -289,6 +289,8 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann
|
||||
ast_hangup(channel->owner);
|
||||
channel->owner = NULL;
|
||||
} else {
|
||||
if (chan)
|
||||
ast_poll_channel_add(chan, channel->owner);
|
||||
res = 1;
|
||||
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);
|
||||
break;
|
||||
}
|
||||
if (chan)
|
||||
ast_poll_channel_del(chan, channel->owner);
|
||||
ast_hangup(who);
|
||||
channel->owner = NULL;
|
||||
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) {
|
||||
if (!channel->owner || channel->owner == who)
|
||||
continue;
|
||||
if (chan)
|
||||
ast_poll_channel_del(chan, channel->owner);
|
||||
ast_hangup(channel->owner);
|
||||
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) {
|
||||
if (!channel->owner)
|
||||
continue;
|
||||
if (chan)
|
||||
ast_poll_channel_del(chan, channel->owner);
|
||||
ast_hangup(channel->owner);
|
||||
channel->owner = NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user