[Asterisk-cvs] asterisk/apps app_queue.c,1.32,1.33

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv30911/apps

Modified Files:
	app_queue.c 
Log Message:
First of Jayson's manager patches


Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** app_queue.c	23 Aug 2003 02:11:44 -0000	1.32
--- app_queue.c	8 Sep 2003 16:44:36 -0000	1.33
***************
*** 1408,1416 ****
  	time_t now;
  	int pos;
  	struct ast_call_queue *q;
  	struct queue_ent *qe;
! 	astman_send_ack(s, "Queue status will follow");
  	time(&now);
  	q = queues;
  	while(q) {
  		ast_mutex_lock(&q->lock);
--- 1408,1421 ----
  	time_t now;
  	int pos;
+ 	char *id = astman_get_header(m,"ActionID");
+ 	char idText[256] = "";
  	struct ast_call_queue *q;
  	struct queue_ent *qe;
! 	astman_send_ack(s, m, "Queue status will follow");
  	time(&now);
  	q = queues;
+ 	if (id && &id) {
+ 		snprintf(idText,256,"ActionID: %s\r\n",id);
+ 	}
  	while(q) {
  		ast_mutex_lock(&q->lock);
***************
*** 1419,1424 ****
  					"Max: %d\r\n"
  					"Calls: %d\r\n"
  					"\r\n",
! 						q->name, q->maxlen, q->count);
  #if 0
  		/* Do we care about queue members? */					
--- 1424,1430 ----
  					"Max: %d\r\n"
  					"Calls: %d\r\n"
+ 					"%s"
  					"\r\n",
! 						q->name, q->maxlen, q->count,idText);
  #if 0
  		/* Do we care about queue members? */					
***************
*** 1434,1439 ****
  				"CallerID: %s\r\n"
  				"Wait: %ld\r\n"
  				"\r\n", 
! 					q->name, pos++, qe->chan->name, (qe->chan->callerid ? qe->chan->callerid : ""), now - qe->start);
  		ast_mutex_unlock(&q->lock);
  		q = q->next;
--- 1440,1446 ----
  				"CallerID: %s\r\n"
  				"Wait: %ld\r\n"
+ 				"%s"
  				"\r\n", 
! 					q->name, pos++, qe->chan->name, (qe->chan->callerid ? qe->chan->callerid : ""), now - qe->start), idText;
  		ast_mutex_unlock(&q->lock);
  		q = q->next;