kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Make message_filter and session multipart aware

Browse Source 
Neither pjsip_message_filter's filter_on_tx_message() nor
res_pjsip_session's session_outgoing_nat_hook() were multipart
aware and just assumed that an SDP would be the only thing in
a message body.  Both were changed to use the new
pjsip_get_sdp_info() function which searches for an sdp in
both single- and multi- part message bodies.

ASTERISK-29813

Change-Id: I8f5b8cfdc27f1d4bd3e7491ea9090951a4525c56
This commit is contained in:
George Joseph
2022-01-10 06:44:12 -07:00
parent 59cf9f0047
commit f55886a72c
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_pjsip/pjsip_message_filter.c
View File

@@ -231,6 +231,8 @@ static pj_status_t filter_on_tx_message(pjsip_tx_data *tdata)
pjsip_via_hdr *via;
pjsip_fromto_hdr *from;
pjsip_tpselector sel;
pjsip_sdp_info *sdp_info;
pjmedia_sdp_session *sdp;
sanitize_tdata(tdata);
@@ -326,10 +328,23 @@ static pj_status_t filter_on_tx_message(pjsip_tx_data *tdata)
}
}
/* Update the SDP if it is present */
if (tdata->msg->body && ast_sip_is_content_type(&tdata->msg->body->content_type, "application", "sdp") &&
multihomed_rewrite_sdp(tdata->msg->body->data)) {
struct pjmedia_sdp_session *sdp = tdata->msg->body->data;
/* If there's no body in the tdata we can just return here. */
if (!tdata->msg->body) {
return PJ_SUCCESS;
}
/*
* pjsip_get_sdp_info will search for an SDP even if it's in
* a multipart message body.
*/
sdp_info = pjsip_get_sdp_info(tdata->pool, tdata->msg->body, NULL, &pjsip_media_type_application_sdp);
if (sdp_info->sdp_err != PJ_SUCCESS || !sdp_info->sdp) {
return PJ_SUCCESS;
}
sdp = sdp_info->sdp;
if (multihomed_rewrite_sdp(sdp)) {
static const pj_str_t STR_IP4 = { "IP4", 3 };
static const pj_str_t STR_IP6 = { "IP6", 3 };
pj_str_t STR_IP;