Merge slepp's sub-second expiration timer although hopefully it will never have to...
[asterisk/asterisk.git] / asterisk.c
index 9b3fa64..d1b0dad 100755 (executable)
@@ -13,6 +13,7 @@
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/poll.h>
 #include <asterisk/logger.h>
 #include <asterisk/options.h>
 #include <asterisk/cli.h>
 #include <asterisk/tdd.h>
 #include <asterisk/term.h>
 #include <asterisk/manager.h>
+#include <asterisk/pbx.h>
+#include <asterisk/enum.h>
+#include <asterisk/rtp.h>
+#include <asterisk/app.h>
+#include <asterisk/lock.h>
+#include <sys/resource.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sched.h>
 #include <asterisk/io.h>
-#include <pthread.h>
+#include <asterisk/lock.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/select.h>
+#include <sys/wait.h>
 #include <string.h>
 #include <errno.h>
-#include <readline/readline.h>
-#include <readline/history.h>
+#include <ctype.h>
+#include "editline/histedit.h"
 #include "asterisk.h"
+#include <asterisk/config.h>
+
+#if  defined(__FreeBSD__)
+#include <netdb.h>
+#endif
 
 #define AST_MAX_CONNECTS 128
 #define NUM_MSGS 64
@@ -53,33 +65,164 @@ int option_remote=0;
 int option_exec=0;
 int option_initcrypto=0;
 int option_nocolor;
+int option_dumpcore = 0;
+int option_overrideconfig = 0;
 int fully_booted = 0;
 
 static int ast_socket = -1;            /* UNIX Socket for allowing remote control */
 static int ast_consock = -1;           /* UNIX Socket for controlling another asterisk */
-static int mainpid;
+int ast_mainpid;
 struct console {
        int fd;                                 /* File descriptor */
        int p[2];                               /* Pipe */
        pthread_t t;                    /* Thread of handler */
 };
 
+static struct ast_atexit {
+       void (*func)(void);
+       struct ast_atexit *next;
+} *atexits = NULL;
+static ast_mutex_t atexitslock = AST_MUTEX_INITIALIZER;
+
+time_t ast_startuptime;
+time_t ast_lastreloadtime;
+
+static History *el_hist = NULL;
+static EditLine *el = NULL;
+static char *remotehostname;
+
 struct console consoles[AST_MAX_CONNECTS];
 
 char defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE;
 
-static int fdprint(int fd, char *s)
+static int ast_el_add_history(char *);
+static int ast_el_read_history(char *);
+static int ast_el_write_history(char *);
+
+char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
+char ast_config_AST_MODULE_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+char ast_config_AST_KEY_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
+char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
+char ast_config_AST_RUN_DIR[AST_CONFIG_MAX_PATH];
+
+static char *_argv[256];
+static int shuttingdown = 0;
+static int restartnow = 0;
+static pthread_t consolethread = AST_PTHREADT_NULL;
+
+int ast_register_atexit(void (*func)(void))
+{
+       int res = -1;
+       struct ast_atexit *ae;
+       ast_unregister_atexit(func);
+       ae = malloc(sizeof(struct ast_atexit));
+       ast_mutex_lock(&atexitslock);
+       if (ae) {
+               memset(ae, 0, sizeof(struct ast_atexit));
+               ae->next = atexits;
+               ae->func = func;
+               atexits = ae;
+               res = 0;
+       }
+       ast_mutex_unlock(&atexitslock);
+       return res;
+}
+
+void ast_unregister_atexit(void (*func)(void))
+{
+       struct ast_atexit *ae, *prev = NULL;
+       ast_mutex_lock(&atexitslock);
+       ae = atexits;
+       while(ae) {
+               if (ae->func == func) {
+                       if (prev)
+                               prev->next = ae->next;
+                       else
+                               atexits = ae->next;
+                       break;
+               }
+               prev = ae;
+               ae = ae->next;
+       }
+       ast_mutex_unlock(&atexitslock);
+}
+
+static int fdprint(int fd, const char *s)
 {
        return write(fd, s, strlen(s) + 1);
 }
 
