[asterisk-commits] mmichelson: branch 1.4 r185298 - /branches/1.4/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Mar 31 10:34:05 2009
New Revision: 185298

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185298
Log:
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


Modified:
    branches/1.4/apps/app_queue.c

Modified: branches/1.4/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/apps/app_queue.c?view=diff&rev=185298&r1=185297&r2=185298
==============================================================================
--- branches/1.4/apps/app_queue.c (original)
+++ branches/1.4/apps/app_queue.c Tue Mar 31 10:34:05 2009
@@ -1922,7 +1922,7 @@
 			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 @@
 			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 @@
 			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 @@
 			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);