From 4dd6b6ff5974d87fd754e47962472437a784736b Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 12 Jan 2015 19:13:03 +0000
Subject: [PATCH] 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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/manager.h | 2 +-
main/manager.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 31f31b7f07..43031d1d63 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -305,7 +305,7 @@ void astman_send_ack(struct mansession *s, const struct message *m, char *msg);
* \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.
diff --git a/main/manager.c b/main/manager.c
index 4410cd7c58..0ed0fef3ae 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2921,7 +2921,7 @@ static void astman_start_ack(struct mansession *s, const struct message *m)
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 @@ static int action_getconfig(struct mansession *s, const struct message *m)
}
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 @@ static int action_listcategories(struct mansession *s, const struct message *m)
}
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);
--
GitLab