-static void network_verboser(char *s, int pos, int replace, int complete)
+int ast_safe_system(const char *s)
 {
+       /* XXX This function needs some optimization work XXX */
+       pid_t pid;
        int x;
-       for (x=0;x<AST_MAX_CONNECTS; x++) {
-               if (consoles[x].fd > -1) 
-                       fdprint(consoles[x].p[1], s);
+       int res;
+       struct rusage rusage;
+       int status;
+       pid = fork();
+       if (pid == 0) {
+               /* Close file descriptors and launch system command */
+               for (x=STDERR_FILENO + 1; x<4096;x++) {
+                       close(x);
+               }
+               res = execl("/bin/sh", "/bin/sh", "-c", s, NULL);
+               exit(1);
+       } else if (pid > 0) {
+               for(;;) {
+                       res = wait4(pid, &status, 0, &rusage);
+                       if (res > -1) {
+                               if (WIFEXITED(status))
+                                       res = WEXITSTATUS(status);
+                               else
+                                       res = -1;
+                       } else {
+                               if (errno != EINTR) 
+                                       break;
+                       }
+               }
+       } else {
+               ast_log(LOG_WARNING, "Fork failed: %s\n", strerror(errno));
+               res = -1;
        }
+       return res;
+}
+
+/*
+ * write the string to all attached console clients
+ */
+static void ast_network_puts(const char *string)
+{
+    int x;
+    for (x=0;x<AST_MAX_CONNECTS; x++) {
+       if (consoles[x].fd > -1) 
+           fdprint(consoles[x].p[1], string);
+    }
+}
+
+
+/*
+ * write the string to the console, and all attached
+ * console clients
+ */
+void ast_console_puts(const char *string)
+{
+    fputs(string, stdout);
+    fflush(stdout);
+    ast_network_puts(string);
+}
+
+static void network_verboser(const char *s, int pos, int replace, int complete)
+     /* ARGUSED */
+{
+    ast_network_puts(s);
 }
 
 static pthread_t lthread;
@@ -90,26 +233,24 @@ static void *netconsole(void *vconsole)
        char hostname[256];
        char tmp[512];
        int res;
-       int max;
-       fd_set rfds;
+       struct pollfd fds[2];
        
        if (gethostname(hostname, sizeof(hostname)))
                strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
-       snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, mainpid, ASTERISK_VERSION);
+       snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, ast_mainpid, ASTERISK_VERSION);
        fdprint(con->fd, tmp);
        for(;;) {
-               FD_ZERO(&rfds); 
-               FD_SET(con->fd, &rfds);
-               FD_SET(con->p[0], &rfds);
-               max = con->fd;
-               if (con->p[0] > max)
-                       max = con->p[0];
-               res = select(max + 1, &rfds, NULL, NULL, NULL);
+               fds[0].fd = con->fd;
+               fds[0].events = POLLIN;
+               fds[1].fd = con->p[0];
+               fds[1].events = POLLIN;
+
+               res = poll(fds, 2, -1);
                if (res < 0) {
-                       ast_log(LOG_WARNING, "select returned < 0: %s\n", strerror(errno));
+                       ast_log(LOG_WARNING, "poll returned < 0: %s\n", strerror(errno));
                        continue;
                }
-               if (FD_ISSET(con->fd, &rfds)) {
+               if (fds[0].revents) {
                        res = read(con->fd, tmp, sizeof(tmp));
                        if (res < 1) {
                                break;
@@ -117,7 +258,7 @@ static void *netconsole(void *vconsole)
                        tmp[res] = 0;
                        ast_cli_command(con->fd, tmp);
                }
-               if (FD_ISSET(con->p[0], &rfds)) {
+               if (fds[1].revents) {
                        res = read(con->p[0], tmp, sizeof(tmp));
                        if (res < 1) {
                                ast_log(LOG_ERROR, "read returned %d\n", res);
@@ -145,16 +286,26 @@ static void *listener(void *unused)
        int len;
        int x;
        int flags;
+       struct pollfd fds[1];
        pthread_attr_t attr;
        pthread_attr_init(&attr);
        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
        for(;;) {
                if (ast_socket < 0)
                        return NULL;
+               fds[0].fd = ast_socket;
+               fds[0].events= POLLIN;
+               s = poll(fds, 1, -1);
+               if (s < 0) {
+                       if (errno != EINTR)
+                               ast_log(LOG_WARNING, "poll returned error: %s\n", strerror(errno));
+                       continue;
+               }
                len = sizeof(sun);
                s = accept(ast_socket, (struct sockaddr *)&sun, &len);
                if (s < 0) {
-                       ast_log(LOG_WARNING, "Accept retured %d: %s\n", s, strerror(errno));
+                       if (errno != EINTR)
+                               ast_log(LOG_WARNING, "Accept returned %d: %s\n", s, strerror(errno));
                } else {
                        for (x=0;x<AST_MAX_CONNECTS;x++) {
                                if (consoles[x].fd < 0) {
@@ -197,7 +348,7 @@ static int ast_makesocket(void)
        int x;
        for (x=0;x<AST_MAX_CONNECTS;x++)        
                consoles[x].fd = -1;
-       unlink(AST_SOCKET);
+       unlink((char *)ast_config_AST_SOCKET);
        ast_socket = socket(PF_LOCAL, SOCK_STREAM, 0);
        if (ast_socket < 0) {
                ast_log(LOG_WARNING, "Unable to create control socket: %s\n", strerror(errno));
@@ -205,17 +356,17 @@ static int ast_makesocket(void)
        }               
        memset(&sun, 0, sizeof(sun));
        sun.sun_family = AF_LOCAL;
-       strncpy(sun.sun_path, AST_SOCKET, sizeof(sun.sun_path)-1);
+       strncpy(sun.sun_path, (char *)ast_config_AST_SOCKET, sizeof(sun.sun_path)-1);
        res = bind(ast_socket, (struct sockaddr *)&sun, sizeof(sun));
        if (res) {
-               ast_log(LOG_WARNING, "Unable to bind socket to %s: %s\n", AST_SOCKET, strerror(errno));
+               ast_log(LOG_WARNING, "Unable to bind socket to %s: %s\n", (char *)ast_config_AST_SOCKET, strerror(errno));
                close(ast_socket);
                ast_socket = -1;
                return -1;
        }
        res = listen(ast_socket, 2);
        if (res < 0) {
-               ast_log(LOG_WARNING, "Unable to listen on socket %s: %s\n", AST_SOCKET, strerror(errno));
+               ast_log(LOG_WARNING, "Unable to listen on socket %s: %s\n", (char *)ast_config_AST_SOCKET, strerror(errno));
                close(ast_socket);
                ast_socket = -1;
                return -1;
@@ -236,7 +387,7 @@ static int ast_tryconnect(void)
        }
        memset(&sun, 0, sizeof(sun));
        sun.sun_family = AF_LOCAL;
-       strncpy(sun.sun_path, AST_SOCKET, sizeof(sun.sun_path)-1);
+       strncpy(sun.sun_path, (char *)ast_config_AST_SOCKET, sizeof(sun.sun_path)-1);
        res = connect(ast_consock, (struct sockaddr *)&sun, sizeof(sun));
        if (res) {
                close(ast_consock);
@@ -248,10 +399,11 @@ static int ast_tryconnect(void)
 
 static void urg_handler(int num)
 {
-       /* Called by soft_hangup to interrupt the select, read, or other
+       /* Called by soft_hangup to interrupt the poll, read, or other
           system call.  We don't actually need to do anything though.  */
+       /* Cannot EVER ast_log from within a signal handler */
        if (option_debug) 
-               ast_log(LOG_DEBUG, "Urgent handler\n");
+               printf("Urgent handler\n");
        signal(num, urg_handler);
        return;
 }
@@ -259,15 +411,27 @@ static void urg_handler(int num)
 static void hup_handler(int num)
 {
        if (option_verbose > 1) 
-               ast_verbose(VERBOSE_PREFIX_2 "Received HUP signal -- Reloading configs\n");
+               printf("Received HUP signal -- Reloading configs\n");
+       if (restartnow)
+               execvp(_argv[0], _argv);
+       /* XXX This could deadlock XXX */
        ast_module_reload();
 }
 
-
-static void pipe_handler(int num)
+static void child_handler(int sig)
 {
-       /* Ignore sigpipe */
+       /* Must not ever ast_log or ast_verbose within signal handler */
+       int n, status;
+
+       /*
+        * Reap all dead children -- not just one
+        */
+       for (n = 0; wait4(-1, &status, WNOHANG, NULL) > 0; n++)
+               ;
+       if (n == 0 && option_debug)     
+               printf("Huh?  Child handler, but nobody there?\n");
 }
+
 static void set_title(char *text)
 {
        /* Set an X-term or screen title */
@@ -287,6 +451,7 @@ static int set_priority(int pri)
        memset(&sched, 0, sizeof(sched));
        /* We set ourselves to a high priority, that we might pre-empt everything
           else.  If your PBX has heavy activity on it, this is a good thing.  */
+#ifdef __linux__
        if (pri) {  
                sched.sched_priority = 10;
                if (sched_setscheduler(0, SCHED_RR, &sched)) {
@@ -302,12 +467,36 @@ static int set_priority(int pri)
                        return -1;
                }
        }
+#else
+       if (pri) {
+               if (setpriority(PRIO_PROCESS, 0, -10) == -1) {
+                       ast_log(LOG_WARNING, "Unable to set high priority\n");
+                       return -1;
+               } else
+                       if (option_verbose)
+                               ast_verbose("Set to high priority\n");
+       } else {
+               if (setpriority(PRIO_PROCESS, 0, 0) == -1) {
+                       ast_log(LOG_WARNING, "Unable to set normal priority\n");
+                       return -1;
+               }
+       }
+#endif
        return 0;
 }
 
-static char *_argv[256];
-
-static int shuttingdown = 0;
+static void ast_run_atexits(void)
+{
+       struct ast_atexit *ae;
+       ast_mutex_lock(&atexitslock);
+       ae = atexits;
+       while(ae) {
+               if (ae->func) 
+                       ae->func();
+               ae = ae->next;
+       }
+       ast_mutex_unlock(&atexitslock);
+}
 
 static void quit_handler(int num, int nice, int safeshutdown, int restart)
 {
@@ -358,14 +547,21 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
                if (getenv("HOME")) 
                        snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
                if (strlen(filename))
-                       write_history(filename);
-               rl_callback_handler_remove();
+                       ast_el_write_history(filename);
+               if (el != NULL)
+                       el_end(el);
+               if (el_hist != NULL)
+                       history_end(el_hist);
        }
+       if (option_verbose)
+               ast_verbose("Executing last minute cleanups\n");
+       ast_run_atexits();
        /* Called on exit */
        if (option_verbose && option_console)
                ast_verbose("Asterisk %s ending (%d).\n", ast_active_channels() ? "uncleanly" : "cleanly", num);
        else if (option_debug)
                ast_log(LOG_DEBUG, "Asterisk ending (%d).\n", num);
+       manager_event(EVENT_FLAG_SYSTEM, "Shutdown", "Shutdown: %s\r\nRestart: %s\r\n", ast_active_channels() ? "Uncleanly" : "Cleanly", restart ? "True" : "False");
        if (ast_socket > -1) {
                close(ast_socket);
                ast_socket = -1;
@@ -373,8 +569,8 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
        if (ast_consock > -1)
                close(ast_consock);
        if (ast_socket > -1)
-               unlink(AST_SOCKET);
-       unlink(AST_PID);
+               unlink((char *)ast_config_AST_SOCKET);
+       if (!option_remote) unlink((char *)ast_config_AST_PID);
        printf(term_quit());
        if (restart) {
                if (option_verbose || option_console)
@@ -385,9 +581,18 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
                }
                if (option_verbose || option_console)
                        ast_verbose("Restarting Asterisk NOW...\n");
-               execvp(_argv[0], _argv);
-       } else
-               exit(0);
+               restartnow = 1;
+               /* If there is a consolethread running send it a SIGHUP 
+                  so it can execvp, otherwise we can do it ourselves */
+               if (consolethread != AST_PTHREADT_NULL) {
+                       pthread_kill(consolethread, SIGHUP);
+                       /* Give the signal handler some time to complete */
+                       sleep(2);
+               } else
+                       execvp(_argv[0], _argv);
+       
+       }
+       exit(0);
 }
 
 static void __quit_handler(int num)
@@ -395,35 +600,38 @@ static void __quit_handler(int num)
        quit_handler(num, 0, 1, 0);
 }
 
-static pthread_t consolethread = -1;
-
-static int fix_header(char *outbuf, int maxout, char **s, char *cmp)
+static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp)
 {
-       if (!strncmp(*s, cmp, strlen(cmp))) {
-               *s += strlen(cmp);
+       const char *c;
+       if (!strncmp(s, cmp, strlen(cmp))) {
+               c = s + strlen(cmp);
                term_color(outbuf, cmp, COLOR_GRAY, 0, maxout);
-               return 1;
+               return c;
        }
-       return 0;
+       return NULL;
 }
 
-static void console_verboser(char *s, int pos, int replace, int complete)
+static void console_verboser(const char *s, int pos, int replace, int complete)
 {
        char tmp[80];
+       const char *c=NULL;
        /* Return to the beginning of the line */
        if (!pos) {
                fprintf(stdout, "\r");
-               if (fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_4) ||
-                       fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_3) ||
-                       fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_2) ||
-                       fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_1))
+               if ((c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_4)) ||
+                       (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_3)) ||
+                       (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_2)) ||
+                       (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1)))
                        fputs(tmp, stdout);
        }
-       fputs(s + pos,stdout);
+       if (c)
+               fputs(c + pos,stdout);
+       else
+               fputs(s + pos,stdout);
        fflush(stdout);
        if (complete)
-       /* Wake up a select()ing console */
-               if (consolethread > -1)
+       /* Wake up a poll()ing console */
+               if (option_console && consolethread != AST_PTHREADT_NULL)
                        pthread_kill(consolethread, SIGURG);
 }
 
