From: Bernd Zobl <b.zobl@commend.com>
Date: Tue, 16 Mar 2021 16:45:23 +0000 (+0100)
Subject: res_pjsip/pjsip_message_filter: set preferred transport in pjsip_message_filter
X-Git-Tag: 18.5.0-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=804788037e0a7fc86ac8a25fbe1e406899b70243;p=thirdparty%2Fasterisk.git

res_pjsip/pjsip_message_filter: set preferred transport in pjsip_message_filter

Set preferred transport when querying the local address to use in
filter_on_tx_messages(). This prevents the module to erroneously select
the wrong transport if more than one transports of the same type (TCP or
TLS) are configured.

ASTERISK-29241

Change-Id: I598e60257a7f92b29efce1fb3e9a2fc06f1439b6
---

diff --git a/res/res_pjsip/pjsip_message_filter.c b/res/res_pjsip/pjsip_message_filter.c
index 7c91ba853d..23369dc8e7 100644
--- a/res/res_pjsip/pjsip_message_filter.c
+++ b/res/res_pjsip/pjsip_message_filter.c
@@ -230,6 +230,7 @@ static pj_status_t filter_on_tx_message(pjsip_tx_data *tdata)
 	pjsip_cseq_hdr *cseq;
 	pjsip_via_hdr *via;
 	pjsip_fromto_hdr *from;
+	pjsip_tpselector sel;
 
 	sanitize_tdata(tdata);
 
@@ -239,6 +240,13 @@ static pj_status_t filter_on_tx_message(pjsip_tx_data *tdata)
 	pj_strset2(&prm.dst_host, tdata->tp_info.dst_name);
 	prm.local_if = PJ_TRUE;
 
+	if ((tdata->tp_info.transport->key.type != PJSIP_TRANSPORT_UDP) &&
+		(tdata->tp_info.transport->key.type != PJSIP_TRANSPORT_UDP6)) {
+		sel.type = PJSIP_TPSELECTOR_LISTENER;
+		sel.u.listener = tdata->tp_info.transport->factory;
+		prm.tp_sel = &sel;
+	}
+
 	/* If we can't get the local address use best effort and let it pass */
 	if (pjsip_tpmgr_find_local_addr2(pjsip_endpt_get_tpmgr(ast_sip_get_pjsip_endpoint()), tdata->pool, &prm) != PJ_SUCCESS) {
 		return PJ_SUCCESS;