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

Merge "res_pjsip: Channel variable SIPFROMDOMAIN" into 16

Browse Source
This commit is contained in:
George Joseph
2019-08-21 18:42:06 -05:00
committed by Gerrit Code Review
parent ad63cb7cef fb984eda40
commit 23882ddb3e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_pjsip_session.c
View File

@@ -1458,6 +1458,7 @@ static void set_from_header(struct ast_sip_session *session)
pjsip_sip_uri *dlg_info_uri;
pjsip_sip_uri *dlg_contact_uri;
int restricted;
const char *pjsip_from_domain;
if (!session->channel || session->saved_from_hdr) {
return;
@@ -1501,6 +1502,17 @@ static void set_from_header(struct ast_sip_session *session)
pj_strdup2(dlg_pool, &dlg_info_uri->host, session->endpoint->fromdomain);
}
/*
* Channel variable for compatibility with chan_sip SIPFROMDOMAIN
*/
ast_channel_lock(session->channel);
pjsip_from_domain = pbx_builtin_getvar_helper(session->channel, "SIPFROMDOMAIN");
if (!ast_strlen_zero(pjsip_from_domain)) {
ast_debug(3, "From header domain reset by channel variable SIPFROMDOMAIN (%s)\n", pjsip_from_domain);
pj_strdup2(dlg_pool, &dlg_info_uri->host, pjsip_from_domain);
}
ast_channel_unlock(session->channel);
/* 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);