diff options
| author | Terry Wilson <twilson@digium.com> | 2009-01-13 23:00:27 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2009-01-13 23:00:27 +0000 |
| commit | 7c6d9c72353d27355a1012cdd4d151e8a8f15d73 (patch) | |
| tree | e788b74e5bda477eec1fc515ac993439c6db3423 | |
| parent | ec0f18405e849f3141fc4a2d973ef15d50b255dd (diff) | |
Add option to hide console connect messages
(closes issue #14222)
Reported by: jamesgolovich
Patches:
asterisk-hideconnect.diff.txt uploaded by jamesgolovich (license 176)
Tested by: otherwiseguy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | include/asterisk/options.h | 3 | ||||
| -rw-r--r-- | main/asterisk.c | 9 |
3 files changed, 11 insertions, 2 deletions
@@ -726,6 +726,7 @@ samples: adsi echo ";rungroup = asterisk ; The group to run as" ; \ echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \ echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \ + echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \ echo "" ; \ echo "; Changing the following lines may compromise your security." ; \ echo ";[files]" ; \ diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 54295e8ad..065d0c9a1 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -88,6 +88,8 @@ enum ast_option_flags { AST_OPT_FLAG_INITIATED_SECONDS = (1 << 26), /*! Force black background */ AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27), + /*! Hide remote console connect messages on console */ + AST_OPT_FLAG_HIDE_CONSOLE_CONNECT = (1 << 28), }; /*! These are the options that set by default when Asterisk starts */ @@ -119,6 +121,7 @@ enum ast_option_flags { #define ast_opt_verb_file ast_test_flag(&ast_options, AST_OPT_FLAG_VERBOSE_FILE) #define ast_opt_light_background ast_test_flag(&ast_options, AST_OPT_FLAG_LIGHT_BACKGROUND) #define ast_opt_force_black_background ast_test_flag(&ast_options, AST_OPT_FLAG_FORCE_BLACK_BACKGROUND) +#define ast_opt_hide_connect ast_test_flag(&ast_options, AST_OPT_FLAG_HIDE_CONSOLE_CONNECT) extern struct ast_flags ast_options; diff --git a/main/asterisk.c b/main/asterisk.c index 9b8b3f78a..d48c15615 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1212,7 +1212,9 @@ static void *netconsole(void *vconsole) break; } } - ast_verb(3, "Remote UNIX connection disconnected\n"); + if (!ast_opt_hide_connect) { + ast_verb(3, "Remote UNIX connection disconnected\n"); + } close(con->fd); close(con->p[0]); close(con->p[1]); @@ -1289,8 +1291,9 @@ static void *listener(void *unused) fdprint(s, "No more connections allowed\n"); ast_log(LOG_WARNING, "No more connections allowed\n"); close(s); - } else if (consoles[x].fd > -1) + } else if ((consoles[x].fd > -1) && (!ast_opt_hide_connect)) { ast_verb(3, "Remote UNIX connection\n"); + } } } } @@ -2953,6 +2956,8 @@ static void ast_readconfig(void) ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_LIGHT_BACKGROUND); } else if (!strcasecmp(v->name, "forceblackbackground")) { ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_FORCE_BLACK_BACKGROUND); + } else if (!strcasecmp(v->name, "hideconnect")) { + ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIDE_CONSOLE_CONNECT); } } for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) { |