summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorAutomerge script <automerge@asterisk.org>2012-12-14 22:18:35 +0000
committerAutomerge script <automerge@asterisk.org>2012-12-14 22:18:35 +0000
commit928f6463ec4e6a8f4ce9638393f6bf588d4ed3a2 (patch)
treedcaabb914b857b5a76152dc343d4443ccb8b07bb /apps
parent29e7981432f2dc99a04c729d6cd5fe41be68e33e (diff)
Merged revisions 378039 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk ................ r378039 | rmudgett | 2012-12-14 15:35:44 -0600 (Fri, 14 Dec 2012) | 26 lines app_queue: Revert bad ringinuse=no patch. With the option ringinuse=no set, the patch committed for ASTERISK-16115 causes non-SIP queue members to never be called because the device state is checked after a channel is created to determine if the member is busy. These queue members always get the "Member %s is busy, cannot dial" message. Most channel drivers other than chan_sip use the default device state handling. The default device-state state is considered in use or unknown if the channel exists or not respectively. (closes issue ASTERISK-20801) Reported by: rmudgett Patches: jira_asterisk_16115_revert_r370418_v1.8.patch (license #5621) patch uploaded by rmudgett ........ Merged revisions 378036 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378037 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 378038 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e6485ffa3..eac4d2ff6 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3648,18 +3648,8 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
ast_channel_unlock(tmp->chan);
ast_channel_unlock(qe->chan);
- ao2_lock(tmp->member);
- update_status(qe->parent, tmp->member, get_queue_member_status(tmp->member));
- if (!qe->parent->ringinuse && (tmp->member->status != AST_DEVICE_NOT_INUSE) && (tmp->member->status != AST_DEVICE_UNKNOWN)) {
- ast_verb(1, "Member %s is busy, cannot dial", tmp->member->interface);
- res = -1;
- }
- else {
- /* Place the call, but don't wait on the answer */
- res = ast_call(tmp->chan, location, 0);
- }
- ao2_unlock(tmp->member);
- if (res) {
+ /* Place the call, but don't wait on the answer */
+ if ((res = ast_call(tmp->chan, location, 0))) {
/* Again, keep going even if there's an error */
ast_verb(3, "Couldn't call %s\n", tmp->interface);
do_hang(tmp);