[asterisk-commits] seanbright: branch 1.6.2 r196950 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue May 26 17:46:44 2009
New Revision: 196950

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196950
Log:
Merged revisions 196945 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196945 | seanbright | 2009-05-26 18:38:05 -0400 (Tue, 26 May 2009) | 13 lines
  
  Add ActionID to CoreShowChannel event.
  
  There is inconsistency in how we handle manager responses that are lists of
  items and, unfortunately, third parties have come to rely on ActionID being on
  every event within those lists instead of just keeping track of the ActionID for
  the current response.  This change makes CoreShowChannels include the ActionID
  with each CoreShowChannel event generated as a result of it being called.
  
  (closes issue #15001)
  Reported by: sum
  Patches:
        patchactionid2.patch uploaded by sum (license 766)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=196950&r1=196949&r2=196950
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Tue May 26 17:46:44 2009
@@ -2792,15 +2792,15 @@
 static int action_coreshowchannels(struct mansession *s, const struct message *m)
 {
 	const char *actionid = astman_get_header(m, "ActionID");
-	char actionidtext[256];
+	char idText[256];
 	struct ast_channel *c = NULL;
 	int numchans = 0;
 	int duration, durh, durm, durs;
 
 	if (!ast_strlen_zero(actionid))
-		snprintf(actionidtext, sizeof(actionidtext), "ActionID: %s\r\n", actionid);
+		snprintf(idText, sizeof(idText), "ActionID: %s\r\n", actionid);
 	else
-		actionidtext[0] = '\0';
+		idText[0] = '\0';
 
 	astman_send_listack(s, m, "Channels will follow", "start");	
 
@@ -2818,6 +2818,7 @@
 
 		astman_append(s,
 			"Event: CoreShowChannel\r\n"
+			"%s"
 			"Channel: %s\r\n"
 			"UniqueID: %s\r\n"
 			"Context: %s\r\n"
@@ -2832,8 +2833,8 @@
 			"AccountCode: %s\r\n"
 			"BridgedChannel: %s\r\n"
 			"BridgedUniqueID: %s\r\n"
-			"\r\n", c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state, ast_state2str(c->_state),
-			c->appl ? c->appl : "", c->data ? S_OR(c->data, ""): "",
+			"\r\n", idText, c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state,
+			ast_state2str(c->_state), c->appl ? c->appl : "", c->data ? S_OR(c->data, "") : "",
 			S_OR(c->cid.cid_num, ""), durbuf, S_OR(c->accountcode, ""), bc ? bc->name : "", bc ? bc->uniqueid : "");
 		ast_channel_unlock(c);
 		numchans++;
@@ -2844,7 +2845,7 @@
 		"EventList: Complete\r\n"
 		"ListItems: %d\r\n"
 		"%s"
-		"\r\n", numchans, actionidtext);
+		"\r\n", numchans, idText);
 
 	return 0;
 }