diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-10-01 12:28:05 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-10-01 12:28:05 +0000 |
| commit | 4d2c7c23f8ccfe61c0b8bdc53802862d4d763fe4 (patch) | |
| tree | 09f716224b83a459aef8f20eb76a250b926973c6 /configs/samples | |
| parent | 122cc050d0f8473e5f662aee35555f1aef062566 (diff) | |
PJSIP: Handle defaults properly
This updates the code behind PJSIP configuration options with custom
handlers to deal with the assigned default values properly where it
makes sense and adjusting the default value where it doesn't. Before
applying this patch, there were several cases where the default value
for an option would prevent that config section from loading properly.
Reported by: Thomas Thompson
Review: https://reviewboard.asterisk.org/r/4019/
........
Merged revisions 424263 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 424266 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/samples')
| -rw-r--r-- | configs/samples/pjsip.conf.sample | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index 0377b71d4..7edff2d39 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -490,7 +490,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= ; Default privacy level (default: "") +;callerid_privacy=allowed ; Default privacy level (default: "allowed") ;callerid_tag= ; Internal id_tag for the endpoint (default: "") ;context=default ; Dialplan context for inbound sessions (default: ; "default") @@ -596,10 +596,10 @@ ; this endpoint (default: "") ;from_domain= ; Domain to user in From header for requests to this endpoint ; (default: "") -;dtls_verify= ; Verify that the provided peer certificate is valid (default: - ; "") -;dtls_rekey= ; Interval at which to renegotiate the TLS session and rekey - ; the SRTP session (default: "") +;dtls_verify=no ; Verify that the provided peer certificate is valid (default: + ; "no") +;dtls_rekey=0 ; Interval at which to renegotiate the TLS session and rekey + ; the SRTP session (default: "0") ;dtls_cert_file= ; Path to certificate file to present to peer (default: ; "") ;dtls_private_key= ; Path to private key for certificate file (default: |