diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-11-19 23:17:57 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-11-19 23:17:57 +0000 |
| commit | 71612fb0077b3d22895342fdd12beae4862b53ca (patch) | |
| tree | 3091e262c8b9ad89bc7d4410b4fd1d5b4ddd2af0 /res | |
| parent | 1b14a78d14baf473f594e40a5278cf0e0a70e639 (diff) | |
res_pjsip_caller_id: Don't overwrite user portion of the From header when fromuser is set.
The fromuser option is used to explicitly set the user within the From header. The
res_pjsip_caller_id module did not take this setting into account when determining
if the From header could be modified or not.
(closes issue ASTERISK-22866)
Reported by: Anthony Messina
........
Merged revisions 402891 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_caller_id.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c index 645910dbf..1b25be28c 100644 --- a/res/res_pjsip_caller_id.c +++ b/res/res_pjsip_caller_id.c @@ -648,6 +648,7 @@ static void caller_id_outgoing_request(struct ast_sip_session *session, pjsip_tx connected_id = ast_channel_connected_effective_id(session->channel); if (session->inv_session->state < PJSIP_INV_STATE_CONFIRMED && + ast_strlen_zero(session->endpoint->fromuser) && (session->endpoint->id.trust_outbound || ((connected_id.name.presentation & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED && (connected_id.number.presentation & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED))) { |