diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-01-09 07:23:10 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-09 07:23:10 -0600 |
| commit | bc5102adecb5acd5ed6aa86bd553efcb030f8202 (patch) | |
| tree | e8a86e990b777a8fd9b9afaa7369fca62fa64393 /res | |
| parent | fdfa805552ac8c85162fe40dd0da9a516ae93922 (diff) | |
| parent | a398f98b08f98538ec6c70b67f46a5a24fe4d001 (diff) | |
Merge "res_pjsip: Fix known compact header issues" into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip.c | 3 | ||||
| -rw-r--r-- | res/res_pjsip_diversion.c | 3 | ||||
| -rw-r--r-- | res/res_pjsip_refer.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index b1adf0e39..12c3baa0d 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -3244,8 +3244,9 @@ static int create_out_of_dialog_request(const pjsip_method *method, struct ast_s pjsip_contact_hdr *contact_hdr; pjsip_sip_uri *contact_uri; static const pj_str_t HCONTACT = { "Contact", 7 }; + static const pj_str_t HCONTACTSHORT = { "m", 1 }; - contact_hdr = pjsip_msg_find_hdr_by_name((*tdata)->msg, &HCONTACT, NULL); + contact_hdr = pjsip_msg_find_hdr_by_names((*tdata)->msg, &HCONTACT, &HCONTACTSHORT, NULL); if (contact_hdr) { contact_uri = pjsip_uri_get_uri(contact_hdr->uri); pj_strdup2(pool, &contact_uri->user, endpoint->contact_user); diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c index b9225de9c..a9ffdf493 100644 --- a/res/res_pjsip_diversion.c +++ b/res/res_pjsip_diversion.c @@ -277,6 +277,7 @@ static int diversion_incoming_request(struct ast_sip_session *session, pjsip_rx_ static void diversion_incoming_response(struct ast_sip_session *session, pjsip_rx_data *rdata) { static const pj_str_t contact_name = { "Contact", 7 }; + static const pj_str_t contact_name_s = { "m", 1 }; pjsip_status_line status = rdata->msg_info.msg->line.status; pjsip_fromto_hdr *div_hdr; @@ -292,7 +293,7 @@ static void diversion_incoming_response(struct ast_sip_session *session, pjsip_r div_hdr = PJSIP_MSG_TO_HDR(rdata->msg_info.msg); } - contact_hdr = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &contact_name, NULL); + contact_hdr = pjsip_msg_find_hdr_by_names(rdata->msg_info.msg, &contact_name, &contact_name_s, NULL); set_redirecting(session, div_hdr, contact_hdr ? (pjsip_name_addr*)contact_hdr->uri : (pjsip_name_addr*)PJSIP_MSG_FROM_HDR(rdata->msg_info.msg)->uri); diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c index 3101c361c..d52a922fd 100644 --- a/res/res_pjsip_refer.c +++ b/res/res_pjsip_refer.c @@ -573,6 +573,7 @@ static void refer_blind_callback(struct ast_channel *chan, struct transfer_chann pjsip_generic_string_hdr *referred_by; static const pj_str_t str_referred_by = { "Referred-By", 11 }; + static const pj_str_t str_referred_by_s = { "b", 1 }; pbx_builtin_setvar_helper(chan, "SIPTRANSFER", "yes"); @@ -651,8 +652,8 @@ static void refer_blind_callback(struct ast_channel *chan, struct transfer_chann pbx_builtin_setvar_helper(chan, "SIPREFERRINGCONTEXT", S_OR(refer->context, NULL)); - referred_by = pjsip_msg_find_hdr_by_name(refer->rdata->msg_info.msg, - &str_referred_by, NULL); + referred_by = pjsip_msg_find_hdr_by_names(refer->rdata->msg_info.msg, + &str_referred_by, &str_referred_by_s, NULL); if (referred_by) { size_t uri_size = pj_strlen(&referred_by->hvalue) + 1; char *uri = ast_alloca(uri_size); |