diff --git a/CHANGES b/CHANGES
index 6a8322afe6ed82d7c0ed6f75f738c15d87d2e336..88de8ba58e38caf799bbd34b67f70fd9856b0545 100644
--- a/CHANGES
+++ b/CHANGES
@@ -948,8 +948,6 @@ Queue changes
* Added member option ignorebusy this when set and ringinuse is not
will allow per member control of multiple calls as ringinuse does for
the Queue.
- * Added global option check_state_unknown to enforce checking of device state
- when the device state is unknown app_queue will see unknown as available.
Applications
------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 2c1a155e0bfad4e13ca678f1c34f2b1c1b8ea95e..3c31f526bc4cb6df8b103b230a468b15cf74947e 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -38,6 +38,8 @@ Queues:
now only record a disposition of BUSY if all Queue members were actually
busy on a call or some Queue members were busy or paused. Previously, any
Queue member being paused would result in a disposition of BUSY.
+ - Removed the queues.conf check_state_unknown option. It is no longer
+ necessary.
Dial:
- Now recognizes 'W' to pause sending DTMF for one second in addition to
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2a15d19739a8134cf74ba834a82afc7860752650..f02ed44070a5b093ea29477569bba0c9df9c527a 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1048,9 +1048,6 @@ static int negative_penalty_invalid = 0;
/*! \brief queues.conf [general] option */
static int log_membername_as_agent = 0;
-/*! \brief queues.conf [general] option */
-static int check_state_unknown = 0;
-
/*! \brief name of the ringinuse field in the realtime database */
static char *realtime_ringinuse_field;
@@ -1166,6 +1163,7 @@ struct member {
struct call_queue *lastqueue; /*!< Last queue we received a call */
unsigned int dead:1; /*!< Used to detect members deleted in realtime */
unsigned int delme:1; /*!< Flag to delete entry on reload */
+ unsigned int call_pending:1; /*!< TRUE if the Q is attempting to place a call to the member. */
char rt_uniqueid[80]; /*!< Unique id of realtime member entry */
unsigned int ringinuse:1; /*!< Flag to ring queue members even if their status is 'inuse' */
};
@@ -3492,6 +3490,112 @@ static char *vars2manager(struct ast_channel *chan, char *vars, size_t len)
return vars;
}
+/*!
+ * \internal
+ * \brief Check if the member status is available.
+ *
+ * \param status Member status to check if available.
+ *
+ * \retval non-zero if the member status is available.
+ */
+static int member_status_available(int status)
+{
+ return status == AST_DEVICE_NOT_INUSE || status == AST_DEVICE_UNKNOWN;
+}
+
+/*!
+ * \internal
+ * \brief Clear the member call pending flag.
+ *
+ * \param mem Queue member.
+ *
+ * \return Nothing
+ */
+static void member_call_pending_clear(struct member *mem)
+{
+ ao2_lock(mem);
+ mem->call_pending = 0;
+ ao2_unlock(mem);
+}
+
+/*!
+ * \internal
+ * \brief Set the member call pending flag.
+ *
+ * \param mem Queue member.
+ *
+ * \retval non-zero if call pending flag was already set.
+ */
+static int member_call_pending_set(struct member *mem)
+{
+ int old_pending;
+
+ ao2_lock(mem);
+ old_pending = mem->call_pending;
+ mem->call_pending = 1;
+ ao2_unlock(mem);
+
+ return old_pending;
+}
+
+/*!
+ * \internal
+ * \brief Determine if can ring a queue entry.
+ *
+ * \param qe Queue entry to check.
+ * \param call Member call attempt.
+ *
+ * \retval non-zero if an entry can be called.
+ */
+static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
+{
+ if (call->member->paused) {
+ ast_debug(1, "%s paused, can't receive call\n", call->interface);
+ return 0;
+ }
+
+ if (!call->member->ringinuse && !member_status_available(call->member->status)) {
+ ast_debug(1, "%s not available, can't receive call\n", call->interface);
+ return 0;
+ }
+
+ if ((call->lastqueue && call->lastqueue->wrapuptime && (time(NULL) - call->lastcall < call->lastqueue->wrapuptime))
+ || (!call->lastqueue && qe->parent->wrapuptime && (time(NULL) - call->lastcall < qe->parent->wrapuptime))) {
+ ast_debug(1, "Wrapuptime not yet expired on queue %s for %s\n",
+ (call->lastqueue ? call->lastqueue->name : qe->parent->name),
+ call->interface);
+ return 0;
+ }
+
+ if (use_weight && compare_weight(qe->parent, call->member)) {
+ ast_debug(1, "Priority queue delaying call to %s:%s\n",
+ qe->parent->name, call->interface);
+ return 0;
+ }
+
+ if (!call->member->ringinuse) {
+ if (member_call_pending_set(call->member)) {
+ ast_debug(1, "%s has another call pending, can't receive call\n",
+ call->interface);
+ return 0;
+ }
+
+ /*
+ * The queue member is available. Get current status to be sure
+ * because the device state and extension state callbacks may
+ * not have updated the status yet.
+ */
+ if (!member_status_available(get_queue_member_status(call->member))) {
+ ast_debug(1, "%s actually not available, can't receive call\n",
+ call->interface);
+ member_call_pending_clear(call->member);
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
/*!
* \brief Part 2 of ring_one
*
@@ -3513,48 +3617,14 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
char tech[256];
char *location;
const char *macrocontext, *macroexten;
- enum ast_device_state newstate;
/* on entry here, we know that tmp->chan == NULL */
- if (tmp->member->paused) {
- ast_debug(1, "%s paused, can't receive call\n", tmp->interface);
- tmp->stillgoing = 0;
- (*busies)++;
- return 0;
- }
-
- if ((tmp->lastqueue && tmp->lastqueue->wrapuptime && (time(NULL) - tmp->lastcall < tmp->lastqueue->wrapuptime)) ||
- (!tmp->lastqueue && qe->parent->wrapuptime && (time(NULL) - tmp->lastcall < qe->parent->wrapuptime))) {
- ast_debug(1, "Wrapuptime not yet expired on queue %s for %s\n",
- (tmp->lastqueue ? tmp->lastqueue->name : qe->parent->name), tmp->interface);
- tmp->stillgoing = 0;
- (*busies)++;
- return 0;
- }
-
- if (!tmp->member->ringinuse) {
- if (check_state_unknown && (tmp->member->status == AST_DEVICE_UNKNOWN)) {
- newstate = ast_device_state(tmp->member->interface);
- if (newstate != tmp->member->status) {
- ast_log(LOG_WARNING, "Found a channel matching iterface %s while status was %s changed to %s\n",
- tmp->member->interface, ast_devstate2str(tmp->member->status), ast_devstate2str(newstate));
- ast_devstate_changed_literal(newstate, AST_DEVSTATE_CACHABLE, tmp->member->interface);
- }
- }
- if ((tmp->member->status != AST_DEVICE_NOT_INUSE) && (tmp->member->status != AST_DEVICE_UNKNOWN)) {
- ast_debug(1, "%s in use, can't receive call\n", tmp->interface);
- tmp->stillgoing = 0;
- (*busies)++;
- return 0;
- }
- }
-
- if (use_weight && compare_weight(qe->parent,tmp->member)) {
- ast_debug(1, "Priority queue delaying call to %s:%s\n", qe->parent->name, tmp->interface);
+ if (!can_ring_entry(qe, tmp)) {
tmp->stillgoing = 0;
- (*busies)++;
+ ++*busies;
return 0;
}
+ ast_assert(tmp->member->ringinuse || tmp->member->call_pending);
ast_copy_string(tech, tmp->interface, sizeof(tech));
if ((location = strchr(tech, '/'))) {
@@ -3566,18 +3636,18 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
/* Request the peer */
tmp->chan = ast_request(tech, ast_channel_nativeformats(qe->chan), qe->chan, location, &status);
if (!tmp->chan) { /* If we can't, just go on to the next call */
- if (ast_channel_cdr(qe->chan)) {
- ast_cdr_busy(ast_channel_cdr(qe->chan));
- }
- tmp->stillgoing = 0;
-
ao2_lock(qe->parent);
- update_status(qe->parent, tmp->member, get_queue_member_status(tmp->member));
qe->parent->rrpos++;
qe->linpos++;
ao2_unlock(qe->parent);
- (*busies)++;
+ member_call_pending_clear(tmp->member);
+
+ if (ast_channel_cdr(qe->chan)) {
+ ast_cdr_busy(ast_channel_cdr(qe->chan));
+ }
+ tmp->stillgoing = 0;
+ ++*busies;
return 0;
}
@@ -3653,10 +3723,12 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
/* Again, keep going even if there's an error */
ast_verb(3, "Couldn't call %s\n", tmp->interface);
do_hang(tmp);
- (*busies)++;
- update_status(qe->parent, tmp->member, get_queue_member_status(tmp->member));
+ member_call_pending_clear(tmp->member);
+ ++*busies;
return 0;
- } else if (qe->parent->eventwhencalled) {
+ }
+
+ if (qe->parent->eventwhencalled) {
char vars[2048];
ast_channel_lock_both(tmp->chan, qe->chan);
@@ -3712,7 +3784,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
ast_verb(3, "Called %s\n", tmp->interface);
}
- update_status(qe->parent, tmp->member, get_queue_member_status(tmp->member));
+ member_call_pending_clear(tmp->member);
return 1;
}
@@ -7730,10 +7802,6 @@ static void queue_set_global_params(struct ast_config *cfg)
if ((general_val = ast_variable_retrieve(cfg, "general", "log_membername_as_agent"))) {
log_membername_as_agent = ast_true(general_val);
}
- check_state_unknown = 0;
- if ((general_val = ast_variable_retrieve(cfg, "general", "check_state_unknown"))) {
- check_state_unknown = ast_true(general_val);
- }
}
/*! \brief reload information pertaining to a single member
@@ -8511,7 +8579,7 @@ static int manager_queues_summary(struct mansession *s, const struct message *m)
while ((mem = ao2_iterator_next(&mem_iter))) {
if ((mem->status != AST_DEVICE_UNAVAILABLE) && (mem->status != AST_DEVICE_INVALID)) {
++qmemcount;
- if (((mem->status == AST_DEVICE_NOT_INUSE) || (mem->status == AST_DEVICE_UNKNOWN)) && !(mem->paused)) {
+ if (member_status_available(mem->status) && !mem->paused) {
++qmemavail;
}
}
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index c9e5e21a470816c654ca45dacee3d58a15983375..f7c05181c0fdcbaf60fd78f5ea6b0bea0cac5c10 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -71,13 +71,6 @@ monitor-type = MixMonitor
;
;log_membername_as_agent = no
;
-; app_queue allows calls to members in a "Unknown" state to be treated as available
-; setting check_state_unknown = yes will cause app_queue to query the channel driver
-; to better determine the state this only applies to queues with ringinuse set
-; appropriately.
-;
-;check_state_unknown = no
-;
;[markq]
;
; A sample call queue