kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 292309 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292309 | twilson | 2010-10-19 12:27:32 -0700 (Tue, 19 Oct 2010) | 10 lines
  
  Add sip show peer info about crypto and remove dated comment
  
  This patch adds information about the encryption setting to 'sip show
  peers' and removes an out-of-date comment from res_srtp.c and instead
  directs users to the proper documentation.
  
  (closes issue #18140)
  Reported by: chodorenko
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2010-10-19 19:35:24 +00:00
parent 14f4edcf75
commit 9653b5d500
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_srtp.c
View File

@@ -32,15 +32,7 @@
<depend>srtp</depend>
***/
/* The SIP channel will automatically use sdescriptions if received in a SDP offer,
and res_srtp is loaded. SRTP with sdescriptions key exchange can be activated
in outgoing offers by setting _SIPSRTP_CRYPTO=enable in extension.conf before executing Dial
The dial fails if the callee doesn't support SRTP and sdescriptions.
exten => 2345,1,Set(_SIPSRTP_CRYPTO=enable)
exten => 2345,2,Dial(SIP/1001)
*/
/* See doc/tex/secure-calls.tex for SRTP usage information */
#include "asterisk.h"