[svn-commits] twilson: trunk r287057 - in /trunk: ./ res/res_srtp.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed Sep 15 17:28:29 2010
New Revision: 287057

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

........
  r287056 | twilson | 2010-09-15 17:17:17 -0500 (Wed, 15 Sep 2010) | 10 lines
  
  Don't hang up a call on an SRTP unprotect failure
  
  Also make it more obvious when there is an issue en/decrypting.
  
  (closes issue #17563)
  Reported by: Alexcr
  Patches: 
        res_srtp.c.patch uploaded by sfritsch (license 1089)
  Tested by: twilson
........

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

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

Modified: trunk/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_srtp.c?view=diff&rev=287057&r1=287056&r2=287057
==============================================================================
--- trunk/res/res_srtp.c (original)
+++ trunk/res/res_srtp.c Wed Sep 15 17:28:29 2010
@@ -343,7 +343,8 @@
 	}
 
 	if (res != err_status_ok && res != err_status_replay_fail ) {
-		ast_debug(1, "SRTP unprotect: %s\n", srtp_errstr(res));
+		ast_log(LOG_WARNING, "SRTP unprotect: %s\n", srtp_errstr(res));
+		errno = EAGAIN;
 		return -1;
 	}
 
@@ -361,7 +362,7 @@
 	memcpy(srtp->buf, *buf, *len);
 
 	if ((res = rtcp ? srtp_protect_rtcp(srtp->session, srtp->buf, len) : srtp_protect(srtp->session, srtp->buf, len)) != err_status_ok && res != err_status_replay_fail) {
-		ast_debug(1, "SRTP protect: %s\n", srtp_errstr(res));
+		ast_log(LOG_WARNING, "SRTP protect: %s\n", srtp_errstr(res));
 		return -1;
 	}