From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Wed, 5 Jul 2017 21:27:20 +0000 (-0500)
Subject: Merge "chan_sip: Only when different, add TCP|TLS in autodomain (SIP Domain Support... 
X-Git-Tag: 14.6.0-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae56efb727fb26e2f55c7d025fa1d0f5d7ebbc46;p=thirdparty%2Fasterisk.git

Merge "chan_sip: Only when different, add TCP|TLS in autodomain (SIP Domain Support)." into 14
---

ae56efb727fb26e2f55c7d025fa1d0f5d7ebbc46
diff --cc channels/chan_sip.c
index 118b5d5889,cd2f2aebfd..679cc3dfce
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@@ -33286,10 -33286,10 +33286,10 @@@ static int reload_config(enum channelre
  
  		/* If TLS is running on a different IP than UDP and TCP, then add that too */
  		if (!ast_sockaddr_isnull(&sip_tls_desc.local_address) &&
- 		    !ast_sockaddr_cmp(&bindaddr, &sip_tls_desc.local_address) &&
- 		    !ast_sockaddr_cmp(&sip_tcp_desc.local_address,
+ 		    ast_sockaddr_cmp_addr(&bindaddr, &sip_tls_desc.local_address) &&
+ 		    ast_sockaddr_cmp_addr(&sip_tcp_desc.local_address,
  				      &sip_tls_desc.local_address)) {
 -			add_sip_domain(ast_sockaddr_stringify_addr(&sip_tcp_desc.local_address),
 +			add_sip_domain(ast_sockaddr_stringify_addr(&sip_tls_desc.local_address),
  				       SIP_DOMAIN_AUTO, NULL);
  		}