kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip.conf: privkey_file should be priv_key_file, mediaencryption=yes should be mediaencryption=sdes

Browse Source 
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
This commit is contained in:
Rusty Newton
2014-05-28 20:53:05 +00:00
parent 6107712857
commit 812f33d222
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configs/pjsip.conf.sample
View File

@@ -147,7 +147,7 @@
;protocol=tls ;protocol=tls
;bind=0.0.0.0 ;bind=0.0.0.0
;cert_file=/path/mycert.crt ;cert_file=/path/mycert.crt
;privkey_file=/path/mykey.key ;priv_key_file=/path/mykey.key
;cipher=ALL ;cipher=ALL
;method=tlsv1 ;method=tlsv1
@@ -282,7 +282,7 @@
; Use the "contact=" line instead of max_contacts= if you want to statically ; Use the "contact=" line instead of max_contacts= if you want to statically
; define the location of the device. ; 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. ; 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. ; 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. ; A few more transports to pick from, and some related options below them.
; ;
;transport=transport-tls ;transport=transport-tls
;media_encryption=yes ;media_encryption=sdes
;transport=transport-udp-ipv6 ;transport=transport-udp-ipv6
;rtp_ipv6=yes ;rtp_ipv6=yes
;transport=transport-udp-nat ;transport=transport-udp-nat