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 287056 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2010-09-15 22:28:29 +00:00
parent eee14db850
commit a51ce289b2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_srtp.c
View File

@@ -343,7 +343,8 @@ static int ast_srtp_unprotect(struct ast_srtp *srtp, void *buf, int *len, int rt
}
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 @@ static int ast_srtp_protect(struct ast_srtp *srtp, void **buf, int *len, int rtc
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;
}