diff options
| author | Rusty Newton <rnewton@digium.com> | 2014-05-28 20:53:05 +0000 |
|---|---|---|
| committer | Rusty Newton <rnewton@digium.com> | 2014-05-28 20:53:05 +0000 |
| commit | 812f33d22218817f32ce856969e8196475f6d5fd (patch) | |
| tree | a3d57140f14e1fc2c53f917fdb1d29b3c8123666 | |
| parent | 6107712857bbfe60fe7dc8b6883e3839e4d74b2a (diff) | |
pjsip.conf: privkey_file should be priv_key_file, mediaencryption=yes should be mediaencryption=sdes
privkey_file was missed in the snake case update. An example included an invalid value for the mediaencryption option.
........
Merged revisions 414780 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@414781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | configs/pjsip.conf.sample | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/pjsip.conf.sample b/configs/pjsip.conf.sample index 704c97826..1bcfcb96b 100644 --- a/configs/pjsip.conf.sample +++ b/configs/pjsip.conf.sample @@ -147,7 +147,7 @@ ;protocol=tls ;bind=0.0.0.0 ;cert_file=/path/mycert.crt -;privkey_file=/path/mykey.key +;priv_key_file=/path/mykey.key ;cipher=ALL ;method=tlsv1 @@ -282,7 +282,7 @@ ; Use the "contact=" line instead of max_contacts= if you want to statically ; define the location of the device. ; -; If using the TLS enabled transport, you may want the "media_encryption=yes" +; If using the TLS enabled transport, you may want the "media_encryption=sdes" ; option to additionally enable SRTP, though they are not mutually inclusive. ; ; Use the "rtp_ipv6=yes" option if you want to utilize RTP over an ipv6 transport. @@ -304,7 +304,7 @@ ; A few more transports to pick from, and some related options below them. ; ;transport=transport-tls -;media_encryption=yes +;media_encryption=sdes ;transport=transport-udp-ipv6 ;rtp_ipv6=yes ;transport=transport-udp-nat |