diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-31 15:34:05 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-31 15:34:05 +0000 |
| commit | 6e9f50058a10c1812e6aa4bedc65d54b411c411b (patch) | |
| tree | 1657aac10bcde2f27585995e988089e1bea2aab1 /apps | |
| parent | f3c4d543e8bd4b70d368d342e99a891a7bf3b644 (diff) | |
Fix some state_interface stuff that was in trunk but not in the backport to 1.4.
Issue #14359 was fixed between the time that I posted the review of the backport
of the state interface change for 1.4. This merges the changes from that issue
back into 1.4.
(closes issue #14359)
Reported by: francesco_r
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@185298 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 9106928f7..374f4e945 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1922,7 +1922,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies ast_cdr_busy(qe->chan->cdr); tmp->stillgoing = 0; - update_status(tmp->member->interface, ast_device_state(tmp->member->state_interface)); + update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface)); ast_mutex_lock(&qe->parent->lock); qe->parent->rrpos++; @@ -1974,7 +1974,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", tmp->interface); do_hang(tmp); (*busies)++; - update_status(tmp->member->interface, ast_device_state(tmp->member->interface)); + update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface)); return 0; } else if (qe->parent->eventwhencalled) { char vars[2048]; @@ -1998,7 +1998,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", tmp->interface); } - update_status(tmp->member->interface, ast_device_state(tmp->member->interface)); + update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface)); return 1; } @@ -4494,7 +4494,7 @@ static int reload_queues(void) while ((cur = ao2_iterator_next(&mem_iter))) { if (cur->dynamic) q->membercount++; - cur->status = ast_device_state(cur->interface); + cur->status = ast_device_state(cur->state_interface); ao2_ref(cur, -1); } ast_mutex_unlock(&q->lock); |