kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_queue: Fix old confusing comment about when the members are called" into 16

Browse Source
This commit is contained in:
Joshua Colp
2019-12-09 05:43:23 -06:00
committed by Gerrit Code Review
parent 7f2bbff48c 161e762742
commit 585e5288c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -4904,7 +4904,7 @@ static void rna(int rnatime, struct queue_ent *qe, struct ast_channel *peer, cha
ast_verb(3, "Auto-Pausing Queue Member %s in all queues since they failed to answer on queue %s.\n", ast_verb(3, "Auto-Pausing Queue Member %s in all queues since they failed to answer on queue %s.\n",
interface, qe->parent->name); interface, qe->parent->name);
} else { } else {
ast_verb(3, "Failed to pause Queue Member %s in all queues!\n", interface); ast_verb(3, "Failed to pause Queue Member %s in all queues!\n", interface);
} }
} }
} }
@@ -6850,8 +6850,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
tmp->lastcall = cur->lastcall; tmp->lastcall = cur->lastcall;
tmp->lastqueue = cur->lastqueue; tmp->lastqueue = cur->lastqueue;
ast_copy_string(tmp->interface, cur->interface, sizeof(tmp->interface)); ast_copy_string(tmp->interface, cur->interface, sizeof(tmp->interface));
/* Special case: If we ring everyone, go ahead and ring them, otherwise /* Calculate the metric for the appropriate strategy. */
just calculate their metric for the appropriate strategy */
if (!calc_metric(qe->parent, cur, x++, qe, tmp)) { if (!calc_metric(qe->parent, cur, x++, qe, tmp)) {
/* Put them in the list of outgoing thingies... We're ready now. /* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get XXX If we're forcibly removed, these outgoing calls won't get
@@ -6887,6 +6886,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
orig = to; orig = to;
++qe->pending; ++qe->pending;
ao2_unlock(qe->parent); ao2_unlock(qe->parent);
/* Call the queue members with the best metric now. */
ring_one(qe, outgoing, &numbusies); ring_one(qe, outgoing, &numbusies);
lpeer = wait_for_answer(qe, outgoing, &to, &digit, numbusies, lpeer = wait_for_answer(qe, outgoing, &to, &digit, numbusies,
ast_test_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT), ast_test_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT),