Author: mmichelson
Date: Thu Aug 21 16:28:16 2014
New Revision: 421791

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421791
Log:
Let's try checking the name and number, instead of the name twice.
........

Merged revisions 421789 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 421790 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=421791&r1=421790&r2=421791
==============================================================================
--- trunk/res/res_pjsip_caller_id.c (original)
+++ trunk/res/res_pjsip_caller_id.c Thu Aug 21 16:28:16 2014
@@ -468,7 +468,7 @@
        old_privacy = pjsip_msg_find_hdr_by_name(tdata->msg, &pj_privacy_name, 
NULL);
 
        if ((id->name.presentation & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED 
&&
-                       (id->name.presentation & AST_PRES_RESTRICTION) == 
AST_PRES_ALLOWED) {
+                       (id->number.presentation & AST_PRES_RESTRICTION) == 
AST_PRES_ALLOWED) {
                if (old_privacy) {
                        pj_list_erase(old_privacy);
                }


-- 
_____________________________________________________________________
-- 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

Reply via email to