@@ -433,45 +641,46 @@ static void consolehandler(char *s)
        fflush(stdout);
        /* Called when readline data is available */
        if (s && strlen(s))
-               add_history(s);
+               ast_el_add_history(s);
        /* Give the console access to the shell */
        if (s) {
+               /* The real handler for bang */
                if (s[0] == '!') {
                        if (s[1])
-                               system(s+1);
+                               ast_safe_system(s+1);
                        else
-                               system(getenv("SHELL") ? getenv("SHELL") : "/bin/sh");
+                               ast_safe_system(getenv("SHELL") ? getenv("SHELL") : "/bin/sh");
                } else 
                ast_cli_command(STDOUT_FILENO, s);
-               if (!strcasecmp(s, "help"))
-                       fprintf(stdout, "          !<command>   Executes a given shell command\n");
        } else
                fprintf(stdout, "\nUse \"quit\" to exit\n");
 }
 
-
-static char cmd[1024];
-
-static void remoteconsolehandler(char *s)
+static int remoteconsolehandler(char *s)
 {
+       int ret = 0;
        /* Called when readline data is available */
        if (s && strlen(s))
-               add_history(s);
+               ast_el_add_history(s);
        /* Give the console access to the shell */
        if (s) {
+               /* The real handler for bang */
                if (s[0] == '!') {
                        if (s[1])
-                               system(s+1);
+                               ast_safe_system(s+1);
                        else
-                               system(getenv("SHELL") ? getenv("SHELL") : "/bin/sh");
-               } else 
-               strncpy(cmd, s, sizeof(cmd)-1);
-               if (!strcasecmp(s, "help"))
-                       fprintf(stdout, "          !<command>   Executes a given shell command\n");
-               if (!strcasecmp(s, "quit"))
+                               ast_safe_system(getenv("SHELL") ? getenv("SHELL") : "/bin/sh");
+                       ret = 1;
+               }
+               if ((strncasecmp(s, "quit", 4) == 0 || strncasecmp(s, "exit", 4) == 0) &&
+                   (s[4] == '\0' || isspace(s[4]))) {
                        quit_handler(0, 0, 0, 0);
+                       ret = 1;
+               }
        } else
                fprintf(stdout, "\nUse \"quit\" to exit\n");
+
+       return ret;
 }
 
 static char quit_help[] = 
@@ -484,14 +693,18 @@ static char abort_halt_help[] =
 "       call operations.\n";
 
 static char shutdown_now_help[] = 
-"Usage: shutdown now\n"
+"Usage: stop now\n"
 "       Shuts down a running Asterisk immediately, hanging up all active calls .\n";
 
 static char shutdown_gracefully_help[] = 
-"Usage: shutdown gracefully\n"
+"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[] = 
+"Usage: stop when convenient\n"
+"       Causes Asterisk to perform a shutdown when all active calls have ended.\n";
+
 static char restart_now_help[] = 
 "Usage: restart now\n"
 "       Causes Asterisk to hangup all calls and exec() itself performing a cold.\n"
@@ -506,6 +719,11 @@ static 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[] =
+"Usage: !<command>\n"
+"       Executes a given shell command\n";
+
+#if 0
 static int handle_quit(int fd, int argc, char *argv[])
 {
        if (argc != 1)
@@ -513,6 +731,16 @@ static int handle_quit(int fd, int argc, char *argv[])
        quit_handler(0, 0, 1, 0);
        return RESULT_SUCCESS;
 }
+#endif
+
+static int no_more_quit(int fd, int argc, char *argv[])
+{
+       if (argc != 1)
+               return RESULT_SHOWUSAGE;
+       ast_cli(fd, "The QUIT and EXIT commands may no longer be used to shutdown the PBX.\n"
+                   "Please use STOP NOW instead, if you wish to shutdown the PBX.\n");
+       return RESULT_SUCCESS;
+}
 
 static int handle_shutdown_now(int fd, int argc, char *argv[])
 {
@@ -530,6 +758,14 @@ static int handle_shutdown_gracefully(int fd, int argc, char *argv[])
        return RESULT_SUCCESS;
 }
 
+static int handle_shutdown_when_convenient(int fd, int argc, char *argv[])
+{
+       if (argc != 3)
+               return RESULT_SHOWUSAGE;
+       quit_handler(0, 2 /* really nicely */, 1 /* safely */, 0 /* don't restart */);
+       return RESULT_SUCCESS;
+}
+
 static int handle_restart_now(int fd, int argc, char *argv[])
 {
        if (argc != 2)
@@ -563,71 +799,526 @@ static int handle_abort_halt(int fd, int argc, char *argv[])
        return RESULT_SUCCESS;
 }
 
+static int handle_bang(int fd, int argc, char *argv[])
+{
+       return RESULT_SUCCESS;
+}
+
 #define ASTERISK_PROMPT "*CLI> "
 
 #define ASTERISK_PROMPT2 "%s*CLI> "
 
 static struct ast_cli_entry aborthalt = { { "abort", "halt", NULL }, handle_abort_halt, "Cancel a running halt", abort_halt_help };
 
-static struct ast_cli_entry quit =     { { "quit", NULL }, handle_quit, "Exit Asterisk", quit_help };
+static struct ast_cli_entry quit =     { { "quit", NULL }, no_more_quit, "Exit Asterisk", quit_help };
+static struct ast_cli_entry astexit =  { { "exit", NULL }, no_more_quit, "Exit Asterisk", quit_help };
 
-static struct ast_cli_entry astshutdownnow =   { { "shutdown", "now", NULL }, handle_shutdown_now, "Shut down Asterisk imediately", shutdown_now_help };
-static struct ast_cli_entry astshutdowngracefully =    { { "shutdown", "gracefully", NULL }, handle_shutdown_gracefully, "Gracefully shut down Asterisk", shutdown_gracefully_help };
+static struct ast_cli_entry astshutdownnow =   { { "stop", "now", NULL }, handle_shutdown_now, "Shut down Asterisk immediately", shutdown_now_help };
+static struct ast_cli_entry astshutdowngracefully =    { { "stop", "gracefully", NULL }, handle_shutdown_gracefully, "Gracefully shut down Asterisk", shutdown_gracefully_help };
+static struct ast_cli_entry astshutdownwhenconvenient =        { { "stop", "when","convenient", NULL }, handle_shutdown_when_convenient, "Shut down Asterisk at empty call volume", shutdown_when_convenient_help };
 static struct ast_cli_entry astrestartnow =    { { "restart", "now", NULL }, handle_restart_now, "Restart Asterisk immediately", restart_now_help };
 static struct ast_cli_entry astrestartgracefully =     { { "restart", "gracefully", NULL }, handle_restart_gracefully, "Restart Asterisk gracefully", restart_gracefully_help };
 static struct ast_cli_entry astrestartwhenconvenient=  { { "restart", "when", "convenient", NULL }, handle_restart_when_convenient, "Restart Asterisk at empty call volume", restart_when_convenient_help };
