From: Olle Johansson <oej@edvina.net>
Date: Wed, 14 Mar 2007 16:59:35 +0000 (+0000)
Subject: Merged revisions 58848 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3009
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9c3f60ab97878df1eccde5c6e5c12f4148f9033;p=thirdparty%2Fasterisk.git

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

................
r58848 | oej | 2007-03-13 12:49:35 +0100 (Tue, 13 Mar 2007) | 10 lines

Merged revisions 58847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r58847 | oej | 2007-03-13 12:45:52 +0100 (Tue, 13 Mar 2007) | 2 lines

Issue #9229 - No port in request URI on register to non default SIP ports (neelakantan)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index acbcfbbc01..6a2d449e80 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7838,7 +7838,17 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
 	
 	/* Fromdomain is what we are registering to, regardless of actual
 	   host name from SRV */
-	snprintf(addr, sizeof(addr), "sip:%s", S_OR(p->fromdomain, r->hostname));
+	if (!ast_strlen_zero(p->fromdomain)) {
+		if (r->portno && r->portno != STANDARD_SIP_PORT)
+			snprintf(addr, sizeof(addr), "sip:%s:%d", p->fromdomain, r->portno);
+		else
+			snprintf(addr, sizeof(addr), "sip:%s", p->fromdomain);
+	} else {
+		if (r->portno && r->portno != STANDARD_SIP_PORT)
+			snprintf(addr, sizeof(addr), "sip:%s:%d", r->hostname, r->portno);
+		else
+			snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
+	}
 	ast_string_field_set(p, uri, addr);
 
 	p->branch ^= ast_random();