[svn-commits] rmudgett: trunk r324495 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Jun 22 14:17:56 2011
New Revision: 324495

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324495
Log:
Merged revisions 324491 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324491 | rmudgett | 2011-06-22 14:16:29 -0500 (Wed, 22 Jun 2011) | 1 line
  
  Use correct variable for text SRTP media.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.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=324495&r1=324494&r2=324495
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jun 22 14:17:56 2011
@@ -5475,7 +5475,7 @@
 			return -1;
 		}
 
-		if (p->trtp && !p->vsrtp && setup_srtp(&p->tsrtp) < 0) {
+		if (p->trtp && !p->tsrtp && setup_srtp(&p->tsrtp) < 0) {
 			ast_log(LOG_WARNING, "SRTP text setup failed\n");
 			return -1;
 		}