From: Olle Johansson <oej@edvina.net>
Date: Tue, 13 Mar 2007 11:45:52 +0000 (+0000)
Subject: Issue #9229 - No port in request URI on register to non default SIP ports (neelakantan)
X-Git-Tag: 1.2.17~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7158b80498106e79ef5dcf8617a636aeef601478;p=thirdparty%2Fasterisk.git

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d2ae104724..8946bab589 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5643,10 +5643,17 @@ static int transmit_register(struct sip_registry *r, int sipmethod, char *auth,
 	
 	/* Fromdomain is what we are registering to, regardless of actual
 	   host name from SRV */
-	if (!ast_strlen_zero(p->fromdomain))
-		snprintf(addr, sizeof(addr), "sip:%s", p->fromdomain);
-	else
-		snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
+	if (!ast_strlen_zero(p->fromdomain)) {
+		if (r->portno && r->portno != DEFAULT_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 != DEFAULT_SIP_PORT)
+			snprintf(addr, sizeof(addr), "sip:%s:%d", r->hostname, r->portno);
+		else
+			snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
+	}
 	ast_copy_string(p->uri, addr, sizeof(p->uri));
 
 	p->branch ^= thread_safe_rand();