Merge slepp's sub-second expiration timer although hopefully it will never have to...
[asterisk/asterisk.git] / asterisk.c
index f419ac5..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/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 "asterisk.h"
 #include <asterisk/config.h>
 
+#if  defined(__FreeBSD__)
+#include <netdb.h>
+#endif
+
 #define AST_MAX_CONNECTS 128
 #define NUM_MSGS 64
 
@@ -65,7 +71,7 @@ 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 */
@@ -106,6 +112,11 @@ 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;
@@ -148,13 +159,70 @@ static int fdprint(int fd, const char *s)
        return write(fd, s, strlen(s) + 1);
 }
 
-static void network_verboser(const 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;
@@ -165,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 = ast_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;
@@ -192,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);
@@ -216,28 +282,30 @@ static void *netconsole(void *vconsole)
 static void *listener(void *unused)
 {
        struct sockaddr_un sun;
-       fd_set fds;
        int s;
        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;
-               FD_ZERO(&fds);
-               FD_SET(ast_socket, &fds);
-               s = ast_select(ast_socket + 1, &fds, NULL, NULL, NULL);
+               fds[0].fd = ast_socket;
+               fds[0].events= POLLIN;
+               s = poll(fds, 1, -1);
                if (s < 0) {
-                       ast_log(LOG_WARNING, "Select retured error: %s\n", strerror(errno));
+                       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) {
@@ -331,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;
 }
@@ -342,12 +411,16 @@ 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 child_handler(int sig)
 {
+       /* Must not ever ast_log or ast_verbose within signal handler */
        int n, status;
 
        /*
@@ -356,7 +429,7 @@ static void child_handler(int sig)
        for (n = 0; wait4(-1, &status, WNOHANG, NULL) > 0; n++)
                ;
        if (n == 0 && option_debug)     
-               ast_log(LOG_DEBUG, "Huh?  Child handler, but nobody there?\n");
+               printf("Huh?  Child handler, but nobody there?\n");
 }
 
 static void set_title(char *text)
@@ -412,10 +485,6 @@ static int set_priority(int pri)
        return 0;
 }
 
-static char *_argv[256];
-
-static int shuttingdown = 0;
-
 static void ast_run_atexits(void)
 {
        struct ast_atexit *ae;
@@ -512,7 +581,16 @@ 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);
+               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);
 }
@@ -522,8 +600,6 @@ static void __quit_handler(int num)
        quit_handler(num, 0, 1, 0);
 }
 
-static pthread_t consolethread = (pthread_t) -1;
-
 static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp)
 {
        const char *c;
@@ -554,8 +630,8 @@ static void console_verboser(const char *s, int pos, int replace, int complete)
                fputs(s + pos,stdout);
        fflush(stdout);
        if (complete)
-       /* Wake up a select()ing console */
-               if (consolethread != (pthread_t) -1)
+       /* Wake up a poll()ing console */
+               if (option_console && consolethread != AST_PTHREADT_NULL)
                        pthread_kill(consolethread, SIGURG);
 }
 
@@ -568,15 +644,14 @@ static void consolehandler(char *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");
 }
@@ -589,17 +664,14 @@ static int remoteconsolehandler(char *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");
                        ret = 1;
                }
-               if (strncasecmp(s, "help", 4) == 0 && (s[4] == '\0' || isspace(s[4]))) {
-                       fprintf(stdout, "          !<command>   Executes a given shell command\n");
-                       ret = 0;
-               }
                if ((strncasecmp(s, "quit", 4) == 0 || strncasecmp(s, "exit", 4) == 0) &&
                    (s[4] == '\0' || isspace(s[4]))) {
                        quit_handler(0, 0, 0, 0);
@@ -647,6 +719,10 @@ 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[])
 {
@@ -723,6 +799,11 @@ 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> "
@@ -732,47 +813,48 @@ static struct ast_cli_entry aborthalt = { { "abort", "halt", NULL }, handle_abor
 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 =   { { "stop", "now", NULL }, handle_shutdown_now, "Shut down Asterisk imediately", shutdown_now_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 int ast_el_read_char(EditLine *el, char *cp)
 {
-        int num_read=0;
+    int num_read=0;
        int lastpos=0;
-       fd_set rfds;
+       struct pollfd fds[2];
        int res;
        int max;
        char buf[512];
 
        for (;;) {
-               FD_ZERO(&rfds);
-               FD_SET(ast_consock, &rfds);
-               max = ast_consock;
+               max = 1;
+               fds[0].fd = ast_consock;
+               fds[0].events = POLLIN;
                if (!option_exec) {
-                       FD_SET(STDIN_FILENO, &rfds);
-                       if (STDIN_FILENO > max)
-                               max = STDIN_FILENO;
+                       fds[1].fd = STDIN_FILENO;
+                       fds[1].events = POLLIN;
+                       max++;
                }
-               res = ast_select(max+1, &rfds, NULL, NULL, NULL);
+               res = poll(fds, max, -1);
                if (res < 0) {
                        if (errno == EINTR)
                                continue;
-                       ast_log(LOG_ERROR, "select failed: %s\n", strerror(errno));
+                       ast_log(LOG_ERROR, "poll failed: %s\n", strerror(errno));
                        break;
                }
 
-               if (FD_ISSET(STDIN_FILENO, &rfds)) {
+               if (!option_exec && fds[1].revents) {
                        num_read = read(STDIN_FILENO, cp, 1);
                        if (num_read < 1) {
                                break;
                        } else 
                                return (num_read);
                }
-               if (FD_ISSET(ast_consock, &rfds)) {
+               if (fds[0].revents) {
                        res = read(ast_consock, buf, sizeof(buf) - 1);
                        /* if the remote side disappears exit */
                        if (res < 1) {
@@ -800,9 +882,140 @@ static int ast_el_read_char(EditLine *el, char *cp)
 
 static char *cli_prompt(EditLine *el)
 {
-       static char prompt[80];
-
-       if (remotehostname)
+       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
                snprintf(prompt, sizeof(prompt), ASTERISK_PROMPT);
@@ -819,12 +1032,14 @@ static char **ast_el_strtoarr(char *buf)
         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++] = retstr;
+               match_list[matches++] = strdup(retstr);
        }
 
         if (!match_list)
@@ -898,7 +1113,7 @@ static char *cli_complete(EditLine *el, int ch)
        int nummatches = 0;
        char **matches;
        int retval = CC_ERROR;
-       char buf[1024];
+       char buf[2048];
        int res;
 
        LineInfo *lf = (LineInfo *)el_line(el);
@@ -925,12 +1140,33 @@ static char *cli_complete(EditLine *el, int ch)
                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 = read(ast_consock, buf, sizeof(buf));
-                       buf[res] = '\0';
+                       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(buf);
+                       matches = ast_el_strtoarr(mbuf);
+                       free(mbuf);
                } else
                        matches = (char **) NULL;
 
@@ -1006,6 +1242,8 @@ static int ast_el_initialize(void)
        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;
 }
@@ -1016,7 +1254,8 @@ static int ast_el_add_history(char *buf)
 
        if (el_hist == NULL || el == NULL)
                ast_el_initialize();
-
+       if (strlen(buf) > 256)
+               return 0;
        return (history(el_hist, &ev, H_ENTER, buf));
 }
 
@@ -1201,7 +1440,7 @@ static void ast_readconfig(void) {
 
 int main(int argc, char *argv[])
 {
-       char c;
+       int c;
        char filename[80] = "";
        char hostname[256];
        char tmp[80];
@@ -1221,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();
@@ -1238,7 +1482,7 @@ int main(int argc, char *argv[])
        }
        */
        /* Check for options */
-       while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != EOF) {
+       while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != -1) {
                switch(c) {
                case 'd':
                        option_debug++;
@@ -1325,8 +1569,8 @@ 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);
@@ -1431,6 +1675,8 @@ int main(int argc, char *argv[])
                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
@@ -1444,16 +1690,16 @@ int main(int argc, char *argv[])
        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);
            ast_cli_register(&astexit);
-               consolethread = pthread_self();
 
                for (;;) {
                        buf = (char *)el_gets(el, &num);
@@ -1465,14 +1711,145 @@ int main(int argc, char *argv[])
                        } else {
                                if (option_remote)
                                        ast_cli(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n");
-                               else
-                                       ast_cli(STDOUT_FILENO, "\nUse STOP NOW to shutdown Asterisk\n");
                        }
                }
 
        } else {
                /* Do nothing */
-               ast_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;
+}