summaryrefslogtreecommitdiff
path: root/main/manager.c
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2008-12-18 21:43:17 +0000
committerJeff Peeler <jpeeler@digium.com>2008-12-18 21:43:17 +0000
commit4e4093ab4855afb55d7a7db17e94f8d2d175febe (patch)
tree295b7f94a1b05b8909eb2296a5a9ee140669f803 /main/manager.c
parenta117714b88280a0ea42f531f9eb35befc11905c0 (diff)
(closes issue #13993)
Reported by: mika Add ActionID response to ping if sent with request. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@165798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c
index c5dbfe636..2069cb882 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1109,9 +1109,13 @@ static char mandescr_ping[] =
static int action_ping(struct mansession *s, const struct message *m)
{
- astman_append(s, "Response: Success\r\n"
- "Ping: Pong\r\n"
- "\r\n");
+ const char *actionid = astman_get_header(m, "ActionID");
+
+ astman_append(s, "Response: Success\r\n");
+ if (!ast_strlen_zero(actionid)){
+ astman_append(s, "ActionID: %s\r\n", actionid);
+ }
+ astman_append(s, "Ping: Pong\r\n\r\n");
return 0;
}