#define WELCOME_MESSAGE \
ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \
ast_verbose("Created by Mark Spencer <markster@digium.com>\n"); \
- ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'show warranty' for details.\n"); \
+ ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'core show warranty' for details.\n"); \
ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
ast_verbose("License version 2 and other licenses; you are welcome to redistribute it under\n"); \
- ast_verbose("certain conditions. Type 'show license' for details.\n"); \
+ ast_verbose("certain conditions. Type 'core show license' for details.\n"); \
ast_verbose("=========================================================================\n")
-/*! \defgroup main_options
+/*! \defgroup main_options Main Configuration Options
\brief Main configuration options from \ref Config_ast "asterisk.conf" or
the operating system command line when starting Asterisk
Some of them can be changed in the CLI
*/
/*! @{ */
-extern int ast_language_is_prefix; /* XXX move to some header */
-
struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
int option_verbose = 0; /*!< Verbosity level */
static AST_LIST_HEAD_STATIC(thread_list, thread_list_t);
-static char show_threads_help[] =
-"Usage: show threads\n"
+static const char show_threads_help[] =
+"Usage: core show threads\n"
" List threads currently active in the system.\n";
void ast_register_thread(char *name)
if (!new)
return;
new->id = pthread_self();
- new->name = name; /* this was a copy already */
+ new->name = name; /* steal the allocated memory for the thread name */
AST_LIST_LOCK(&thread_list);
AST_LIST_INSERT_HEAD(&thread_list, new, list);
AST_LIST_UNLOCK(&thread_list);
AST_LIST_LOCK(&thread_list);
AST_LIST_TRAVERSE_SAFE_BEGIN(&thread_list, x, list) {
- if ((void *)x->id == id) {
+ if ((void *) x->id == id) {
AST_LIST_REMOVE_CURRENT(&thread_list, list);
break;
}
min = 0;
max = prof_data->entries;
- if (argc >= 3) { /* specific entries */
- if (isdigit(argv[2][0])) {
- min = atoi(argv[2]);
- if (argc == 4 && strcmp(argv[3], "-"))
- max = atoi(argv[3]);
+ if (argc > 3) { /* specific entries */
+ if (isdigit(argv[3][0])) {
+ min = atoi(argv[3]);
+ if (argc == 5 && strcmp(argv[4], "-"))
+ max = atoi(argv[4]);
} else
- search = argv[2];
+ search = argv[3];
}
if (max > prof_data->entries)
max = prof_data->entries;
return 0;
}
-static char show_version_files_help[] =
-"Usage: file list version [like <pattern>]\n"
+static const char show_version_files_help[] =
+"Usage: core show file version [like <pattern>]\n"
" Lists the revision numbers of the files used to build this copy of Asterisk.\n"
" Optional regular expression pattern is used to filter the file list.\n";
int ast_safe_system(const char *s)
{
pid_t pid;
+#ifdef HAVE_WORKING_FORK
int x;
+#endif
int res;
struct rusage rusage;
int status;
#endif
if (pid == 0) {
+#ifdef HAVE_WORKING_FORK
if (ast_opt_high_priority)
ast_set_priority(0);
/* Close file descriptors and launch system command */
for (x = STDERR_FILENO + 1; x < 4096; x++)
close(x);
+#endif
execl("/bin/sh", "/bin/sh", "-c", s, (char *) NULL);
- exit(1);
+ _exit(1);
} else if (pid > 0) {
for(;;) {
res = wait4(pid, &status, 0, &rusage);
fcntl(consoles[x].p[1], F_SETFL, flags | O_NONBLOCK);
consoles[x].fd = s;
consoles[x].mute = ast_opt_mute;
- if (ast_pthread_create(&consoles[x].t, &attr, netconsole, &consoles[x])) {
+ if (ast_pthread_create_background(&consoles[x].t, &attr, netconsole, &consoles[x])) {
ast_log(LOG_ERROR, "Unable to spawn thread to handle connection: %s\n", strerror(errno));
close(consoles[x].p[0]);
close(consoles[x].p[1]);
return -1;
}
ast_register_verbose(network_verboser);
- ast_pthread_create(<hread, NULL, listener, NULL);
+ ast_pthread_create_background(<hread, NULL, listener, NULL);
if (!ast_strlen_zero(ast_config_AST_CTL_OWNER)) {
struct passwd *pw;
- if ((pw = getpwnam(ast_config_AST_CTL_OWNER)) == NULL) {
+ if ((pw = getpwnam(ast_config_AST_CTL_OWNER)) == NULL)
ast_log(LOG_WARNING, "Unable to find uid of user %s\n", ast_config_AST_CTL_OWNER);
- } else {
+ else
uid = pw->pw_uid;
- }
}
if (!ast_strlen_zero(ast_config_AST_CTL_GROUP)) {
struct group *grp;
- if ((grp = getgrnam(ast_config_AST_CTL_GROUP)) == NULL) {
+ if ((grp = getgrnam(ast_config_AST_CTL_GROUP)) == NULL)
ast_log(LOG_WARNING, "Unable to find gid of group %s\n", ast_config_AST_CTL_GROUP);
- } else {
+ else
gid = grp->gr_gid;
- }
}
if (chown(ast_config_AST_SOCKET, uid, gid) < 0)
signal(sig, child_handler);
}
+/*! \brief Set maximum open files */
+static void set_ulimit(int value)
+{
+ struct rlimit l = {0, 0};
+
+ if (value <= 0) {
+ ast_log(LOG_WARNING, "Unable to change max files open to invalid value %i\n",value);
+ return;
+ }
+
+ l.rlim_cur = value;
+ l.rlim_max = value;
+
+ if (setrlimit(RLIMIT_NOFILE, &l)) {
+ ast_log(LOG_WARNING, "Unable to disable core size resource limit: %s\n",strerror(errno));
+ return;
+ }
+
+ ast_log(LOG_NOTICE, "Setting max files open to %d\n",value);
+
+ return;
+}
+
/*! \brief Set an X-term or screen title */
static void set_title(char *text)
{
return ret;
}
-static char abort_halt_help[] =
+static const char abort_halt_help[] =
"Usage: abort shutdown\n"
" Causes Asterisk to abort an executing shutdown or restart, and resume normal\n"
" call operations.\n";
-static char shutdown_now_help[] =
+static const char shutdown_now_help[] =
"Usage: stop now\n"
" Shuts down a running Asterisk immediately, hanging up all active calls .\n";
-static char shutdown_gracefully_help[] =
+static const char shutdown_gracefully_help[] =
"Usage: stop gracefully\n"
" Causes Asterisk to not accept new calls, and exit when all\n"
" active calls have terminated normally.\n";
-static char shutdown_when_convenient_help[] =
+static const char shutdown_when_convenient_help[] =
"Usage: stop when convenient\n"
" Causes Asterisk to perform a shutdown when all active calls have ended.\n";
-static char restart_now_help[] =
+static const char restart_now_help[] =
"Usage: restart now\n"
" Causes Asterisk to hangup all calls and exec() itself performing a cold\n"
" restart.\n";
-static char restart_gracefully_help[] =
+static const char restart_gracefully_help[] =
"Usage: restart gracefully\n"
" Causes Asterisk to stop accepting new calls and exec() itself performing a cold\n"
" restart when all active calls have ended.\n";
-static char restart_when_convenient_help[] =
+static const char restart_when_convenient_help[] =
"Usage: restart when convenient\n"
" Causes Asterisk to perform a cold restart when all active calls have ended.\n";
-static char bang_help[] =
+static const char bang_help[] =
"Usage: !<command>\n"
" Executes a given shell command\n";
-static char show_warranty_help[] =
-"Usage: show warranty\n"
+static const char show_warranty_help[] =
+"Usage: core show warranty\n"
" Shows the warranty (if any) for this copy of Asterisk.\n";
-static char show_license_help[] =
-"Usage: show license\n"
+static const char show_license_help[] =
+"Usage: core show license\n"
" Shows the license(s) for this copy of Asterisk.\n";
-static char version_help[] =
-"Usage: show version\n"
+static const char version_help[] =
+"Usage: core show version\n"
" Shows Asterisk version information.\n";
static int handle_version(int fd, int argc, char *argv[])
{
- if (argc != 2)
+ if (argc != 3)
return RESULT_SHOWUSAGE;
ast_cli(fd, "Asterisk %s built by %s @ %s on a %s running %s on %s\n",
ASTERISK_VERSION, ast_build_user, ast_build_hostname,
handle_restart_when_convenient, "Restart Asterisk at empty call volume",
restart_when_convenient_help },
- { { "show", "warranty", NULL },
+ { { "core", "show", "warranty", NULL },
show_warranty, "Show the warranty (if any) for this copy of Asterisk",
show_warranty_help },
- { { "show", "license", NULL },
+ { { "core", "show", "license", NULL },
show_license, "Show the license(s) for this copy of Asterisk",
show_license_help },
- { { "show", "version", NULL },
+ { { "core", "show", "version", NULL },
handle_version, "Display version info",
version_help },
bang_help },
#if !defined(LOW_MEMORY)
- { { "file", "list", "version", NULL },
+ { { "core", "show", "file", "version", NULL },
handle_show_version_files, "List versions of files used to build Asterisk",
show_version_files_help, complete_show_version_files },
- { { "show", "threads", NULL },
+ { { "core", "show", "threads", NULL },
handle_show_threads, "Show running threads",
show_threads_help },
- { { "profile", "list", NULL },
+ { { "core", "show", "profile", NULL },
handle_show_profile, "Display profiling info",
NULL },
- { { "profile", "clear", NULL },
+ { { "core", "clear", "profile", NULL },
handle_show_profile, "Clear profiling info",
NULL },
#endif /* ! LOW_MEMORY */
printf(term_quit());
WELCOME_MESSAGE;
break;
- } else {
+ } else
usleep(1000000 / reconnects_per_second);
- }
}
if (tries >= 30 * reconnects_per_second) {
fprintf(stderr, "Failed to reconnect for 30 seconds. Quitting.\n");
if ((buf[res-1] == '\n') || (buf[res-2] == '\n')) {
*cp = CC_REFRESH;
return(1);
- } else {
+ } else
lastpos = 1;
- }
}
}
}
/* If the color has been reset correctly, then there's no need to reset it later */
- if ((fgcolor == COLOR_WHITE) && (bgcolor == COLOR_BLACK)) {
- color_used = 0;
- } else {
- color_used = 1;
- }
+ color_used = ((fgcolor == COLOR_WHITE) && (bgcolor == COLOR_BLACK)) ? 0 : 1;
break;
case 'd': /* date */
memset(&tm, 0, sizeof(tm));
time(&ts);
- if (localtime_r(&ts, &tm)) {
+ if (localtime_r(&ts, &tm))
strftime(p, sizeof(prompt) - strlen(prompt), "%Y-%m-%d", &tm);
- }
break;
case 'h': /* hostname */
- if (!gethostname(hostname, sizeof(hostname) - 1)) {
+ if (!gethostname(hostname, sizeof(hostname) - 1))
strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
- } else {
+ else
strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
- }
break;
case 'H': /* short hostname */
if (!gethostname(hostname, sizeof(hostname) - 1)) {
}
}
strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
- } else {
+ } else
strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
- }
break;
#ifdef linux
case 'l': /* load avg */
case 't': /* time */
memset(&tm, 0, sizeof(tm));
time(&ts);
- if (localtime_r(&ts, &tm)) {
+ if (localtime_r(&ts, &tm))
strftime(p, sizeof(prompt) - strlen(prompt), "%H:%M:%S", &tm);
- }
break;
case '#': /* process console or remote? */
- if (!ast_opt_remote) {
+ if (!ast_opt_remote)
strncat(p, "#", sizeof(prompt) - strlen(prompt) - 1);
- } else {
+ else
strncat(p, ">", sizeof(prompt) - strlen(prompt) - 1);
- }
break;
case '%': /* literal % */
strncat(p, "%", sizeof(prompt) - strlen(prompt) - 1);
t--;
break;
}
- while (*p != '\0') {
+ while (*p != '\0')
p++;
- }
t++;
} else {
*p = *t;
if (color_used) {
/* Force colors back to normal at end */
term_color_code(term_code, COLOR_WHITE, COLOR_BLACK, sizeof(term_code));
- if (strlen(term_code) > sizeof(prompt) - strlen(prompt)) {
+ if (strlen(term_code) > sizeof(prompt) - strlen(prompt))
strncat(prompt + sizeof(prompt) - strlen(term_code) - 1, term_code, strlen(term_code));
- } else {
+ else
strncat(p, term_code, sizeof(term_code));
- }
}
} else if (remotehostname)
snprintf(prompt, sizeof(prompt), ASTERISK_PROMPT2, remotehostname);
pid = atoi(cpid);
else
pid = -1;
- snprintf(tmp, sizeof(tmp), "core verbose atleast %d", option_verbose);
+ snprintf(tmp, sizeof(tmp), "core set verbose atleast %d", option_verbose);
fdprint(ast_consock, tmp);
- snprintf(tmp, sizeof(tmp), "core debug atleast %d", option_debug);
+ snprintf(tmp, sizeof(tmp), "core set debug atleast %d", option_debug);
fdprint(ast_consock, tmp);
if (ast_opt_mute) {
snprintf(tmp, sizeof(tmp), "log and verbose output currently muted ('logger unmute' to unmute)");
cfg = ast_config_load(ast_config_AST_CONFIG_FILE);
if (!cfg)
ast_log(LOG_WARNING, "Unable to open specified master config file '%s', using built-in defaults\n", ast_config_AST_CONFIG_FILE);
- } else {
+ } else
cfg = ast_config_load(config);
- }
/* init with buildtime config */
ast_copy_string(ast_config_AST_CONFIG_DIR, AST_CONFIG_DIR, sizeof(ast_config_AST_CONFIG_DIR));
}
for (v = ast_variable_browse(cfg, "files"); v; v = v->next) {
- if (!strcasecmp(v->name, "astctlpermissions")) {
+ if (!strcasecmp(v->name, "astctlpermissions"))
ast_copy_string(ast_config_AST_CTL_PERMISSIONS, v->value, sizeof(ast_config_AST_CTL_PERMISSIONS));
- } else if (!strcasecmp(v->name, "astctlowner")) {
+ else if (!strcasecmp(v->name, "astctlowner"))
ast_copy_string(ast_config_AST_CTL_OWNER, v->value, sizeof(ast_config_AST_CTL_OWNER));
- } else if (!strcasecmp(v->name, "astctlgroup")) {
+ else if (!strcasecmp(v->name, "astctlgroup"))
ast_copy_string(ast_config_AST_CTL_GROUP, v->value, sizeof(ast_config_AST_CTL_GROUP));
- } else if (!strcasecmp(v->name, "astctl")) {
+ else if (!strcasecmp(v->name, "astctl"))
ast_copy_string(ast_config_AST_CTL, v->value, sizeof(ast_config_AST_CTL));
- }
}
for (v = ast_variable_browse(cfg, "directories"); v; v = v->next) {
} else if ((sscanf(v->value, "%lf", &option_maxload) != 1) || (option_maxload < 0.0)) {
option_maxload = 0.0;
}
+ /* Set the maximum amount of open files */
+ } else if (!strcasecmp(v->name, "maxfiles")) {
+ set_ulimit(atoi(v->value));
/* What user to run as */
} else if (!strcasecmp(v->name, "runuser")) {
ast_copy_string(ast_config_AST_RUN_USER, v->value, sizeof(ast_config_AST_RUN_USER));
ast_verbose("[ Reading Master Configuration ]\n");
ast_readconfig();
+ if (!ast_language_is_prefix && !ast_opt_remote)
+ ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n");
+
if (ast_opt_dump_core) {
struct rlimit l;
memset(&l, 0, sizeof(l));
}
#endif
- term_init();
+ ast_term_init();
printf(term_end());
fflush(stdout);
srand((unsigned int) getpid() + (unsigned int) time(NULL));
initstate((unsigned int) getpid() * 65536 + (unsigned int) time(NULL), randompool, sizeof(randompool));
- if (init_logger()) {
+ if (init_logger()) { /* Start logging subsystem */
printf(term_quit());
exit(1);
}
- if (load_modules(1)) {
+ if (load_modules(1)) { /* Load modules */
printf(term_quit());
exit(1);
}
- if (dnsmgr_init()) {
+ if (dnsmgr_init()) { /* Initialize the DNS manager */
printf(term_quit());
exit(1);
}
- ast_http_init();
+ ast_http_init(); /* Start the HTTP server, if needed */
ast_channels_init();
projects / asterisk/asterisk.git / blobdiff