Author: mmichelson Date: Thu Aug 21 16:19:06 2014 New Revision: 421785 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421785 Log: Improve consistency of party ID privacy usage.
Prior to this change, the Remote-Party-ID header took the position of "If caller name and number are not explicitly allowed, then they are private" and P-Asserted-Identity took the position of "Caller name and number are only private if marked explicitly so" Now both mechanisms of conveying party identification use the former approach. ........ Merged revisions 421778 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 421783 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/res/res_pjsip_caller_id.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/res/res_pjsip_caller_id.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_caller_id.c?view=diff&rev=421785&r1=421784&r2=421785 ============================================================================== --- trunk/res/res_pjsip_caller_id.c (original) +++ trunk/res/res_pjsip_caller_id.c Thu Aug 21 16:19:06 2014 @@ -467,17 +467,15 @@ old_privacy = pjsip_msg_find_hdr_by_name(tdata->msg, &pj_privacy_name, NULL); - if ((id->name.presentation & AST_PRES_RESTRICTION) == AST_PRES_RESTRICTED || - (id->name.presentation & AST_PRES_RESTRICTION) == AST_PRES_RESTRICTED) { - if (!old_privacy) { - pjsip_generic_string_hdr *privacy_hdr = pjsip_generic_string_hdr_create( - tdata->pool, &pj_privacy_name, &pj_privacy_value); - pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *)privacy_hdr); - } - } else { + if ((id->name.presentation & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED && + (id->name.presentation & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED) { if (old_privacy) { pj_list_erase(old_privacy); } + } else if (!old_privacy) { + pjsip_generic_string_hdr *privacy_hdr = pjsip_generic_string_hdr_create( + tdata->pool, &pj_privacy_name, &pj_privacy_value); + pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *)privacy_hdr); } } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
