ensure that calls to gethostbyname are null terminated,

also use MAXHOSTNAMELEN where appropriate (bug #4198) (bug #4212)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5675 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/acl.c b/acl.c
index 5fa8b7c8b57afadd5034a3ff80b8b23d84fc85f5..6e4ffc44a6e732ec113aa969391efe36efc04f1b 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -381,7 +381,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
 
 int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
 {
-       char ourhost[256];
+       char ourhost[MAXHOSTNAMELEN]="";
        struct ast_hostent ahp;
        struct hostent *hp;
        struct in_addr saddr;
@@ -392,7 +392,7 @@ int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
                return 0;
        }
        /* try to use our hostname */
-       if (gethostname(ourhost, sizeof(ourhost))) {
+       if (gethostname(ourhost, sizeof(ourhost)-1)) {
                ast_log(LOG_WARNING, "Unable to get hostname\n");
        } else {
                hp = ast_gethostbyname(ourhost, &ahp);

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 0f422d96bda1eb3d8917d8f975554e953f57d894..659f0fdc6b1cd4dcde068893270ffb8411e4a3fa 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -862,7 +862,7 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *m
        FILE *p=NULL;
        int pfd;
        char date[256];
-       char host[256];
+       char host[MAXHOSTNAMELEN] = "";
        char who[256];
        char bound[256];
        char fname[256];
@@ -890,7 +890,7 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *m
                }
        }
        if (p) {
-               gethostname(host, sizeof(host));
+               gethostname(host, sizeof(host)-1);
                if (strchr(srcemail, '@'))
                        strncpy(who, srcemail, sizeof(who)-1);
                else {
@@ -1020,7 +1020,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *mailbox, char
        FILE *p=NULL;
        int pfd;
        char date[256];
-       char host[256];
+       char host[MAXHOSTNAMELEN]="";
        char who[256];
        char dur[256];
        char tmp[80] = "/tmp/astmail-XXXXXX";
@@ -1039,7 +1039,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *mailbox, char
        }
 
        if (p) {
-               gethostname(host, sizeof(host));
+               gethostname(host, sizeof(host)-1);
                if (strchr(srcemail, '@'))
                        strncpy(who, srcemail, sizeof(who)-1);
                else {

diff --git a/asterisk.c b/asterisk.c
index 1bf800d4c8d94591a80ceb0cb4888c7685110aac..146f43a71110e503dfe1b1b243babac6e6105f49 100755 (executable)
--- a/asterisk.c
+++ b/asterisk.c
@@ -264,12 +264,12 @@ static pthread_t lthread;
 static void *netconsole(void *vconsole)
 {
        struct console *con = vconsole;
-       char hostname[256];
+       char hostname[MAXHOSTNAMELEN]="";
        char tmp[512];
        int res;
        struct pollfd fds[2];
        
-       if (gethostname(hostname, sizeof(hostname)))
+       if (gethostname(hostname, sizeof(hostname)-1))
                strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
        snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, ast_mainpid, ASTERISK_VERSION);
        fdprint(con->fd, tmp);
@@ -964,7 +964,7 @@ static char *cli_prompt(EditLine *el)
                memset(prompt, 0, sizeof(prompt));
                while (*t != '\0' && *p < sizeof(prompt)) {
                        if (*t == '%') {
-                               char hostname[256];
+                               char hostname[MAXHOSTNAMELEN]="";
                                int i;
                                struct timeval tv;
                                struct tm tm;
@@ -1572,7 +1572,7 @@ int main(int argc, char *argv[])
 {
        int c;
        char filename[80] = "";
-       char hostname[256];
+       char hostname[MAXHOSTNAMELEN]="";
        char tmp[80];
        char * xarg = NULL;
        int x;
@@ -1597,7 +1597,7 @@ int main(int argc, char *argv[])
                option_remote++;
                option_nofork++;
        }
-       if (gethostname(hostname, sizeof(hostname)))
+       if (gethostname(hostname, sizeof(hostname)-1))
                strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
        ast_mainpid = getpid();
        ast_ulaw_init();

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 0326a4a85ca9937bd65230c6c979475e2113dbfb..b87f311acb277961bff09fdc278ac3b36b645855 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -239,7 +239,7 @@ static int restart_monitor(void);
 static int capability = AST_FORMAT_ULAW;
 static int nonCodecCapability = AST_RTP_DTMF;
 
-static char ourhost[256];
+static char ourhost[MAXHOSTNAMELEN];
 static struct in_addr __ourip;
 static int ourport;
 
@@ -3944,7 +3944,7 @@ static int reload_config(void)
        struct ast_hostent ahp; struct hostent *hp;
        int format;
        
-       if (gethostname(ourhost, sizeof(ourhost))) {
+       if (gethostname(ourhost, sizeof(ourhost)-1)) {
                ast_log(LOG_WARNING, "Unable to get hostname, MGCP disabled\n");
                return 0;
        }

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 67f1e7f70981310cf1d01930425b27bf8378fe73..a62c2242f7d5d75b14a7162227b137f8d2fa0426 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -205,7 +205,7 @@ static int recordhistory = 0;
 static int global_promiscredir;
 
 static char global_musicclass[MAX_LANGUAGE] = "";      /* Global music on hold class */
-static char global_realm[AST_MAX_EXTENSION] = "asterisk";      /* Default realm */
+static char global_realm[MAXHOSTNAMELEN] = "asterisk";         /* Default realm */
 static char regcontext[AST_MAX_EXTENSION] = "";
 
 /* Expire slowly */
@@ -299,10 +299,10 @@ static struct sip_pvt {
        char from[256];                         /* The From: header */
        char useragent[256];                    /* User agent in SIP request */
        char context[AST_MAX_EXTENSION];        /* Context for this call */
-       char fromdomain[AST_MAX_EXTENSION];     /* Domain to show in the from field */
+       char fromdomain[MAXHOSTNAMELEN];        /* Domain to show in the from field */
        char fromuser[AST_MAX_EXTENSION];       /* User to show in the user field */
        char fromname[AST_MAX_EXTENSION];       /* Name to show in the user field */
-       char tohost[AST_MAX_EXTENSION];         /* Host we should put in the "to" field */
+       char tohost[MAXHOSTNAMELEN];            /* Host we should put in the "to" field */
        char language[MAX_LANGUAGE];            /* Default language for this call */
        char musicclass[MAX_LANGUAGE];          /* Music on Hold class */
        char rdnis[256];                        /* Referring DNIS */
@@ -316,14 +316,14 @@ static struct sip_pvt {
        char callerid[256];                     /* Caller*ID */
        int restrictcid;                        /* hide presentation from remote user */
        char via[256];
-       char fullcontact[128];          /* Extra parameters to go in the "To" header */
+       char fullcontact[128];                  /* Extra parameters to go in the "To" header */
        char accountcode[20];                   /* Account code */
        char our_contact[256];                  /* Our contact header */
-       char realm[256];                        /* Authorization realm */
+       char realm[MAXHOSTNAMELEN];             /* Authorization realm */
        char nonce[256];                        /* Authorization nonce */
        char opaque[256];                       /* Opaque nonsense */
        char qop[80];                           /* Quality of Protection, since SIP wasn't complicated enough yet. */
-       char domain[256];                       /* Authorization domain */
+       char domain[MAXHOSTNAMELEN];            /* Authorization domain */
        char lastmsg[256];                      /* Last Message sent/received */
        int amaflags;                           /* AMA Flags */
        int pendinginvite;                      /* Any pending invite */
@@ -385,7 +385,7 @@ struct sip_user {
        char name[80];
        char secret[80];
         char md5secret[80];
-       char context[80];
+       char context[AST_MAX_EXTENSION];
        char callerid[80];
        char accountcode[20];
        char language[MAX_LANGUAGE];
@@ -424,13 +424,13 @@ struct sip_peer {
        char name[80];
        char secret[80];
        char md5secret[80];
-       char context[80];               /* JK02: peers need context too to allow parking etc */
+       char context[AST_MAX_EXTENSION];        /* JK02: peers need context too to allow parking etc */
        char username[80];
-       char tohost[80];
+       char tohost[MAXHOSTNAMELEN];
        char regexten[AST_MAX_EXTENSION];       /* Extension to register (if regcontext is used) */
        char fromuser[80];
-       char fromdomain[80];
-       char fullcontact[128];
+       char fromdomain[MAXHOSTNAMELEN];
+       char fullcontact[256];
        char mailbox[AST_MAX_EXTENSION];
        char language[MAX_LANGUAGE];
        char musicclass[MAX_LANGUAGE];  /* Music on Hold class */
@@ -496,10 +496,10 @@ struct sip_registry {
        int portno;                             /* Optional port override */
        char username[80];              /* Who we are registering as */
        char authuser[80];              /* Who we *authenticate* as */
-       char hostname[80];
+       char hostname[MAXHOSTNAMELEN];
        char secret[80];                /* Password or key name in []'s */      
        char md5secret[80];
-       char contact[80];               /* Contact extension */
+       char contact[256];              /* Contact extension */
        char random[80];
        int expire;                     /* Sched ID of expiration */
        int timeout;                    /* sched id of sip_reg_timeout */
@@ -512,9 +512,9 @@ struct sip_registry {
        struct sockaddr_in us;          /* Who the server thinks we are */
        
                                        /* Saved headers */
-       char realm[256];                /* Authorization realm */
+       char realm[MAXHOSTNAMELEN];     /* Authorization realm */
        char nonce[256];                /* Authorization nonce */
-       char domain[256];               /* Authorization domain */
+       char domain[MAXHOSTNAMELEN];    /* Authorization domain */
        char opaque[256];               /* Opaque nonsense */
        char qop[80];                   /* Quality of Protection. */
  
@@ -1289,7 +1289,7 @@ static int create_addr(struct sip_pvt *r, char *opeer)
        char *port;
        char *callhost;
        int portno;
-       char host[256], *hostn;
+       char host[MAXHOSTNAMELEN], *hostn;
        char peer[256]="";
 
        strncpy(peer, opeer, sizeof(peer) - 1);
@@ -1378,7 +1378,7 @@ static int create_addr(struct sip_pvt *r, char *opeer)
                else
                        portno = DEFAULT_SIP_PORT;
                if (srvlookup) {
-                       char service[256];
+                       char service[MAXHOSTNAMELEN];
                        int tportno;
                        int ret;
                        snprintf(service, sizeof(service), "_sip._udp.%s", peer);

diff --git a/logger.c b/logger.c
index f32cab420beee49ffdd57fd3128f01809db34445..c8d504d74195a8c9aed18f34164ae2ac49c25220 100755 (executable)
--- a/logger.c
+++ b/logger.c
@@ -65,7 +65,7 @@ static struct msglist {
        struct msglist *next;
 } *list = NULL, *last = NULL;
 
-static char hostname[256];
+static char hostname[MAXHOSTNAMELEN];
 
 struct logchannel {
        int logmask;
@@ -230,7 +230,7 @@ static void init_logger_chain(void)
        ast_mutex_lock(&loglock);
        if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) {
                if(ast_true(s)) {
-                       if(gethostname(hostname, sizeof(hostname))) {
+                       if(gethostname(hostname, sizeof(hostname)-1)) {
                                strncpy(hostname, "unknown", sizeof(hostname)-1);
                                ast_log(LOG_WARNING, "What box has no hostname???\n");
                        }

diff --git a/res/res_features.c b/res/res_features.c
index f76af6454be35078b25348a219f16558b2fe03dc..753864d543933c04936b71142c05380d1e0fa948 100755 (executable)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -58,6 +58,9 @@ static int parkingtime = DEFAULT_PARK_TIME;
 /* Context for which parking is made accessible */
 static char parking_con[AST_MAX_EXTENSION] = "parkedcalls";
 
+/* Context for dialback for parking (KLUDGE) */
+static char parking_con_dial[AST_MAX_EXTENSION] = "park-dial";
+
 /* Extension you type to park the call */
 static char parking_ext[AST_MAX_EXTENSION] = "700";
 
@@ -112,6 +115,7 @@ struct parkeduser {
        int priority;
        int parkingtime;
        int notquiteyet;
+       char peername[1024];
        unsigned char moh_trys;
        struct parkeduser *next;
 };
@@ -190,6 +194,8 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
                                pu->parkingtime = parkingtime;
                        if (extout)
                                *extout = x;
+                       if (peer)
+                               strncpy(pu->peername, peer->name, sizeof(pu->peername) - 1);
                        /* Remember what had been dialed, so that if the parking
                           expires, we try to come back to the same place */
                        if (!ast_strlen_zero(chan->macrocontext))
@@ -560,19 +566,21 @@ static void *do_parking_thread(void *ignore)
        struct timeval tv;
        struct ast_frame *f;
        char exten[AST_MAX_EXTENSION];
+       char *peername,*cp;
+       char returnexten[AST_MAX_EXTENSION];
        struct ast_context *con;
        int x;
        fd_set rfds, efds;
        fd_set nrfds, nefds;
        FD_ZERO(&rfds);
        FD_ZERO(&efds);
+
        for (;;) {
                ms = -1;
                max = -1;
                ast_mutex_lock(&parking_lock);
                pl = NULL;
                pu = parkinglot;
-               gettimeofday(&tv, NULL);
                FD_ZERO(&nrfds);
                FD_ZERO(&nefds);
                while(pu) {
@@ -582,17 +590,42 @@ static void *do_parking_thread(void *ignore)
                                pu = pu->next;
                                continue;
                        }
+                       gettimeofday(&tv, NULL);
                        tms = (tv.tv_sec - pu->start.tv_sec) * 1000 + (tv.tv_usec - pu->start.tv_usec) / 1000;
                        if (tms > pu->parkingtime) {
-                               /* They've been waiting too long, send them back to where they came.  Theoretically they
-                                  should have their original extensions and such, but we copy to be on the safe side */
-                               strncpy(pu->chan->exten, pu->exten, sizeof(pu->chan->exten)-1);
-                               strncpy(pu->chan->context, pu->context, sizeof(pu->chan->context)-1);
-                               pu->chan->priority = pu->priority;
-                               if (option_verbose > 1) 
-                                       ast_verbose(VERBOSE_PREFIX_2 "Timeout for %s parked on %d. Returning to %s,%s,%d\n", pu->chan->name, pu->parkingnum, pu->chan->context, pu->chan->exten, pu->chan->priority);
                                /* Stop music on hold */
                                ast_moh_stop(pu->chan);
+                               /* Get chan, exten from derived kludge */
+                               if (pu->peername[0]) {
+                                       peername = ast_strdupa(pu->peername);
+                                       cp = strrchr(peername, '-');
+                                       if (cp) 
+                                               *cp = 0;
+                                       con = ast_context_find(parking_con_dial);
+                                       if (!con) {
+                                               con = ast_context_create(NULL, parking_con_dial, registrar);
+                                               if (!con) {
+                                                       ast_log(LOG_ERROR, "Parking dial context '%s' does not exist and unable to create\n", parking_con_dial);
+                                               }
+                                       }
+                                       if (con) {
+                                               snprintf(returnexten, sizeof(returnexten), "%s||t", peername);
+                                               ast_add_extension2(con, 1, peername, 1, NULL, "Dial", strdup(returnexten), free, registrar);
+                                       }
+                                       strncpy(pu->chan->exten, peername, sizeof(pu->chan->exten) - 1);
+                                       strncpy(pu->chan->context, parking_con_dial, sizeof(pu->chan->context) - 1);
+                                       pu->chan->priority = 1;
+
+                               } else {
+                                       /* They've been waiting too long, send them back to where they came.  Theoretically they
+                                          should have their original extensions and such, but we copy to be on the safe side */
+                                       strncpy(pu->chan->exten, pu->exten, sizeof(pu->chan->exten)-1);
+                                       strncpy(pu->chan->context, pu->context, sizeof(pu->chan->context)-1);
+                                       pu->chan->priority = pu->priority;
+                               }
+
+                               if (option_verbose > 1) 
+                                       ast_verbose(VERBOSE_PREFIX_2 "Timeout for %s parked on %d. Returning to %s,%s,%d\n", pu->chan->name, pu->parkingnum, pu->chan->context, pu->chan->exten, pu->chan->priority);
                                /* Start up the PBX, or hang them up */
                                if (ast_pbx_start(pu->chan))  {
                                        ast_log(LOG_WARNING, "Unable to restart the PBX for user on '%s', hanging them up...\n", pu->chan->name);
@@ -614,14 +647,17 @@ static void *do_parking_thread(void *ignore)
                                        ast_log(LOG_WARNING, "Whoa, no parking context?\n");
                                free(pt);
                        } else {
-                               for (x=0;x<AST_MAX_FDS;x++) {
+                               for (x=0; x<AST_MAX_FDS; x++) {
                                        if ((pu->chan->fds[x] > -1) && (FD_ISSET(pu->chan->fds[x], &rfds) || FD_ISSET(pu->chan->fds[x], &efds))) {
                                                if (FD_ISSET(pu->chan->fds[x], &efds))
                                                        pu->chan->exception = 1;
+                                               else
+                                                       pu->chan->exception = 0;        
                                                pu->chan->fdno = x;
                                                /* See if they need servicing */
                                                f = ast_read(pu->chan);
                                                if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass ==  AST_CONTROL_HANGUP))) {
+
                                                        /* There's a problem, hang them up*/
                                                        if (option_verbose > 1) 
                                                                ast_verbose(VERBOSE_PREFIX_2 "%s got tired of being parked\n", pu->chan->name);
@@ -646,7 +682,7 @@ static void *do_parking_thread(void *ignore)
                                                        /* XXX Maybe we could do something with packets, like dial "0" for operator or something XXX */
                                                        ast_frfree(f);
                                                        if (pu->moh_trys < 3 && !pu->chan->generatordata) {
-                                                               ast_log(LOG_DEBUG, "MOH on parked call stopped by outside source.  Restarting\n");
+                                                               ast_log(LOG_DEBUG, "MOH on parked call stopped by outside source.  Restarting.\n");
                                                                ast_moh_start(pu->chan, NULL);
                                                                pu->moh_trys++;
                                                        }
@@ -655,7 +691,7 @@ static void *do_parking_thread(void *ignore)
                                        }
                                }
                                if (x >= AST_MAX_FDS) {
-std:                                   for (x=0;x<AST_MAX_FDS;x++) {
+std:                                   for (x=0; x<AST_MAX_FDS; x++) {
                                                /* Keep this one for next one */
                                                if (pu->chan->fds[x] > -1) {
                                                        FD_SET(pu->chan->fds[x], &nrfds);