Respect the maddr parameter in the Via header.

(closes issue #14446)
Reported by: frawd
Patches:
      via_maddr.patch uploaded by frawd (license 610)
Tested by: frawd


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@230144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-11-13 22:00:19 +00:00
parent 607defd94a
commit 4950fbeebc

View File

@@ -9932,7 +9932,7 @@ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq)
static void check_via(struct sip_pvt *p, const struct sip_request *req)
{
char via[512];
char *c, *pt;
char *c, *pt, *maddr;
struct hostent *hp;
struct ast_hostent ahp;
@@ -9948,8 +9948,16 @@ static void check_via(struct sip_pvt *p, const struct sip_request *req)
if (c && (c[6] != '=')) /* rport query, not answer */
ast_set_flag(&p->flags[1], SIP_PAGE2_RPORT_PRESENT);
/* Check for maddr */
maddr = strstr(via, "maddr=");
if (maddr) {
maddr += 6;
c = maddr + strspn(maddr, "0123456789.");
*c = '\0';
}
c = strchr(via, ';');
if (c)
if (c)
*c = '\0';
c = strchr(via, ' ');
@@ -9963,6 +9971,9 @@ static void check_via(struct sip_pvt *p, const struct sip_request *req)
pt = strchr(c, ':');
if (pt)
*pt++ = '\0'; /* remember port pointer */
/* Use maddr if found */
if (maddr)
c = maddr;
hp = ast_gethostbyname(c, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "'%s' is not a valid host\n", c);