]> 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:06:44 +0000 (16:06 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 5 Jul 2017 21:06:44 +0000 (16:06 -0500)
1  2 
channels/chan_sip.c

index e3b3c8439f8dc3b7cb7b327614a45a1674b34190,f24b74eab158c6a2cffae1952317d89ee37e484a..488fbf4184ced82c7e71c8bd0bb7434fe7d86bbf
@@@ -33178,10 -33178,10 +33178,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);
                }