diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-04-22 15:46:01 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-04-22 15:46:01 +0000 |
| commit | a3f3613d662fa70a885d039266087907dc4d1d35 (patch) | |
| tree | a1832ee82323b42f08c4345c204bae8584ba9f5b /main/manager.c | |
| parent | f5a5845a29ab384497a72201dc1d563887c5c3ca (diff) | |
Correct action_ping() and action_events() with regards to Manager 1.1
documentation. Also, fix a bug in xml_translate().
(closes issue #11649)
Reported by: ys
Patches:
trunk_manager.c.diff uploaded by ys (license 281)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/main/manager.c b/main/manager.c index 8825010e0..47eb6ff10 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1064,7 +1064,8 @@ static char mandescr_ping[] = static int action_ping(struct mansession *s, const struct message *m) { - astman_send_response(s, m, "Success", "Ping: Pong\r\n"); + astman_append(s, "Response: Success\r\n" + "Ping: Pong\r\n"); return 0; } @@ -1576,10 +1577,11 @@ static int action_events(struct mansession *s, const struct message *m) res = set_eventmask(s, mask); if (res > 0) - astman_send_response(s, m, "Success", "Events: On\r\n"); + astman_append(s, "Response: Success\r\n" + "Events: On\r\n"); else if (res == 0) - astman_send_response(s, m, "Success", "Events: Off\r\n"); - + astman_append(s, "Response: Success\r\n" + "Events: Off\r\n"); return 0; } @@ -3431,11 +3433,13 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *v ast_str_append(out, 0, xml ? "'" : "</td></tr>\n"); in_data = 0; } - ast_str_append(out, 0, xml ? " /></response>\n" : - "<tr><td colspan=\"2\"><hr></td></tr>\r\n"); - inobj = 0; - ao2_ref(vco, -1); - vco = NULL; + if (inobj) { + ast_str_append(out, 0, xml ? " /></response>\n" : + "<tr><td colspan=\"2\"><hr></td></tr>\r\n"); + inobj = 0; + ao2_ref(vco, -1); + vco = NULL; + } continue; } |