From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Wed, 5 Jul 2017 21:37:39 +0000 (-0500)
Subject: Merge "chan_sip: Fix a typo for tlsbindaddr in autodomain (SIP Domain Support)."
X-Git-Tag: 15.0.0-beta1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75022f6b1178017858b847f2a13dc54d26574dbf;p=thirdparty%2Fasterisk.git

Merge "chan_sip: Fix a typo for tlsbindaddr in autodomain (SIP Domain Support)."
---

75022f6b1178017858b847f2a13dc54d26574dbf
diff --cc channels/chan_sip.c
index bdff0a998a,dff1482ccc..ea69363719
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@@ -33285,10 -33285,10 +33285,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);
  		}