diff options
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 115976a76..91f083c09 100644 --- a/main/manager.c +++ b/main/manager.c @@ -123,6 +123,7 @@ static int displayconnects = 1; static int allowmultiplelogin = 1; static int timestampevents; static int httptimeout = 60; +static int broken_events_action = 0; static int manager_enabled = 0; static int webmanager_enabled = 0; @@ -1715,15 +1716,36 @@ 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, 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_append(s, "Response: Success\r\n" + "Events: On\r\n\r\n"); + } else if (res == 0) + astman_append(s, "Response: Success\r\n" + "Events: Off\r\n\r\n"); + return 0; + } + if (res > 0) astman_append(s, "Response: Success\r\n" "Events: On\r\n\r\n"); else if (res == 0) astman_append(s, "Response: Success\r\n" "Events: Off\r\n\r\n"); + else + astman_send_error(s, m, "Invalid event mask"); + return 0; } @@ -4118,6 +4140,7 @@ static int __init_manager(int reload) return 0; displayconnects = 1; + broken_events_action = 0; if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_NOTICE, "Unable to open AMI configuration manager.conf, or configuration is invalid. Asterisk management interface (AMI) disabled.\n"); return 0; @@ -4169,6 +4192,8 @@ static int __init_manager(int reload) ast_log(LOG_WARNING, "Invalid address '%s' specified, using 0.0.0.0\n", val); memset(&ami_desc.local_address.sin_addr, 0, sizeof(ami_desc.local_address.sin_addr)); } + } else if (!strcasecmp(var->name, "brokeneventsaction")) { + broken_events_action = ast_true(val); } else if (!strcasecmp(var->name, "allowmultiplelogin")) { allowmultiplelogin = ast_true(val); } else if (!strcasecmp(var->name, "displayconnects")) { |