diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-05 21:54:17 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-05 21:54:17 +0000 |
| commit | 19b45ad446b909d553083eb7c2a3a082fe751e6a (patch) | |
| tree | 548ca5451a110485049bcbf0f9edda402b5490f3 /main/manager.c | |
| parent | d508a921bf352714d6ea35e07cc9a49c74f1581d (diff) | |
Merged revisions 317425 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r317425 | russell | 2011-05-05 16:53:13 -0500 (Thu, 05 May 2011) | 7 lines
Add missing ActioID handling to Events action.
(closes issue #18949)
Reported by: edersohe
Patches:
0018949.patch uploaded by edersohe (license 1228)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/main/manager.c b/main/manager.c index 7ce8bba16..9180b005a 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2880,6 +2880,14 @@ static int action_events(struct mansession *s, const struct message *m) { const char *mask = astman_get_header(m, "EventMask"); int res, x; + const char *id = astman_get_header(m, "ActionID"); + char id_text[256]; + + if (!ast_strlen_zero(id)) { + snprintf(id_text, sizeof(id_text), "ActionID: %s\r\n", id); + } else { + id_text[0] = '\0'; + } res = set_eventmask(s, mask); if (broken_events_action) { @@ -2892,20 +2900,20 @@ static int action_events(struct mansession *s, const struct message *m) return 0; } } - astman_append(s, "Response: Success\r\n" - "Events: On\r\n\r\n"); + astman_append(s, "Response: Success\r\n%s" + "Events: On\r\n\r\n", id_text); } else if (res == 0) - astman_append(s, "Response: Success\r\n" - "Events: Off\r\n\r\n"); + astman_append(s, "Response: Success\r\n%s" + "Events: Off\r\n\r\n", id_text); return 0; } if (res > 0) - astman_append(s, "Response: Success\r\n" - "Events: On\r\n\r\n"); + astman_append(s, "Response: Success\r\n%s" + "Events: On\r\n\r\n", id_text); else if (res == 0) - astman_append(s, "Response: Success\r\n" - "Events: Off\r\n\r\n"); + astman_append(s, "Response: Success\r\n%s" + "Events: Off\r\n\r\n", id_text); else astman_send_error(s, m, "Invalid event mask"); |