[svn-commits] bbryant: trunk r318920 - in /trunk: ./ res/res_srtp.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri May 13 13:06:32 CDT 2011
Author: bbryant
Date: Fri May 13 13:06:27 2011
New Revision: 318920
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318920
Log:
Merged revisions 318919 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r318919 | bbryant | 2011-05-13 14:04:50 -0400 (Fri, 13 May 2011) | 10 lines
This patch fixes an issue with SRTP which makes HOLD/UNHOLD impossible when too
much time has passed between sending audio.
(closes issue #18206)
Reported by: bernhardsi
Patches:
res_srtp_unhold.patch uploaded by bernhards (license 1138)
Tested by: bernhards, notthematrix
........
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=318920&r1=318919&r2=318920
==============================================================================
--- trunk/res/res_srtp.c (original)
+++ trunk/res/res_srtp.c Fri May 13 13:06:27 2011
@@ -314,7 +314,10 @@
{
int res = 0;
int i;
+ int retry = 0;
struct ast_rtp_instance_stats stats = {0,};
+
+ tryagain:
for (i = 0; i < 2; i++) {
res = rtcp ? srtp_unprotect_rtcp(srtp->session, buf, len) : srtp_unprotect(srtp->session, buf, len);
@@ -331,6 +334,49 @@
}
} else {
break;
+ }
+ }
+
+ if (retry == 0 && res == err_status_replay_old) {
+ ast_log(LOG_WARNING, "SRTP unprotect: %s\n", srtp_errstr(res));
+
+ if (srtp->session) {
+ struct ast_srtp_policy *policy;
+ struct ao2_iterator it;
+ int policies_count = 0;
+
+ // dealloc first
+ ast_log(LOG_WARNING, "SRTP destroy before re-create\n");
+ srtp_dealloc(srtp->session);
+
+ // get the count
+ policies_count = ao2_container_count(srtp->policies);
+
+ // get the first to build up
+ it = ao2_iterator_init(srtp->policies, 0);
+ policy = ao2_iterator_next(&it);
+
+ ast_log(LOG_WARNING, "SRTP try to re-create\n");
+ if (srtp_create(&srtp->session, &policy->sp) == err_status_ok) {
+ ast_log(LOG_WARNING, "SRTP re-created with first policy\n");
+
+ // unref first element
+ ao2_t_ref(policy, -1, "Unreffing first policy for re-creating srtp session");
+
+ // if we have more than one policy, add them afterwards
+ if (policies_count > 1) {
+ ast_log(LOG_WARNING, "Add all the other %d policies\n", policies_count-1);
+ while ((policy = ao2_iterator_next(&it))) {
+ srtp_add_stream(srtp->session, &policy->sp);
+ ao2_t_ref(policy, -1, "Unreffing n-th policy for re-creating srtp session");
+ }
+ }
+
+ retry++;
+ ao2_iterator_destroy(&it);
+ goto tryagain;
+ }
+ ao2_iterator_destroy(&it);
}
}
More information about the svn-commits
mailing list