From 5b2d60542e67c1f39eb335a2009d3812ce2241de Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 12 Nov 2026 07:25:34 -0400 Subject: [PATCH] MT#55283 split out ROC reset function no-op Change-Id: Id6e3df4187a877c53c65aed60ca8ac83175ea8c1 --- daemon/call.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index f61920395..5dae7e378 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -1084,30 +1084,37 @@ static void __fill_stream(struct packet_stream *ps, const struct endpoint *epp, PS_SET(ps, NAT_WAIT); } -static void call_stream_crypto_reset(struct packet_stream *ps) { - ilog(LOG_DEBUG, "Resetting crypto context"); - crypto_reset(&ps->crypto); - - struct call_media *media = ps->media; +static void call_media_reset_crypto_roc(struct call_media *media) { + ilog(LOG_DEBUG, "Resetting SRTP sequencing/ROC"); - if (PS_ISSET(ps, RTP)) { - mutex_lock(&media->ssrc_hash_in.lock); - for (GList *l = media->ssrc_hash_in.nq.head; l; l = l->next) { - struct ssrc_entry_call *se = l->data; - atomic_set_na(&se->stats->ext_seq, 0); - } - mutex_unlock(&media->ssrc_hash_in.lock); + mutex_lock(&media->ssrc_hash_in.lock); + for (GList *l = media->ssrc_hash_in.nq.head; l; l = l->next) { + struct ssrc_entry_call *se = l->data; + atomic_set_na(&se->stats->ext_seq, 0); + } + mutex_unlock(&media->ssrc_hash_in.lock); - mutex_lock(&media->ssrc_hash_out.lock); - for (GList *l = media->ssrc_hash_out.nq.head; l; l = l->next) { - struct ssrc_entry_call *se = l->data; - atomic_set_na(&se->stats->ext_seq, 0); - } - mutex_unlock(&media->ssrc_hash_out.lock); + mutex_lock(&media->ssrc_hash_out.lock); + for (GList *l = media->ssrc_hash_out.nq.head; l; l = l->next) { + struct ssrc_entry_call *se = l->data; + atomic_set_na(&se->stats->ext_seq, 0); } + mutex_unlock(&media->ssrc_hash_out.lock); +} + + +static void call_stream_crypto_reset(struct packet_stream *ps) { + ilog(LOG_DEBUG, "Resetting crypto context"); + + if (!PS_ISSET(ps, RTP)) + return; + + crypto_reset(&ps->crypto); + call_media_reset_crypto_roc(ps->media); } + /* called with call locked in R or W, but ps not locked */ enum call_stream_state call_stream_state_machine(struct packet_stream *ps) { struct call_media *media = ps->media;