Index: manager.c =================================================================== RCS file: /usr/cvsroot/asterisk/manager.c,v retrieving revision 1.79 diff -u -r1.79 manager.c --- manager.c 14 Nov 2004 05:52:08 -0000 1.79 +++ manager.c 23 Dec 2004 03:20:23 -0000 @@ -59,6 +59,8 @@ static int enabled = 0; static int portno = DEFAULT_MANAGER_PORT; static int asock = -1; +static int displayconnects = 1; + static pthread_t t; AST_MUTEX_DEFINE_STATIC(sessionlock); static int block_sockets = 0; @@ -414,7 +416,13 @@ } else if (!strcasecmp(v->name, "permit") || !strcasecmp(v->name, "deny")) { ha = ast_append_ha(v->name, v->value, ha); - } + } else if (!strcasecmp(v->name, "displayconnects")) { + if ( ast_true(v->value) ) + displayconnects = 1; + else + displayconnects = 0; + } + v = v->next; } if (ha && !ast_apply_ha(ha, &(s->sin))) { @@ -1131,8 +1139,11 @@ return -1; } else { s->authenticated = 1; - if (option_verbose > 1) - ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged on from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + if (option_verbose > 1) { + if ( displayconnects ) { + ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged on from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + } + } ast_log(LOG_EVENT, "Manager '%s' logged on from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); astman_send_ack(s, m, "Authentication accepted"); } @@ -1227,13 +1238,17 @@ break; } if (s->authenticated) { - if (option_verbose > 1) - ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); - ast_log(LOG_EVENT, "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + if (option_verbose > 1) { + if ( displayconnects ) + ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + } + ast_log(LOG_EVENT, "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); } else { - if (option_verbose > 1) - ast_verbose(VERBOSE_PREFIX_2 "Connect attempt from '%s' unable to authenticate\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); - ast_log(LOG_EVENT, "Failed attempt from %s\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + if (option_verbose > 1) { + if ( displayconnects ) + ast_verbose(VERBOSE_PREFIX_2 "Connect attempt from '%s' unable to authenticate\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); + } + ast_log(LOG_EVENT, "Failed attempt from %s\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr)); } destroy_session(s); return NULL; @@ -1470,6 +1485,12 @@ } ast_log(LOG_NOTICE, "Use of portno in manager.conf deprecated. Please use 'port=%s' instead.\n", val); } + /* Parsing the displayconnects */ + if ((val = ast_variable_retrieve(cfg, "general", "displayconnects"))) { + if ( !ast_true(val) ) + displayconnects = 0; + } + ba.sin_family = AF_INET; ba.sin_port = htons(portno);