diff options
| author | Terry Wilson <twilson@digium.com> | 2010-10-19 19:35:24 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-10-19 19:35:24 +0000 |
| commit | 9653b5d500c12bb5a60b4ad244706c15d20523f2 (patch) | |
| tree | 0037d4734f95f1a9e566102307370bd44a506297 /res | |
| parent | 14f4edcf750b1d48210b0c5b3af6552708903bc2 (diff) | |
Merged revisions 292309 via svnmerge from
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
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_srtp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/res/res_srtp.c b/res/res_srtp.c index 808444ca0..3a330dba1 100644 --- a/res/res_srtp.c +++ b/res/res_srtp.c @@ -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" |