From: Joshua C. Colp <jcolp@sangoma.com>
Date: Tue, 30 Mar 2021 11:59:14 +0000 (-0300)
Subject: res_pjsip: Give error when TLS transport configured but not supported.
X-Git-Tag: 19.0.0-rc1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=623abc2b6a81d49f5796e81de50f339b8c5f1931;p=thirdparty%2Fasterisk.git

res_pjsip: Give error when TLS transport configured but not supported.

Change-Id: I058af496021ff870ccec2d8cbade637b348ab80b
---

diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c
index 6e449c3d38..830b03832d 100644
--- a/res/res_pjsip/config_transport.c
+++ b/res/res_pjsip/config_transport.c
@@ -800,8 +800,8 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
 			res = pjsip_tcp_transport_start3(ast_sip_get_pjsip_endpoint(), &cfg,
 				&temp_state->state->factory);
 		}
-#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0
 	} else if (transport->type == AST_TRANSPORT_TLS) {
+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0
 		static int option = 1;
 
 		if (transport->async_operations > 1 && ast_compare_versions(pj_get_version(), "2.5.0") < 0) {
@@ -831,6 +831,10 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
 				&temp_state->state->host, NULL, transport->async_operations,
 				&temp_state->state->factory);
 		}
+#else
+		ast_log(LOG_ERROR, "Transport: %s: PJSIP has not been compiled with TLS transport support, ensure OpenSSL development packages are installed\n",
+			ast_sorcery_object_get_id(obj));
+		return -1;
 #endif
 	} else if ((transport->type == AST_TRANSPORT_WS) || (transport->type == AST_TRANSPORT_WSS)) {
 		if (transport->cos || transport->tos) {