Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "res_pjsip_caller_id: Fix crash on session timers UPDATE on inbound calls." into 14

Browse Source
changes/16/4216/1
Joshua Colp 9 years ago committed by Gerrit Code Review
parent eeeb27e4f9 82ef2bb69d
commit 67e5d618b0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File

14
res/res_pjsip_caller_id.c
Unescape View File

@ -523,8 +523,11 @@ static void add_pai_header(const struct ast_sip_session *session, pjsip_tx_data
}
}
base = tdata->msg->type == PJSIP_REQUEST_MSG ? session->saved_from_hdr :
PJSIP_MSG_TO_HDR(tdata->msg);
if (tdata->msg->type == PJSIP_REQUEST_MSG) {
base = session->saved_from_hdr ? session->saved_from_hdr : PJSIP_MSG_FROM_HDR(tdata->msg);
} else {
base = PJSIP_MSG_TO_HDR(tdata->msg);
}
pai_hdr = create_new_id_hdr(&pj_pai_name, base, tdata, id);
if (!pai_hdr) {
@ -629,8 +632,11 @@ static void add_rpid_header(const struct ast_sip_session *session, pjsip_tx_data
}
}
base = tdata->msg->type == PJSIP_REQUEST_MSG ? session->saved_from_hdr :
PJSIP_MSG_TO_HDR(tdata->msg);
if (tdata->msg->type == PJSIP_REQUEST_MSG) {
base = session->saved_from_hdr ? session->saved_from_hdr : PJSIP_MSG_FROM_HDR(tdata->msg);
} else {
base = PJSIP_MSG_TO_HDR(tdata->msg);
}
rpid_hdr = create_new_id_hdr(&pj_rpid_name, base, tdata, id);
if (!rpid_hdr) {

Write Preview
Loading…
Cancel
Save