Author: kmoore
Date: Fri Oct 3 08:57:24 2014
New Revision: 424426
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424426
Log:
PJSIP: Restore functional default for callerid_privacy
The pjsip config option default fixups from r424263 altered the
functional default from "allowed_not_screened" to "allowed". This
change restores the functional default value when none is provided.
Modified:
branches/12/configs/pjsip.conf.sample
branches/12/res/res_pjsip/pjsip_configuration.c
Modified: branches/12/configs/pjsip.conf.sample
URL:
http://svnview.digium.com/svn/asterisk/branches/12/configs/pjsip.conf.sample?view=diff&rev=424426&r1=424425&r2=424426
==============================================================================
--- branches/12/configs/pjsip.conf.sample (original)
+++ branches/12/configs/pjsip.conf.sample Fri Oct 3 08:57:24 2014
@@ -443,7 +443,7 @@
;aors= ; AoR s to be used with the endpoint (default: "")
;auth= ; Authentication Object s associated with the endpoint (default: "")
;callerid= ; CallerID information for the endpoint (default: "")
-;callerid_privacy=allowed ; Default privacy level (default: "allowed")
+;callerid_privacy=allowed_not_screened ; Default privacy level (default:
"allowed_not_screened")
;callerid_tag= ; Internal id_tag for the endpoint (default: "")
;context=default ; Dialplan context for inbound sessions (default:
; "default")
Modified: branches/12/res/res_pjsip/pjsip_configuration.c
URL:
http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip/pjsip_configuration.c?view=diff&rev=424426&r1=424425&r2=424426
==============================================================================
--- branches/12/res/res_pjsip/pjsip_configuration.c (original)
+++ branches/12/res/res_pjsip/pjsip_configuration.c Fri Oct 3 08:57:24 2014
@@ -1706,7 +1706,7 @@
ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint",
"direct_media_glare_mitigation", "none", direct_media_glare_mitigation_handler,
direct_media_glare_mitigation_to_str, NULL, 0, 0);
ast_sorcery_object_field_register(sip_sorcery, "endpoint",
"disable_direct_media_on_nat", "no", OPT_BOOL_T, 1, FLDSET(struct
ast_sip_endpoint, media.direct_media.disable_on_nat));
ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint",
"callerid", "", caller_id_handler, caller_id_to_str, NULL, 0, 0);
- ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint",
"callerid_privacy", "allowed", caller_id_privacy_handler,
caller_id_privacy_to_str, NULL, 0, 0);
+ ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint",
"callerid_privacy", "allowed_not_screened", caller_id_privacy_handler,
caller_id_privacy_to_str, NULL, 0, 0);
ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint",
"callerid_tag", "", caller_id_tag_handler, caller_id_tag_to_str, NULL, 0, 0);
ast_sorcery_object_field_register(sip_sorcery, "endpoint",
"trust_id_inbound", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint,
id.trust_inbound));
ast_sorcery_object_field_register(sip_sorcery, "endpoint",
"trust_id_outbound", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint,
id.trust_outbound));
--
_____________________________________________________________________
-- 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
