[svn-commits] file: branch 12 r402891 - /branches/12/res/res_pjsip_caller_id.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Nov 19 17:17:18 2013
New Revision: 402891

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402891
Log:
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.

Modified:
    branches/12/res/res_pjsip_caller_id.c

Modified: branches/12/res/res_pjsip_caller_id.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_caller_id.c?view=diff&rev=402891&r1=402890&r2=402891
==============================================================================
--- branches/12/res/res_pjsip_caller_id.c (original)
+++ branches/12/res/res_pjsip_caller_id.c Tue Nov 19 17:17:18 2013
@@ -648,6 +648,7 @@
 
 	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))) {