diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-10-03 13:58:37 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-10-03 13:58:37 +0000 |
| commit | ef2c567597554fa26f1afd70152090adf6065517 (patch) | |
| tree | 980623c4eff60c2bb1cc170e31f4c3f2ac8c4132 | |
| parent | 1cb36afce38432e97253be95c988a4fa7ec4f982 (diff) | |
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.
........
Merged revisions 424426 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@424427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | configs/samples/pjsip.conf.sample | 2 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index 8acd01a63..f5fd75e0d 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -491,7 +491,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") diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index c3fa43fae..510afd71b 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -1701,7 +1701,7 @@ int ast_res_pjsip_initialize_configuration(const struct ast_module_info *ast_mod 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)); |