]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "chan_sip: Only when different, add TCP|TLS in autodomain (SIP Domain Support...
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 5 Jul 2017 21:27:20 +0000 (16:27 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 5 Jul 2017 21:27:20 +0000 (16:27 -0500)
1  2 
channels/chan_sip.c

index 118b5d5889db771be4ba904f16716f22280a3d86,cd2f2aebfd431853debc3f244c9aedcc25874fd4..679cc3dfcedc87aa5f159a38dfbf1a2f760398d5
@@@ -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);
                }