diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-12 12:39:06 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-12 12:39:06 -0500 |
| commit | 06ccb8ce1edda1008ec694f9dc6638679ab6d13a (patch) | |
| tree | c45f38e2e474ea2b84f68a77325b1868149b92c0 | |
| parent | db108c6fa436b1e2796e5dbfbaed58e88f1b1b62 (diff) | |
| parent | 58c071e7cae64ce6d9e9c5e7c254ef16c67e6c08 (diff) | |
Merge "res_pjsip_session: Prevent user=phone being added to anonimized URIs." into 14
| -rw-r--r-- | res/res_pjsip_session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index f84d60e14..808477c0f 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -802,10 +802,9 @@ static void set_from_header(struct ast_sip_session *session) pj_strdup2(dlg_pool, &dlg_info_uri->host, session->endpoint->fromdomain); } - ast_sip_add_usereqphone(session->endpoint, dlg_pool, dlg_info->uri); - /* We need to save off the non-anonymized From for RPID/PAI generation (for domain) */ session->saved_from_hdr = pjsip_hdr_clone(dlg_pool, dlg_info); + ast_sip_add_usereqphone(session->endpoint, dlg_pool, session->saved_from_hdr->uri); /* In chan_sip, fromuser and fromdomain trump restricted so we only * anonymize if they're not set. @@ -821,7 +820,9 @@ static void set_from_header(struct ast_sip_session *session) if (ast_strlen_zero(session->endpoint->fromdomain)) { pj_strdup2(dlg_pool, &dlg_info_uri->host, "anonymous.invalid"); } - } + } else { + ast_sip_add_usereqphone(session->endpoint, dlg_pool, dlg_info->uri); + } } int ast_sip_session_refresh(struct ast_sip_session *session, |