+static struct ast_cli_entry astbang = { { "!", NULL }, handle_bang, "Execute a shell command", bang_help };
 
-static char *cli_generator(char *text, int state)
+static int ast_el_read_char(EditLine *el, char *cp)
 {
-       return ast_cli_generator(rl_line_buffer, text, state);
+    int num_read=0;
+       int lastpos=0;
+       struct pollfd fds[2];
+       int res;
+       int max;
+       char buf[512];
+
+       for (;;) {
+               max = 1;
+               fds[0].fd = ast_consock;
+               fds[0].events = POLLIN;
+               if (!option_exec) {
+                       fds[1].fd = STDIN_FILENO;
+                       fds[1].events = POLLIN;
+                       max++;
+               }
+               res = poll(fds, max, -1);
+               if (res < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       ast_log(LOG_ERROR, "poll failed: %s\n", strerror(errno));
+                       break;
+               }
+
+               if (!option_exec && fds[1].revents) {
+                       num_read = read(STDIN_FILENO, cp, 1);
+                       if (num_read < 1) {
+                               break;
+                       } else 
+                               return (num_read);
+               }
+               if (fds[0].revents) {
+                       res = read(ast_consock, buf, sizeof(buf) - 1);
+                       /* if the remote side disappears exit */
+                       if (res < 1) {
+                               fprintf(stderr, "\nDisconnected from Asterisk server\n");
+                               quit_handler(0, 0, 0, 0);
+                       }
+
+                       buf[res] = '\0';
+
+                       if (!option_exec && !lastpos)
+                               write(STDOUT_FILENO, "\r", 1);
+                       write(STDOUT_FILENO, buf, res);
+                       if ((buf[res-1] == '\n') || (buf[res-2] == '\n')) {
+                               *cp = CC_REFRESH;
+                               return(1);
+                       } else {
+                               lastpos = 1;
+                       }
+               }
+       }
+
+       *cp = '\0';
+       return (0);
 }
 
-static char *console_cli_generator(char *text, int state)
+static char *cli_prompt(EditLine *el)
 {
-       char buf[1024];
-       int res;
-#if 0
-       fprintf(stderr, "Searching for '%s', %s %d\n", rl_line_buffer, text, state);
-#endif 
-       snprintf(buf, sizeof(buf),"_COMMAND COMPLETE \"%s\" \"%s\" %d", rl_line_buffer, text, state); 
-       fdprint(ast_consock, buf);
-       res = read(ast_consock, buf, sizeof(buf));
-       buf[res] = '\0';
-#if 0
-       printf("res is %d, buf is '%s'\n", res, buf);
-#endif 
-       if (strncmp(buf, "NULL", 4))
-               return strdup(buf);
+       static char prompt[200];
+       char *pfmt;
+       int color_used=0;
+       char term_code[20];
+
+       if ((pfmt = getenv("ASTERISK_PROMPT"))) {
+               char *t = pfmt, *p = prompt;
+               memset(prompt, 0, sizeof(prompt));
+               while (*t != '\0' && *p < sizeof(prompt)) {
+                       if (*t == '%') {
+                               char hostname[256];
+                               int i;
+                               struct timeval tv;
+                               struct tm tm;
+                               FILE *LOADAVG;
+                               int fgcolor = COLOR_WHITE, bgcolor = COLOR_BLACK;
+
+                               t++;
+                               switch (*t) {
+                                       case 'C': /* color */
+                                               t++;
+                                               if (sscanf(t, "%d;%d%n", &fgcolor, &bgcolor, &i) == 2) {
+                                                       strncat(p, term_color_code(term_code, fgcolor, bgcolor, sizeof(term_code)),sizeof(prompt) - strlen(prompt));
+                                                       t += i - 1;
+                                               } else if (sscanf(t, "%d%n", &fgcolor, &i) == 1) {
+                                                       strncat(p, term_color_code(term_code, fgcolor, 0, sizeof(term_code)),sizeof(prompt) - strlen(prompt));
+                                                       t += i - 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;
+                                               }
+                                               break;
+                                       case 'd': /* date */
+                                               memset(&tm, 0, sizeof(struct tm));
+                                               gettimeofday(&tv, NULL);
+                                               if (localtime_r(&(tv.tv_sec), &tm)) {
+                                                       strftime(p, sizeof(prompt) - strlen(prompt), "%Y-%m-%d", &tm);
+                                               }
+                                               break;
+                                       case 'h': /* hostname */
+                                               if (!gethostname(hostname, sizeof(hostname) - 1)) {
+                                                       strncat(p, hostname, sizeof(prompt) - strlen(prompt));
+                                               } else {
+                                                       strncat(p, "localhost", sizeof(prompt) - strlen(prompt));
+                                               }
+                                               break;
+                                       case 'H': /* short hostname */
+                                               if (!gethostname(hostname, sizeof(hostname) - 1)) {
+                                                       for (i=0;i<sizeof(hostname);i++) {
+                                                               if (hostname[i] == '.') {
+                                                                       hostname[i] = '\0';
+                                                                       break;
+                                                               }
+                                                       }
+                                                       strncat(p, hostname, sizeof(prompt) - strlen(prompt));
+                                               } else {
+                                                       strncat(p, "localhost", sizeof(prompt) - strlen(prompt));
+                                               }
+                                               break;
+#ifdef linux
+                                       case 'l': /* load avg */
+                                               t++;
+                                               if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
+                                                       float avg1, avg2, avg3;
+                                                       int actproc, totproc, npid, which;
+                                                       fscanf(LOADAVG, "%f %f %f %d/%d %d",
+                                                               &avg1, &avg2, &avg3, &actproc, &totproc, &npid);
+                                                       if (sscanf(t, "%d", &which) == 1) {
+                                                               switch (which) {
+                                                                       case 1:
+                                                                               snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg1);
+                                                                               break;
+                                                                       case 2:
+                                                                               snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg2);
+                                                                               break;
+                                                                       case 3:
+                                                                               snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg3);
+                                                                               break;
+                                                                       case 4:
+                                                                               snprintf(p, sizeof(prompt) - strlen(prompt), "%d/%d", actproc, totproc);
+                                                                               break;
+                                                                       case 5:
+                                                                               snprintf(p, sizeof(prompt) - strlen(prompt), "%d", npid);
+                                                                               break;
+                                                               }
+                                                       }
+                                               }
+                                               break;
+#endif
+                                       case 't': /* time */
+                                               memset(&tm, 0, sizeof(struct tm));
+                                               gettimeofday(&tv, NULL);
+                                               if (localtime_r(&(tv.tv_sec), &tm)) {
+                                                       strftime(p, sizeof(prompt) - strlen(prompt), "%H:%M:%S", &tm);
+                                               }
+                                               break;
+                                       case '#': /* process console or remote? */
+                                               if (! option_remote) {
+                                                       strncat(p, "#", sizeof(prompt) - strlen(prompt));
+                                               } else {
+                                                       strncat(p, ">", sizeof(prompt) - strlen(prompt));
+                                               }
+                                               break;
+                                       case '%': /* literal % */
+                                               strncat(p, "%", sizeof(prompt) - strlen(prompt));
+                                               break;
+                                       case '\0': /* % is last character - prevent bug */
+                                               t--;
+                                               break;
+                               }
+                               while (*p != '\0') {
+                                       p++;
+                               }
+                               t++;
+                       } else {
+                               *p = *t;
+                               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)) {
+                               strncat(prompt + sizeof(prompt) - strlen(term_code) - 1, term_code, strlen(term_code));
+                       } else {
+                               strncat(p, term_code, sizeof(term_code));
+                       }
+               }
+       } else if (remotehostname)
+               snprintf(prompt, sizeof(prompt), ASTERISK_PROMPT2, remotehostname);
        else
