[asterisk-commits] res rtp asterisk: Ensure DTLS timeout timer is -1 if DTLS is... (asterisk[13])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: res_rtp_asterisk: Ensure DTLS timeout timer is -1 if DTLS is not used.
......................................................................


res_rtp_asterisk: Ensure DTLS timeout timer is -1 if DTLS is not used.

This change fixes a bug where the DTLS timeout timer would be
initialized to 0 if DTLS was not used for an RTP session.

ASTERISK-25103

Change-Id: If8d26bb054f1d300838850da5b8db9044c2fe2ac
---
M res/res_rtp_asterisk.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Matt Jordan: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index f0e2f83..adce9e7 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -1232,7 +1232,6 @@
 	dtls->connection = AST_RTP_DTLS_CONNECTION_NEW;
 
 	ast_mutex_init(&dtls->lock);
-	dtls->timeout_timer = -1;
 
 	return 0;
 
@@ -2523,6 +2522,7 @@
 
 #ifdef HAVE_OPENSSL_SRTP
 	rtp->rekeyid = -1;
+	rtp->dtls.timeout_timer = -1;
 #endif
 
 	rtp->f.subclass.format = ao2_bump(ast_format_none);
@@ -4723,6 +4723,7 @@
 #endif
 
 #ifdef HAVE_OPENSSL_SRTP
+			rtp->rtcp->dtls.timeout_timer = -1;
 			dtls_setup_rtcp(instance);
 #endif
 

-- 
To view, visit https://gerrit.asterisk.org/810
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If8d26bb054f1d300838850da5b8db9044c2fe2ac
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>