kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

New CLI command "Core show settings" to list some core settings

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2007-02-14 20:22:20 +00:00
parent daa5f504ec
commit 8ac0fb2bc3
7 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/manager.c
View File

@@ -109,6 +109,8 @@ static AST_LIST_HEAD_STATIC(all_events, eventqent);
static int displayconnects = 1;
static int timestampevents;
static int httptimeout = 60;
static int manager_enabled = 0;
static int webmanager_enabled = 0;
static int block_sockets;
static int num_sessions;
@@ -239,6 +241,16 @@ static void UNLOCK_SESS(void)
}
#endif
int check_manager_enabled()
{
return manager_enabled;
}
int check_webmanager_enabled()
{
return (webmanager_enabled && manager_enabled);
}
/*!
* Grab a reference to the last event, update usecount as needed.
* Can handle a NULL pointer.
@@ -2934,8 +2946,6 @@ int init_manager(void)
struct ast_config *cfg = NULL;
const char *val;
char *cat = NULL;
int webenabled = 0;
int enabled = 0;
int newhttptimeout = 60;
int have_sslbindaddr = 0;
struct hostent *hp;
@@ -3015,11 +3025,11 @@ int init_manager(void)
free(ami_tls_cfg.cipher);
ami_tls_cfg.cipher = ast_strdup(val);
} else if (!strcasecmp(var->name, "enabled")) {
enabled = ast_true(val);
manager_enabled = ast_true(val);
} else if (!strcasecmp(var->name, "block-sockets")) {
block_sockets = ast_true(val);
} else if (!strcasecmp(var->name, "webenabled")) {
webenabled = ast_true(val);
webmanager_enabled = ast_true(val);
} else if (!strcasecmp(var->name, "port")) {
ami_desc.sin.sin_port = htons(atoi(val));
} else if (!strcasecmp(var->name, "bindaddr")) {
@@ -3041,7 +3051,7 @@ int init_manager(void)
}
}
if (enabled)
if (manager_enabled)
ami_desc.sin.sin_family = AF_INET;
if (!have_sslbindaddr)
amis_desc.sin.sin_addr = ami_desc.sin.sin_addr;
@@ -3128,7 +3138,7 @@ int init_manager(void)
ast_config_destroy(cfg);
if (webenabled && enabled) {
if (webmanager_enabled && manager_enabled) {
if (!webregged) {
ast_http_uri_link(&rawmanuri);
ast_http_uri_link(&manageruri);