-               return NULL;
+               snprintf(prompt, sizeof(prompt), ASTERISK_PROMPT);
+
+       return(prompt); 
+}
+
+static char **ast_el_strtoarr(char *buf)
+{
+       char **match_list = NULL, *retstr;
+        size_t match_list_len;
+       int matches = 0;
+
+        match_list_len = 1;
+       while ( (retstr = strsep(&buf, " ")) != NULL) {
+
+               if (!strcmp(retstr, AST_CLI_COMPLETE_EOF))
+                       break;
+                if (matches + 1 >= match_list_len) {
+                        match_list_len <<= 1;
+                        match_list = realloc(match_list, match_list_len * sizeof(char *));
+               }
+
+               match_list[matches++] = strdup(retstr);
+       }
+
+        if (!match_list)
+                return (char **) NULL;
+
+       if (matches>= match_list_len)
+               match_list = realloc(match_list, (match_list_len + 1) * sizeof(char *));
+
+       match_list[matches] = (char *) NULL;
+
+       return match_list;
+}
+
+static int ast_el_sort_compare(const void *i1, const void *i2)
+{
+       char *s1, *s2;
+
+       s1 = ((char **)i1)[0];
+       s2 = ((char **)i2)[0];
+
+       return strcasecmp(s1, s2);
+}
+
+static int ast_cli_display_match_list(char **matches, int len, int max)
+{
+       int i, idx, limit, count;
+       int screenwidth = 0;
+       int numoutput = 0, numoutputline = 0;
+
+       screenwidth = ast_get_termcols(STDOUT_FILENO);
+
+       /* find out how many entries can be put on one line, with two spaces between strings */
+       limit = screenwidth / (max + 2);
+       if (limit == 0)
+               limit = 1;
+
+       /* how many lines of output */
+       count = len / limit;
+       if (count * limit < len)
+               count++;
+
+       idx = 1;
+
+       qsort(&matches[0], (size_t)(len + 1), sizeof(char *), ast_el_sort_compare);
+
+       for (; count > 0; count--) {
+               numoutputline = 0;
+               for (i=0; i < limit && matches[idx]; i++, idx++) {
+
+                       /* Don't print dupes */
+                       if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) {
+                               i--;
+                               continue;
+                       }
+
+                       numoutput++;  numoutputline++;
+                       fprintf(stdout, "%-*s  ", max, matches[idx]);
+               }
+               if (numoutputline > 0)
+                       fprintf(stdout, "\n");
+       }
+
+       return numoutput;
+}
+
+
+static char *cli_complete(EditLine *el, int ch)
+{
+       int len=0;
+       char *ptr;
+       int nummatches = 0;
+       char **matches;
+       int retval = CC_ERROR;
+       char buf[2048];
+       int res;
+
+       LineInfo *lf = (LineInfo *)el_line(el);
+
+       *(char *)lf->cursor = '\0';
+       ptr = (char *)lf->cursor;
+       if (ptr) {
+               while (ptr > lf->buffer) {
+                       if (isspace(*ptr)) {
+                               ptr++;
+                               break;
+                       }
+                       ptr--;
+               }
+       }
+
+       len = lf->cursor - ptr;
+
+       if (option_remote) {
+               snprintf(buf, sizeof(buf),"_COMMAND NUMMATCHES \"%s\" \"%s\"", lf->buffer, ptr); 
+               fdprint(ast_consock, buf);
+               res = read(ast_consock, buf, sizeof(buf));
+               buf[res] = '\0';
+               nummatches = atoi(buf);
+
+               if (nummatches > 0) {
+                       char *mbuf;
+                       int mlen = 0, maxmbuf = 2048;
+                       /* Start with a 2048 byte buffer */
+                       mbuf = malloc(maxmbuf);
+                       if (!mbuf)
+                               return (char *)(CC_ERROR);
+                       snprintf(buf, sizeof(buf),"_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr); 
+                       fdprint(ast_consock, buf);
+                       res = 0;
+                       mbuf[0] = '\0';
+                       while (!strstr(mbuf, AST_CLI_COMPLETE_EOF) && res != -1) {
+                               if (mlen + 1024 > maxmbuf) {
+                                       /* Every step increment buffer 1024 bytes */
+                                       maxmbuf += 1024;
+                                       mbuf = realloc(mbuf, maxmbuf);
+                                       if (!mbuf)
+                                               return (char *)(CC_ERROR);
+                               }
+                               /* Only read 1024 bytes at a time */
+                               res = read(ast_consock, mbuf + mlen, 1024);
+                               if (res > 0)
+                                       mlen += res;
+                       }
+                       mbuf[mlen] = '\0';
+
+                       matches = ast_el_strtoarr(mbuf);
+                       free(mbuf);
+               } else
+                       matches = (char **) NULL;
+
+
+       }  else {
+
+               nummatches = ast_cli_generatornummatches((char *)lf->buffer,ptr);
+               matches = ast_cli_completion_matches((char *)lf->buffer,ptr);
+       }
+
+       if (matches) {
+               int i;
+               int matches_num, maxlen, match_len;
+
+               if (matches[0][0] != '\0') {
+                       el_deletestr(el, (int) len);
+                       el_insertstr(el, matches[0]);
+                       retval = CC_REFRESH;
+               }
+
+               if (nummatches == 1) {
+                       /* Found an exact match */
+                       el_insertstr(el, " ");
+                       retval = CC_REFRESH;
+               } else {
+                       /* Must be more than one match */
+                       for (i=1, maxlen=0; matches[i]; i++) {
+                               match_len = strlen(matches[i]);
+                               if (match_len > maxlen)
+                                       maxlen = match_len;
+                       }
+                       matches_num = i - 1;
+                       if (matches_num >1) {
+                               fprintf(stdout, "\n");
+                               ast_cli_display_match_list(matches, nummatches, maxlen);
+                               retval = CC_REDISPLAY;
+                       } else { 
+                               el_insertstr(el," ");
+                               retval = CC_REFRESH;
+                       }
+               }
+       free(matches);
+       }
+
+       return (char *)retval;
+}
+
+static int ast_el_initialize(void)
+{
+       HistEvent ev;
+
+       if (el != NULL)
+               el_end(el);
+       if (el_hist != NULL)
+               history_end(el_hist);
+
+       el = el_init("asterisk", stdin, stdout, stderr);
+       el_set(el, EL_PROMPT, cli_prompt);
+
+       el_set(el, EL_EDITMODE, 1);             
+       el_set(el, EL_EDITOR, "emacs");         
+       el_hist = history_init();
+       if (!el || !el_hist)
+               return -1;
+
+       /* setup history with 100 entries */
+       history(el_hist, &ev, H_SETSIZE, 100);
+
+       el_set(el, EL_HIST, history, el_hist);
+
+       el_set(el, EL_ADDFN, "ed-complete", "Complete argument", cli_complete);
+       /* Bind <tab> to command completion */
+       el_set(el, EL_BIND, "^I", "ed-complete", NULL);
+       /* Bind ? to command completion */
+       el_set(el, EL_BIND, "?", "ed-complete", NULL);
+       /* Bind ^D to redisplay */
+       el_set(el, EL_BIND, "^D", "ed-redisplay", NULL);
+
+       return 0;
+}
+
+static int ast_el_add_history(char *buf)
+{
+       HistEvent ev;
+
+       if (el_hist == NULL || el == NULL)
+               ast_el_initialize();
+       if (strlen(buf) > 256)
+               return 0;
+       return (history(el_hist, &ev, H_ENTER, buf));
+}
+
+static int ast_el_write_history(char *filename)
+{
+       HistEvent ev;
+
+       if (el_hist == NULL || el == NULL)
+               ast_el_initialize();
+
+       return (history(el_hist, &ev, H_SAVE, filename));
+}
+
+static int ast_el_read_history(char *filename)
+{
+       char buf[256];
+       FILE *f;
+       int ret = -1;
+
+       if (el_hist == NULL || el == NULL)
+               ast_el_initialize();
+
+       if ((f = fopen(filename, "r")) == NULL)
+               return ret;
+
+       while (!feof(f)) {
+               fgets(buf, sizeof(buf), f);
+               if (!strcmp(buf, "_HiStOrY_V2_\n"))
+                       continue;
+               if ((ret = ast_el_add_history(buf)) == -1)
+                       break;
+       }
+       fclose(f);
+
+       return ret;
 }
 
 static void ast_remotecontrol(char * data)
 {
        char buf[80];
        int res;
-       int max;
-       int lastpos = 0;
-       fd_set rfds;
        char filename[80] = "";
        char *hostname;
        char *cpid;
        char *version;
        int pid;
-       int lastclear=0;
-       int oldstatus=0;
        char tmp[80];
+       char *stringp=NULL;
+
+       char *ebuf;
+       int num = 0;
+
        read(ast_consock, buf, sizeof(buf));
-       if (data) {
-                       write(ast_consock, data, strlen(data) + 1);
-                       return;
-       }
-       hostname = strtok(buf, "/");
-       cpid = strtok(NULL, "/");
-       version = strtok(NULL, "/");
+       if (data)
+               write(ast_consock, data, strlen(data) + 1);
+       stringp=buf;
+       hostname = strsep(&stringp, "/");
+       cpid = strsep(&stringp, "/");
+       version = strsep(&stringp, "\n");
        if (!version)
                version = "<Version Unknown>";
-       strtok(hostname, ".");
+       stringp=hostname;
+       strsep(&stringp, ".");
        if (cpid)
                pid = atoi(cpid);
        else
@@ -635,74 +1326,46 @@ static void ast_remotecontrol(char * data)
        snprintf(tmp, sizeof(tmp), "set verbose atleast %d", option_verbose);
        fdprint(ast_consock, tmp);
        ast_verbose("Connected to Asterisk %s currently running on %s (pid = %d)\n", version, hostname, pid);
-       snprintf(tmp, sizeof(tmp), ASTERISK_PROMPT2, hostname);
+       remotehostname = hostname;
        if (getenv("HOME")) 
                snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
+       if (el_hist == NULL || el == NULL)
+               ast_el_initialize();
+
+       el_set(el, EL_GETCFN, ast_el_read_char);
+
        if (strlen(filename))
-               read_history(filename);
+               ast_el_read_history(filename);
+
        ast_cli_register(&quit);
+       ast_cli_register(&astexit);
 #if 0
        ast_cli_register(&astshutdown);
 #endif 
-       rl_callback_handler_install(tmp, remoteconsolehandler);
-       rl_completion_entry_function = (void *)(Function *)console_cli_generator;
+       if (option_exec && data) {  /* hack to print output then exit if asterisk -rx is used */
+               char tempchar;
+               ast_el_read_char(el, &tempchar);
+               return;
+       }
        for(;;) {
-               FD_ZERO(&rfds);
-               FD_SET(ast_consock, &rfds);
-               FD_SET(STDIN_FILENO, &rfds);
-               max = ast_consock;
-               if (STDIN_FILENO > max)
-                       max = STDIN_FILENO;
-               res = select(max + 1, &rfds, NULL, NULL, NULL);
-               if (res < 0) {
-                       if (errno == EINTR)
-                               continue;
-                       ast_log(LOG_ERROR, "select failed: %s\n", strerror(errno));
-                       break;
-               }
-               if (FD_ISSET(STDIN_FILENO, &rfds)) {
-                       rl_callback_read_char();
-                       if (strlen(cmd)) {
-                               res = write(ast_consock, cmd, strlen(cmd) + 1);
+               ebuf = (char *)el_gets(el, &num);
+
+               if (ebuf && strlen(ebuf)) {
+                       if (ebuf[strlen(ebuf)-1] == '\n')
+                               ebuf[strlen(ebuf)-1] = '\0';
+                       if (!remoteconsolehandler(ebuf)) {
+                               res = write(ast_consock, ebuf, strlen(ebuf) + 1);
                                if (res < 1) {
                                        ast_log(LOG_WARNING, "Unable to write: %s\n", strerror(errno));
                                        break;
                                }
-                               strcpy(cmd, "");
-                       }
-               }
-               if (FD_ISSET(ast_consock, &rfds)) {
-                       res = read(ast_consock, buf, sizeof(buf));
-                       if (res < 1)
-                               break;
-                       buf[res] = 0;
-                       /* If someone asks for a pass code, hide the password */
-                       if (!memcmp(buf, ">>>>", 4)) {
-                               printf("Ooh, i should hide password!\n");
-                               if (!lastclear) {
-                                       oldstatus = ast_hide_password(STDIN_FILENO);
-                                       printf("Oldstatus = %d\n", oldstatus);
-                               }
-                               lastclear = 1;
-                       } else if (lastclear) {
-                               ast_restore_tty(STDIN_FILENO, oldstatus);
-                               lastclear = 0;
-                       }
-                       if (!lastpos)
-                               write(STDOUT_FILENO, "\r", 2);
-                       write(STDOUT_FILENO, buf, res);
-                       if ((buf[res-1] == '\n') || (buf[res-2] == '\n')) {
-                               rl_forced_update_display();
-                               lastpos = 0;
-                       } else {
-                               lastpos = 1;
                        }
                }
        }
        printf("\nDisconnected from Asterisk server\n");
 }
 
-int show_cli_help(void) {
+static int show_cli_help(void) {
        printf("Asterisk " ASTERISK_VERSION ", Copyright (C) 2000-2002, Digium.\n");
        printf("Usage: asterisk [OPTIONS]\n");
        printf("Valid Options:\n");
@@ -713,6 +1376,7 @@ int show_cli_help(void) {
        printf("   -p           Run as pseudo-realtime thread\n");
        printf("   -v           Increase verbosity (multiple v's = more verbose)\n");
        printf("   -q           Quiet mode (supress output)\n");
+       printf("   -g           Dump core in case of a crash\n");
        printf("   -x <cmd>     Execute command <cmd> (only valid with -r)\n");
        printf("   -i           Initializie crypto keys at startup\n");
        printf("   -c           Provide console CLI\n");
@@ -721,11 +1385,62 @@ int show_cli_help(void) {
        return 0;
 }
 
+static void ast_readconfig(void) {
+       struct ast_config *cfg;
+       struct ast_variable *v;
+       char *config = ASTCONFPATH;
+
+       if (option_overrideconfig == 1) {
+           cfg = ast_load((char *)ast_config_AST_CONFIG_FILE);
+       } else {
+           cfg = ast_load(config);
+       }
+
+       /* init with buildtime config */
+       strncpy((char *)ast_config_AST_CONFIG_DIR,AST_CONFIG_DIR,sizeof(ast_config_AST_CONFIG_DIR)-1);
+       strncpy((char *)ast_config_AST_SPOOL_DIR,AST_SPOOL_DIR,sizeof(ast_config_AST_SPOOL_DIR)-1);
+       strncpy((char *)ast_config_AST_MODULE_DIR,AST_MODULE_DIR,sizeof(ast_config_AST_VAR_DIR)-1);
+       strncpy((char *)ast_config_AST_VAR_DIR,AST_VAR_DIR,sizeof(ast_config_AST_VAR_DIR)-1);
+       strncpy((char *)ast_config_AST_LOG_DIR,AST_LOG_DIR,sizeof(ast_config_AST_LOG_DIR)-1);
+       strncpy((char *)ast_config_AST_AGI_DIR,AST_AGI_DIR,sizeof(ast_config_AST_AGI_DIR)-1);
+       strncpy((char *)ast_config_AST_DB,AST_DB,sizeof(ast_config_AST_DB)-1);
+       strncpy((char *)ast_config_AST_KEY_DIR,AST_KEY_DIR,sizeof(ast_config_AST_KEY_DIR)-1);
+       strncpy((char *)ast_config_AST_PID,AST_PID,sizeof(ast_config_AST_PID)-1);
+       strncpy((char *)ast_config_AST_SOCKET,AST_SOCKET,sizeof(ast_config_AST_SOCKET)-1);
+       strncpy((char *)ast_config_AST_RUN_DIR,AST_RUN_DIR,sizeof(ast_config_AST_RUN_DIR)-1);
+       
+       /* no asterisk.conf? no problem, use buildtime config! */
+       if (!cfg) {
+           return;
+       }
+       v = ast_variable_browse(cfg, "directories");
+       while(v) {
+               if (!strcasecmp(v->name, "astetcdir")) {
+                   strncpy((char *)ast_config_AST_CONFIG_DIR,v->value,sizeof(ast_config_AST_CONFIG_DIR)-1);
+               } else if (!strcasecmp(v->name, "astspooldir")) {
+                   strncpy((char *)ast_config_AST_SPOOL_DIR,v->value,sizeof(ast_config_AST_SPOOL_DIR)-1);
+               } else if (!strcasecmp(v->name, "astvarlibdir")) {
+                   strncpy((char *)ast_config_AST_VAR_DIR,v->value,sizeof(ast_config_AST_VAR_DIR)-1);
+                   snprintf((char *)ast_config_AST_DB,sizeof(ast_config_AST_DB)-1,"%s/%s",v->value,"astdb");    
+               } else if (!strcasecmp(v->name, "astlogdir")) {
+                   strncpy((char *)ast_config_AST_LOG_DIR,v->value,sizeof(ast_config_AST_LOG_DIR)-1);
+               } else if (!strcasecmp(v->name, "astagidir")) {
+                   strncpy((char *)ast_config_AST_AGI_DIR,v->value,sizeof(ast_config_AST_AGI_DIR)-1);
+               } else if (!strcasecmp(v->name, "astrundir")) {
+                   snprintf((char *)ast_config_AST_PID,sizeof(ast_config_AST_PID)-1,"%s/%s",v->value,"asterisk.pid");    
+                   snprintf((char *)ast_config_AST_SOCKET,sizeof(ast_config_AST_SOCKET)-1,"%s/%s",v->value,"asterisk.ctl");    
+                   strncpy((char *)ast_config_AST_RUN_DIR,v->value,sizeof(ast_config_AST_RUN_DIR)-1);
+               } else if (!strcasecmp(v->name, "astmoddir")) {
+                   strncpy((char *)ast_config_AST_MODULE_DIR,v->value,sizeof(ast_config_AST_MODULE_DIR)-1);
+               }
+               v = v->next;
+       }
+       ast_destroy(cfg);
+}
+
 int main(int argc, char *argv[])
 {
-       char c;
-       fd_set rfds;
-       int res;
+       int c;
        char filename[80] = "";
        char hostname[256];
        char tmp[80];
@@ -733,6 +1448,8 @@ int main(int argc, char *argv[])
        int x;
        FILE *f;
        sigset_t sigs;
+       int num;
+       char *buf;
 
        /* Remember original args for restart */
        if (argc > sizeof(_argv) / sizeof(_argv[0]) - 1) {
@@ -743,9 +1460,14 @@ int main(int argc, char *argv[])
                _argv[x] = argv[x];
        _argv[x] = NULL;
 
+       /* if the progname is rasterisk consider it a remote console */
+       if ( argv[0] && (strstr(argv[0], "rasterisk")) != NULL)  {
+               option_remote++;
+               option_nofork++;
+       }
        if (gethostname(hostname, sizeof(hostname)))
                strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
-       mainpid = getpid();
+       ast_mainpid = getpid();
        ast_ulaw_init();
        ast_alaw_init();
        callerid_init();
@@ -753,12 +1475,14 @@ int main(int argc, char *argv[])
        if (getenv("HOME")) 
                snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
        /* Check if we're root */
+       /*
        if (geteuid()) {
                ast_log(LOG_ERROR, "Must be run as root\n");
                exit(1);
        }
+       */
        /* Check for options */
-       while((c=getopt(argc, argv, "hfdvqprcinx:")) != EOF) {
+       while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != -1) {
                switch(c) {
                case 'd':
                        option_debug++;
@@ -792,9 +1516,16 @@ int main(int argc, char *argv[])
                        option_exec++;
                        xarg = optarg;
                        break;
+               case 'C':
+                       strncpy((char *)ast_config_AST_CONFIG_FILE,optarg,sizeof(ast_config_AST_CONFIG_FILE));
+                       option_overrideconfig++;
+                       break;
                case 'i':
                        option_initcrypto++;
                        break;
+               case'g':
+                       option_dumpcore++;
+                       break;
                case 'h':
                        show_cli_help();
                        exit(0);
@@ -803,10 +1534,31 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (option_dumpcore) {
+               struct rlimit l;
+               memset(&l, 0, sizeof(l));
+               l.rlim_cur = RLIM_INFINITY;
+               l.rlim_max = RLIM_INFINITY;
+               if (setrlimit(RLIMIT_CORE, &l)) {
+                       ast_log(LOG_WARNING, "Unable to disable core size resource limit: %s\n", strerror(errno));
+               }
+       }
+
        term_init();
        printf(term_end());
        fflush(stdout);
-       
+       if (option_console && !option_verbose) 
+               ast_verbose("[ Reading Master Configuration ]");
+       ast_readconfig();
+
+       if (option_console) {
+                if (el_hist == NULL || el == NULL)
+                        ast_el_initialize();
+
+                if (strlen(filename))
+                        ast_el_read_history(filename);
+       }
+
        if (ast_tryconnect()) {
                /* One is already running */
                if (option_remote) {
@@ -817,14 +1569,14 @@ int main(int argc, char *argv[])
                        }
                        printf(term_quit());
                        ast_register_verbose(console_verboser);
-                       ast_verbose( "Asterisk " ASTERISK_VERSION ", Copyright (C) 1999-2001 Linux Support Services, Inc.\n");
-                       ast_verbose( "Written by Mark Spencer <markster@linux-support.net>\n");
+                       ast_verbose( "Asterisk " ASTERISK_VERSION ", Copyright (C) 1999-2004 Digium.\n");
+                       ast_verbose( "Written by Mark Spencer <markster@digium.com>\n");
                        ast_verbose( "=========================================================================\n");
                        ast_remotecontrol(NULL);
                        quit_handler(0, 0, 0, 0);
                        exit(0);
                } else {
-                       ast_log(LOG_ERROR, "Asterisk already running on %s.  Use 'asterisk -r' to connect.\n", AST_SOCKET);
+                       ast_log(LOG_ERROR, "Asterisk already running on %s.  Use 'asterisk -r' to connect.\n", (char *)ast_config_AST_SOCKET);
                        printf(term_quit());
                        exit(1);
                }
@@ -834,27 +1586,24 @@ int main(int argc, char *argv[])
                exit(1);
        }
        /* Blindly write pid file since we couldn't connect */
-       unlink(AST_PID);
-       f = fopen(AST_PID, "w");
+       unlink((char *)ast_config_AST_PID);
+       f = fopen((char *)ast_config_AST_PID, "w");
        if (f) {
                fprintf(f, "%d\n", getpid());
                fclose(f);
        } else
-               ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", AST_PID, strerror(errno));
+               ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno));
 
        if (!option_verbose && !option_debug && !option_nofork && !option_console) {
-#if 1
                daemon(0,0);
-#else  
-               pid = fork();
-               if (pid < 0) {
-                       ast_log(LOG_ERROR, "Unable to fork(): %s\n", strerror(errno));
-                       printf(term_quit());
-                       exit(1);
-               }
-               if (pid) 
-                       exit(0);
-#endif                 
+               /* Blindly re-write pid file since we are forking */
+               unlink((char *)ast_config_AST_PID);
+               f = fopen((char *)ast_config_AST_PID, "w");
+               if (f) {
+                       fprintf(f, "%d\n", getpid());
+                       fclose(f);
+               } else
+                       ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno));
        }
 
        ast_makesocket();
@@ -875,11 +1624,14 @@ int main(int argc, char *argv[])
        }
        if (option_console && !option_verbose) 
                ast_verbose("[ Booting...");
+
        signal(SIGURG, urg_handler);
        signal(SIGINT, __quit_handler);
        signal(SIGTERM, __quit_handler);
        signal(SIGHUP, hup_handler);
-       signal(SIGPIPE, pipe_handler);
+       signal(SIGCHLD, child_handler);
+       signal(SIGPIPE, SIG_IGN);
+
        if (set_priority(option_highpriority)) {
                printf(term_quit());
                exit(1);
@@ -892,6 +1644,7 @@ int main(int argc, char *argv[])
                printf(term_quit());
                exit(1);
        }
+       ast_rtp_init();
        if (ast_image_init()) {
                printf(term_quit());
                exit(1);
@@ -908,51 +1661,195 @@ int main(int argc, char *argv[])
                printf(term_quit());
                exit(1);
        }
+       if (astdb_init()) {
+               printf(term_quit());
+               exit(1);
+       }
+       if (ast_enum_init()) {
+               printf(term_quit());
+               exit(1);
+       }
        /* We might have the option of showing a console, but for now just
           do nothing... */
        if (option_console && !option_verbose)
                ast_verbose(" ]\n");
        if (option_verbose || option_console)
                ast_verbose(term_color(tmp, "Asterisk Ready.\n", COLOR_BRWHITE, COLOR_BLACK, sizeof(tmp)));
+       if (option_nofork)
+               consolethread = pthread_self();
        fully_booted = 1;
        pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
+#ifdef __AST_DEBUG_MALLOC
+       __ast_mm_init();
+#endif 
+       time(&ast_startuptime);
        ast_cli_register(&astshutdownnow);
        ast_cli_register(&astshutdowngracefully);
        ast_cli_register(&astrestartnow);
        ast_cli_register(&astrestartgracefully);
        ast_cli_register(&astrestartwhenconvenient);
+       ast_cli_register(&astshutdownwhenconvenient);
        ast_cli_register(&aborthalt);
+       ast_cli_register(&astbang);
        if (option_console) {
                /* Console stuff now... */
                /* Register our quit function */
                char title[256];
                set_icon("Asterisk");
-               snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %d)", hostname, mainpid);
+               snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %d)", hostname, ast_mainpid);
                set_title(title);
            ast_cli_register(&quit);
-               consolethread = pthread_self();
-               if (strlen(filename))
-                       read_history(filename);
-               term_prompt(tmp, ASTERISK_PROMPT, sizeof(tmp));
-               rl_callback_handler_install(tmp, consolehandler);
-               rl_completion_entry_function = (void *)(Function *)cli_generator;
-               for(;;) {
-                       FD_ZERO(&rfds);
-                       FD_SET(STDIN_FILENO, &rfds);
-                       res = select(STDIN_FILENO + 1, &rfds, NULL, NULL, NULL);
-                       if (res > 0) {
-                               printf(term_prep());
-                               rl_callback_read_char();
-                               printf(term_end());
-                               fflush(stdout);
-                       } else if (res < 1) {
-                               rl_forced_update_display();
+           ast_cli_register(&astexit);
+
+               for (;;) {
+                       buf = (char *)el_gets(el, &num);
+                       if (buf) {
+                               if (buf[strlen(buf)-1] == '\n')
+                                       buf[strlen(buf)-1] = '\0';
+
+                               consolehandler((char *)buf);
+                       } else {
+                               if (option_remote)
+                                       ast_cli(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n");
                        }
-       
-               }       
+               }
+
        } else {
                /* Do nothing */
-               select(0,NULL,NULL,NULL,NULL);
+               for(;;) 
+                       poll(NULL,0, -1);
        }
        return 0;
 }
+
+
+#if  defined(__FreeBSD__)
+
+/* duh? ERANGE value copied from web... */
+#define ERANGE 34
+#undef gethostbyname
+
+int gethostbyname_r (const char *name,
+                    struct hostent *ret,
+                    char *buf,
+                    size_t buflen,
+                    struct hostent **result,
+                    int *h_errnop);
+
+int gethostbyname_r (const char *name,
+                    struct hostent *ret,
+                    char *buf,
+                    size_t buflen,
+                    struct hostent **result,
+                    int *h_errnop) {
+
+  int hsave;
+  struct hostent *ph;
+  static ast_mutex_t __mutex = AST_MUTEX_INITIALIZER;
+  ast_mutex_lock(&__mutex); /* begin critical area */
+  hsave = h_errno;
+
+  ph = gethostbyname(name);
+  *h_errnop = h_errno; /* copy h_errno to *h_herrnop */
+  if (ph == NULL) {
+    *result = NULL;
+  } else {
+    char **p, **q;
+    char *pbuf;
+    int nbytes=0;
+    int naddr=0, naliases=0;
+    /* determine if we have enough space in buf */
+
+    /* count how many addresses */
+    for (p = ph->h_addr_list; *p != 0; p++) {
+      nbytes += ph->h_length; /* addresses */
+      nbytes += sizeof(*p); /* pointers */
+      naddr++;
+    }
+    nbytes += sizeof(*p); /* one more for the terminating NULL */
+
+    /* count how many aliases, and total length of strings */
+
+    for (p = ph->h_aliases; *p != 0; p++) {
+      nbytes += (strlen(*p)+1); /* aliases */
+      nbytes += sizeof(*p);  /* pointers */
+      naliases++;
+    }
+    nbytes += sizeof(*p); /* one more for the terminating NULL */
+
+    /* here nbytes is the number of bytes required in buffer */
+    /* as a terminator must be there, the minimum value is ph->h_length */
+    if(nbytes > buflen) {
+      *result = NULL;
+      pthread_mutex_unlock(&__mutex); /* end critical area */
+      return ERANGE; /* not enough space in buf!! */
+    }
+
+    /* There is enough space. Now we need to do a deep copy! */
+    /* Allocation in buffer:
+       from [0] to [(naddr-1) * sizeof(*p)]:
+       pointers to addresses
+       at [naddr * sizeof(*p)]:
+       NULL
+       from [(naddr+1) * sizeof(*p)] to [(naddr+naliases) * sizeof(*p)] :
+       pointers to aliases
+       at [(naddr+naliases+1) * sizeof(*p)]:
+       NULL
+       then naddr addresses (fixed length), and naliases aliases (asciiz).
+    */
+
+    *ret = *ph;   /* copy whole structure (not its address!) */
+
+    /* copy addresses */
+    q = (char **)buf; /* pointer to pointers area (type: char **) */
+    ret->h_addr_list = q; /* update pointer to address list */
+    pbuf = buf + ((naddr+naliases+2)*sizeof(*p)); /* skip that area */
+    for (p = ph->h_addr_list; *p != 0; p++) {
+      memcpy(pbuf, *p, ph->h_length); /* copy address bytes */
+      *q++ = pbuf; /* the pointer is the one inside buf... */
+      pbuf += ph->h_length; /* advance pbuf */
+    }
+    *q++ = NULL; /* address list terminator */
+
+    /* copy aliases */
+
+    ret->h_aliases = q; /* update pointer to aliases list */
+    for (p = ph->h_aliases; *p != 0; p++) {
+      strcpy(pbuf, *p); /* copy alias strings */
+      *q++ = pbuf; /* the pointer is the one inside buf... */
+      pbuf += strlen(*p); /* advance pbuf */
+      *pbuf++ = 0; /* string terminator */
+    }
+    *q++ = NULL; /* terminator */
+
+    strcpy(pbuf, ph->h_name); /* copy alias strings */
+    ret->h_name = pbuf;
+    pbuf += strlen(ph->h_name); /* advance pbuf */
+    *pbuf++ = 0; /* string terminator */
+
+    *result = ret;  /* and let *result point to structure */
+
+  }
+  h_errno = hsave;  /* restore h_errno */
+
+  ast_mutex_unlock(&__mutex); /* end critical area */
+
+  return (*result != NULL);
+
+}
+
+
+#endif
+
+struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
+{
+       int res;
+       int herrno;
+       struct hostent *result = NULL;
+
+       res = gethostbyname_r(host, &hp->hp, hp->buf, sizeof(hp->buf), &result, &herrno);
+
+       if (res)
+               return NULL;
+       return &hp->hp;
+}