diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-13 16:46:30 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-13 16:46:30 +0000 |
| commit | bdad2cd2a5ebe96148728ace616ebfb8006ced90 (patch) | |
| tree | d5a43cb7dcbd6519591b66b588d8a7d346df7e9b /main | |
| parent | 376de60412699efdf5355d68fbb544ca0c2d7ce4 (diff) | |
Add an option to restore past broken behavor of the Events manager action
Before r238915, certain values for the EventMask parameter of the Events action would result in no response being returned. This patch adds an option to restore that broken behavior. Also while fixing this bug I discovered that passing an empty EventMasks parameter would also result in no response being returned, this has been fixed as well while being preserved when the broken behavior is requested.
(closes issue #17023)
Reported by: nblasgen
Review: https://reviewboard.asterisk.org/r/602/
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@257070 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index f3d040f1b..bf19199c0 100644 --- a/main/manager.c +++ b/main/manager.c @@ -103,6 +103,7 @@ static int asock = -1; static int displayconnects = 1; static int timestampevents; static int httptimeout = 60; +static int broken_events_action = 0; static pthread_t t; static int block_sockets; @@ -1432,13 +1433,31 @@ static char mandescr_events[] = static int action_events(struct mansession *s, const struct message *m) { const char *mask = astman_get_header(m, "EventMask"); - int res; + int res, x; res = set_eventmask(s->session, mask); + if (broken_events_action) { + /* if this option is set we should not return a response on + * error, or when all events are set */ + + if (res > 0) { + for (x = 0; x < ARRAY_LEN(perms); x++) { + if (!strcasecmp(perms[x].label, "all") && res == perms[x].num) { + return 0; + } + } + astman_send_response(s, m, "Events On", NULL); + } else if (res == 0) + astman_send_response(s, m, "Events Off", NULL); + return 0; + } + if (res > 0) astman_send_response(s, m, "Events On", NULL); else if (res == 0) astman_send_response(s, m, "Events Off", NULL); + else + astman_send_error(s, m, "Invalid event mask"); return 0; } @@ -3067,6 +3086,7 @@ int init_manager(void) } portno = DEFAULT_MANAGER_PORT; displayconnects = 1; + broken_events_action = 0; cfg = ast_config_load("manager.conf"); if (!cfg) { ast_log(LOG_NOTICE, "Unable to open management configuration manager.conf. Call management disabled.\n"); @@ -3094,6 +3114,9 @@ int init_manager(void) if ((val = ast_variable_retrieve(cfg, "general", "displayconnects"))) displayconnects = ast_true(val); + if ((val = ast_variable_retrieve(cfg, "general", "brokeneventsaction"))) + broken_events_action = ast_true(val); + if ((val = ast_variable_retrieve(cfg, "general", "timestampevents"))) timestampevents = ast_true(val); |