From: Joshua Colp <jcolp@digium.com>
Date: Fri, 13 Nov 2009 22:01:24 +0000 (+0000)
Subject: Merged revisions 230145 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c370f146f81014acc38d44227a4c4e6b9a5faef;p=thirdparty%2Fasterisk.git

Merged revisions 230145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r230145 | file | 2009-11-13 16:00:44 -0600 (Fri, 13 Nov 2009) | 15 lines

  Merged revisions 230144 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r230144 | file | 2009-11-13 16:00:19 -0600 (Fri, 13 Nov 2009) | 8 lines

    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.6.1@230147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 54bc659b8f..7674243c93 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12866,7 +12866,7 @@ static attribute_unused void check_via_response(struct sip_pvt *p, struct sip_re
 static void check_via(struct sip_pvt *p, struct sip_request *req)
 {
 	char via[512];
-	char *c, *pt;
+	char *c, *pt, *maddr;
 	struct hostent *hp;
 	struct ast_hostent ahp;
 
@@ -12882,8 +12882,16 @@ static void check_via(struct sip_pvt *p, 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, ' ');
@@ -12897,6 +12905,9 @@ static void check_via(struct sip_pvt *p, 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);