[asterisk-commits] twilson: trunk r292310 - in /trunk: ./ channels/chan_sip.c res/res_srtp.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Oct 19 14:35:24 2010
New Revision: 292310

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292310
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c
    trunk/res/res_srtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=292310&r1=292309&r2=292310
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Oct 19 14:35:24 2010
@@ -16467,6 +16467,7 @@
 		ast_cli(fd, "  RTP Engine   : %s\n", peer->engine);
 		ast_cli(fd, "  Parkinglot   : %s\n", peer->parkinglot);
 		ast_cli(fd, "  Use Reason   : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_Q850_REASON)));
+		ast_cli(fd, "  Encryption   : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_USE_SRTP)));
 		ast_cli(fd, "\n");
 		peer = unref_peer(peer, "sip_show_peer: unref_peer: done with peer ptr");
 	} else  if (peer && type == 1) { /* manager listing */
@@ -16522,6 +16523,7 @@
 		astman_append(s, "SIP-Sess-Expires: %d\r\n", peer->stimer.st_max_se);
 		astman_append(s, "SIP-Sess-Min: %d\r\n", peer->stimer.st_min_se);
 		astman_append(s, "SIP-RTP-Engine: %s\r\n", peer->engine);
+		astman_append(s, "SIP-Encryption: %s\r\n", ast_test_flag(&peer->flags[1], SIP_PAGE2_USE_SRTP) ? "Y" : "N");
 
 		/* - is enumerated */
 		astman_append(s, "SIP-DTMFmode: %s\r\n", dtmfmode2str(ast_test_flag(&peer->flags[0], SIP_DTMF)));

Modified: trunk/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_srtp.c?view=diff&rev=292310&r1=292309&r2=292310
==============================================================================
--- trunk/res/res_srtp.c (original)
+++ trunk/res/res_srtp.c Tue Oct 19 14:35:24 2010
@@ -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"