[Asterisk-code-review] res_pjsip/pjsip_message_filter: set preferred transport in pjsip_mess... (asterisk[16])

[George Joseph]

George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/15630 )

Change subject: res_pjsip/pjsip_message_filter: set preferred transport in pjsip_message_filter
......................................................................

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
---
M res/res_pjsip/pjsip_message_filter.c
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit
  Bernd Zobl: Looks good to me, but someone else must approve



diff --git a/res/res_pjsip/pjsip_message_filter.c b/res/res_pjsip/pjsip_message_filter.c
index 1826ee2..2e3efcd 100644
--- a/res/res_pjsip/pjsip_message_filter.c
+++ b/res/res_pjsip/pjsip_message_filter.c
@@ -229,6 +229,7 @@
 	pjsip_cseq_hdr *cseq;
 	pjsip_via_hdr *via;
 	pjsip_fromto_hdr *from;
+	pjsip_tpselector sel;
 
 	sanitize_tdata(tdata);
 
@@ -238,6 +239,13 @@
 	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;

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15630
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I598e60257a7f92b29efce1fb3e9a2fc06f1439b6
Gerrit-Change-Number: 15630
Gerrit-PatchSet: 6
Gerrit-Owner: Florian Floimair <f.floimair at commend.com>
Gerrit-Reviewer: Bernd Zobl <b.zobl at commend.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210615/bd192a2a/attachment-0001.html>