Fix regression when using tcpenable=no and tlsenable=yes.

The tlsenable settings are tucked away in main/tcptls.c, so I missed
them when resolving ASTERISK-18837. This should resolve the test suite
breakage of the sip tls tests.

Review: https://reviewboard.asterisk.org/r/1615
Reviewed by: Matt Jordan

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 46994bf0e6b68f1c8e8a009e2d9c26fc26a1029b..71490a44fd1461609619fc4ccf8a75ffa5c4a347 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -27112,10 +27112,10 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
                                                peer->transports |= SIP_TRANSPORT_UDP;
                                        } else if (sip_cfg.tcp_enabled && !strncasecmp(trans, "tcp", 3)) {
                                                peer->transports |= SIP_TRANSPORT_TCP;
-                                       } else if (sip_cfg.tcp_enabled && !strncasecmp(trans, "tls", 3)) {
+                                       } else if (default_tls_cfg.enabled && !strncasecmp(trans, "tls", 3)) {
                                                peer->transports |= SIP_TRANSPORT_TLS;
-                                       } else if (!sip_cfg.tcp_enabled && (!strncasecmp(trans, "tcp", 3) || !strncasecmp(trans, "tls", 3))) {
-                                               ast_log(LOG_WARNING, "'%s' is not a valid transport type when tcpenabled=no. if no other is specified, the defaults from general will be used.\n", trans);
+                                       } else if (!strncasecmp(trans, "tcp", 3) || !strncasecmp(trans, "tls", 3)) {
+                                               ast_log(LOG_WARNING, "'%.3s' is not a valid transport type when %.3senabled=no. If no other is specified, the defaults from general will be used.\n", trans, trans);
                                        } else {
                                                ast_log(LOG_NOTICE, "'%s' is not a valid transport type. if no other is specified, the defaults from general will be used.\n", trans);
                                        }
@@ -28474,11 +28474,22 @@ static int reload_config(enum channelreloadreason reason)
                sip_cfg.allow_external_domains = 1;
        }
        /* If not or badly configured, set default transports */
-       if (!sip_cfg.tcp_enabled && ((default_transports & SIP_TRANSPORT_TCP) || (default_transports & SIP_TRANSPORT_TLS))) {
-               ast_log(LOG_WARNING, "Cannot use 'tcp' or 'tls' transport with tcpenable=no. Falling back to 'udp'.\n");
-               default_transports = default_primary_transport = SIP_TRANSPORT_UDP;
-       } else if (default_transports == 0) {
+       if (!sip_cfg.tcp_enabled && (default_transports & SIP_TRANSPORT_TCP)) {
+               ast_log(LOG_WARNING, "Cannot use 'tcp' transport with tcpenable=no. Removing from available transports.\n");
+               default_primary_transport &= ~SIP_TRANSPORT_TCP;
+               default_transports &= ~SIP_TRANSPORT_TCP;
+       }
+       if (!default_tls_cfg.enabled && (default_transports & SIP_TRANSPORT_TLS)) {
+               ast_log(LOG_WARNING, "Cannot use 'tls' transport with tlsenable=no. Removing from available transports.\n");
+               default_primary_transport &= ~SIP_TRANSPORT_TLS;
+               default_transports &= ~SIP_TRANSPORT_TLS;
+       }
+       if (!default_transports) {
+               ast_log(LOG_WARNING, "No valid transports available, falling back to 'udp'.\n");
                default_transports = default_primary_transport = SIP_TRANSPORT_UDP;
+       } else if (!default_primary_transport) {
+               ast_log(LOG_WARNING, "No valid default transport. Selecting 'udp' as default.\n");
+               default_primary_transport = SIP_TRANSPORT_UDP;
        }
 
        /* Build list of authentication to various SIP realms, i.e. service providers */