summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-01-12 18:09:27 +0000
committerRichard Mudgett <rmudgett@digium.com>2015-01-12 18:09:27 +0000
commitc7ea108e02a03728f4c0eef4506678b81a22159c (patch)
treec024d0473b792401fb6be54046d1ae6049e908d8 /main
parent9065488ddd308ef4a3b46ad2da0a993e2e18c370 (diff)
Revert -r430452 It needs to be redone for the next major AMI version change instead.
ASTERISK-24049 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/bridge.c2
-rw-r--r--main/db.c2
-rw-r--r--main/manager.c8
-rw-r--r--main/manager_bridges.c4
-rw-r--r--main/pbx.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/main/bridge.c b/main/bridge.c
index e1f2d1eeb..6b4778f5d 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -5209,7 +5209,7 @@ static int manager_bridge_tech_list(struct mansession *s, const struct message *
ast_str_set(&id_text, 0, "ActionID: %s\r\n", id);
}
- astman_send_listack(s, m, "Bridge technology listing will follow");
+ astman_send_listack(s, m, "Bridge technology listing will follow", "start");
AST_RWLIST_RDLOCK(&bridge_technologies);
AST_RWLIST_TRAVERSE(&bridge_technologies, cur, entry) {
diff --git a/main/db.c b/main/db.c
index 28e548814..4bb9355c6 100644
--- a/main/db.c
+++ b/main/db.c
@@ -864,7 +864,7 @@ static int manager_dbget(struct mansession *s, const struct message *m)
if (res) {
astman_send_error(s, m, "Database entry not found");
} else {
- astman_send_listack(s, m, "Result will follow");
+ astman_send_listack(s, m, "Result will follow", "start");
astman_append(s, "Event: DBGetResponse\r\n"
"Family: %s\r\n"
diff --git a/main/manager.c b/main/manager.c
index 137e50a3a..4410cd7c5 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2919,7 +2919,7 @@ static void astman_start_ack(struct mansession *s, const struct message *m)
astman_send_response_full(s, m, "Success", MSG_MOREDATA, NULL);
}
-void astman_send_listack(struct mansession *s, const struct message *m, char *msg)
+void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag)
{
astman_send_response_full(s, m, "Success", msg, "Start");
}
@@ -4203,7 +4203,7 @@ static int action_hangup(struct mansession *s, const struct message *m)
return 0;
}
- astman_send_listack(s, m, "Channels hung up will follow");
+ astman_send_listack(s, m, "Channels hung up will follow", "start");
iter = ast_channel_iterator_all_new();
if (iter) {
@@ -4481,7 +4481,7 @@ static int action_status(struct mansession *s, const struct message *m)
}
}
- astman_send_listack(s, m, "Channel status will follow");
+ astman_send_listack(s, m, "Channel status will follow", "start");
if (!ast_strlen_zero(id)) {
snprintf(id_text, sizeof(id_text), "ActionID: %s\r\n", id);
@@ -5908,7 +5908,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
return 0;
}
- astman_send_listack(s, m, "Channels will follow");
+ astman_send_listack(s, m, "Channels will follow", "start");
it_chans = ao2_iterator_init(channels, 0);
for (; (msg = ao2_iterator_next(&it_chans)); ao2_ref(msg, -1)) {
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index 8ed4d8969..10a5046d9 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -414,7 +414,7 @@ static int manager_bridges_list(struct mansession *s, const struct message *m)
return -1;
}
- astman_send_listack(s, m, "Bridge listing will follow");
+ astman_send_listack(s, m, "Bridge listing will follow", "start");
if (!ast_strlen_zero(type_filter)) {
char *type_filter_dup = ast_strdupa(type_filter);
@@ -506,7 +506,7 @@ static int manager_bridge_info(struct mansession *s, const struct message *m)
return -1;
}
- astman_send_listack(s, m, "Bridge channel listing will follow");
+ astman_send_listack(s, m, "Bridge channel listing will follow", "start");
list_data.id_text = ast_str_buffer(id_text);
list_data.count = 0;
diff --git a/main/pbx.c b/main/pbx.c
index 7f914d4f1..b2c365a9b 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8147,7 +8147,7 @@ static char *handle_debug_dialplan(struct ast_cli_entry *e, int cmd, struct ast_
/*! \brief Send ack once */
static void manager_dpsendack(struct mansession *s, const struct message *m)
{
- astman_send_listack(s, m, "DialPlan list will follow");
+ astman_send_listack(s, m, "DialPlan list will follow", "start");
}
/*! \brief Show dialplan extensions
@@ -12010,7 +12010,7 @@ static int action_extensionstatelist(struct mansession *s, const struct message
return 0;
}
- astman_send_listack(s, m, "Extension Statuses will follow");
+ astman_send_listack(s, m, "Extension Statuses will follow", "start");
ao2_lock(hints);
it_hints = ao2_iterator_init(hints, 0);