From bd3de6d0f1fc87c760533db9f82cdfad9dd96076 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 11 Jun 2007 22:07:50 +0000
Subject: [PATCH] Change displayconnects option in manager.conf to be per-user.
Issue 9932, patch by eliel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configs/manager.conf.sample | 2 ++
main/manager.c | 27 +++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 04305e0e99..93657fd6fc 100644
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -68,6 +68,8 @@ bindaddr = 0.0.0.0
;
; writetimeout = 100
;
+;displayconnects = yes ; Display on CLI user login/logoff
+;
; Authorization for various classes
;read = system,call,log,verbose,command,agent,user,config,dtmf
;write = system,call,log,verbose,command,agent,user,config,dtmf
diff --git a/main/manager.c b/main/manager.c
index dcd115f99a..3d3ca336b9 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -473,6 +473,23 @@ static struct ast_manager_user *get_manager_by_name_locked(const char *name)
return user;
}
+/*! \brief Get displayconnects config option.
+ * \param s manager session to get parameter from.
+ * \return displayconnects config option value.
+ */
+static int manager_displayconnects (struct mansession *s)
+{
+ struct ast_manager_user *user = NULL;
+ int ret = 0;
+
+ AST_LIST_LOCK(&users);
+ if ((user = get_manager_by_name_locked (s->username)))
+ ret = user->displayconnects;
+ AST_LIST_UNLOCK(&users);
+
+ return ret;
+}
+
/*! \note The actionlock is read-locked by the caller of this function */
static int handle_showmancmd(int fd, int argc, char *argv[])
{
@@ -1467,7 +1484,7 @@ static int action_login(struct mansession *s, const struct message *m)
}
s->authenticated = 1;
if (option_verbose > 1) {
- if (displayconnects) {
+ if (manager_displayconnects(s)) {
ast_verbose(VERBOSE_PREFIX_2 "%sManager '%s' logged on from %s\n", (s->managerid ? "HTTP " : ""), s->username, ast_inet_ntoa(s->sin.sin_addr));
}
}
@@ -2508,7 +2525,7 @@ static void *session_do(void *data)
/* session is over, explain why and terminate */
if (s->authenticated) {
if (option_verbose > 1) {
- if (displayconnects)
+ if (manager_displayconnects(s))
ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
}
ast_log(LOG_EVENT, "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
@@ -2537,7 +2554,7 @@ static void purge_sessions(int n_max)
if (s->sessiontimeout && (now > s->sessiontimeout) && !s->inuse) {
AST_LIST_REMOVE_CURRENT(&sessions, list);
ast_atomic_fetchadd_int(&num_sessions, -1);
- if (s->authenticated && (option_verbose > 1) && displayconnects) {
+ if (s->authenticated && (option_verbose > 1) && manager_displayconnects(s)) {
ast_verbose(VERBOSE_PREFIX_2 "HTTP Manager '%s' timed out from %s\n",
s->username, ast_inet_ntoa(s->sin.sin_addr));
}
@@ -3075,7 +3092,7 @@ static struct ast_str *generic_http_callback(enum output_format format,
if (process_message(s, &m)) {
if (s->authenticated) {
if (option_verbose > 1) {
- if (displayconnects)
+ if (manager_displayconnects(s))
ast_verbose(VERBOSE_PREFIX_2 "HTTP Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
}
ast_log(LOG_EVENT, "HTTP Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
@@ -3378,6 +3395,8 @@ int init_manager(void)
/* Make sure we keep this user and don't destroy it during cleanup */
user->keep = 1;
+ /* Default displayconnect to [general] */
+ user->displayconnects = displayconnects;
var = ast_variable_browse(cfg, cat);
while (var) {
--
GitLab