[svn-commits] rmudgett: trunk r430529 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Jan 12 13:13:03 2015
New Revision: 430529

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430529
Log:
AMI: Revert non-backwards compatible changes from earlier commit.

* Reverted the change to astman_send_listack() to not use the listflag
parameter and always set the value to "Start" so the start capitalization
is consistent.  Unfortunately changing the case of a returned value is not
a backward compatible change so for now FAXSessions is going to have to
remain inconsistent with all of the other AMI list actions.

* Reverted the minor protocol error fix in action_getconfig() when no
requested categories are found.  Each line needs to be formatted as
"Header: text".

Caught by the testsuite.

ASTERISK-24049
........

Merged revisions 430528 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/manager.h
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=430529&r1=430528&r2=430529
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Mon Jan 12 13:13:03 2015
@@ -305,7 +305,7 @@
  * \param s - AMI session control struct.
  * \param m - AMI action request that started the list.
  * \param msg - Message contents describing the list to follow.
- * \param listflag - Not used.  Historically always set to "start".
+ * \param listflag - Should always be set to "start".
  *
  * \note You need to call astman_send_list_complete_start() and
  * astman_send_list_complete_end() to send the AMI list completion event.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=430529&r1=430528&r2=430529
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Jan 12 13:13:03 2015
@@ -2921,7 +2921,7 @@
 
 void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag)
 {
-	astman_send_response_full(s, m, "Success", msg, "Start");
+	astman_send_response_full(s, m, "Success", msg, listflag);
 }
 
 void astman_send_list_complete_start(struct mansession *s, const struct message *m, const char *event_name, int count)
@@ -3366,7 +3366,7 @@
 	}
 
 	if (!ast_strlen_zero(category) && catcount == 0) { /* TODO: actually, a config with no categories doesn't even get loaded */
-		astman_append(s, "Error: No categories found\r\n");
+		astman_append(s, "No categories found\r\n");
 	}
 
 	ast_config_destroy(cfg);
@@ -3404,7 +3404,7 @@
 	}
 
 	if (catcount == 0) { /* TODO: actually, a config with no categories doesn't even get loaded */
-		astman_append(s, "Error: No categories found\r\n");
+		astman_append(s, "Error: no categories found\r\n");
 	}
 
 	ast_config_destroy(cfg);