From 1049b78abdb91c6fc87651eba0b6547aaf23ba8f Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 11 Feb 2022 12:07:29 -0500
Subject: [PATCH] TT#14008 add extra logging for SRTP/SSRC updates

Change-Id: I564193c919563ec14c61db1031f696d5029e6e40
(cherry picked from commit 014301bee86259e02f5187f5e0a641445c5532e3)
(cherry picked from commit be4cfb7c549e0269bcfa014230f0e95d809a0b44)
---
 daemon/call.c                | 16 ++++++++++++++--
 kernel-module/xt_RTPENGINE.c | 22 ++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/daemon/call.c b/daemon/call.c
index 2c9a6bd92..395c0dd63 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -591,6 +591,8 @@ void call_timer(void *ptr) {
 		if (!sfd)
 			goto next;
 
+		log_info_stream_fd(sfd);
+
 		rwlock_lock_r(&sfd->call->master_lock);
 
 		ps = sfd->stream;
@@ -669,6 +671,10 @@ void call_timer(void *ptr) {
 					if (sink->crypto.params.crypto_suite
 							&& o->encrypt.last_index[u] - ctx->srtp_index > 0x4000)
 					{
+						ilog(LOG_DEBUG, "Updating SRTP encryption index from %" PRIu64
+								" to %" PRIu64,
+								ctx->srtp_index,
+								o->encrypt.last_index[u]);
 						ctx->srtp_index = o->encrypt.last_index[u];
 						update = true;
 					}
@@ -688,12 +694,17 @@ void call_timer(void *ptr) {
 				atomic64_add(&ctx->octets, diff_bytes);
 				atomic64_add(&ctx->packets, diff_packets);
 				atomic64_set(&ctx->last_seq, ke->target.decrypt.last_index[u]);
-				ctx->srtp_index = ke->target.decrypt.last_index[u];
 
 				if (sfd->crypto.params.crypto_suite
 						&& ke->target.decrypt.last_index[u]
-						- ctx->srtp_index > 0x4000)
+						- ctx->srtp_index > 0x4000) {
+					ilog(LOG_DEBUG, "Updating SRTP decryption index from %" PRIu64
+							" to %" PRIu64,
+							ctx->srtp_index,
+							ke->target.decrypt.last_index[u]);
+					ctx->srtp_index = ke->target.decrypt.last_index[u];
 					update = true;
+				}
 			}
 			mutex_unlock(&ps->in_lock);
 		}
@@ -709,6 +720,7 @@ next:
 		i = g_list_delete_link(i, i);
 		if (sfd)
 			obj_put(sfd);
+		log_info_pop();
 	}
 
 	l = g_hash_table_get_values(hlp.addr_sfd);
diff --git a/kernel-module/xt_RTPENGINE.c b/kernel-module/xt_RTPENGINE.c
index cc75987aa..0f9ba9c18 100644
--- a/kernel-module/xt_RTPENGINE.c
+++ b/kernel-module/xt_RTPENGINE.c
@@ -1591,10 +1591,10 @@ static void proc_list_crypto_print(struct seq_file *f, struct re_crypto_context
 
 		seq_printf(f, "           ROC:");
 		for (i = 0; i < ARRAY_SIZE(c->roc); i++) {
-			if (i == 0)
-				seq_printf(f, " %u", (unsigned int) c->roc[i]);
-			else
-				seq_printf(f, ", %u", (unsigned int) c->roc[i]);
+			seq_printf(f, "%s %u (%lu)",
+					(i == 0) ? "" : ",",
+					(unsigned int) c->roc[i],
+					(unsigned long) s->last_index[i]);
 		}
 		seq_printf(f, "\n");
 
@@ -1652,10 +1652,9 @@ static int proc_list_show(struct seq_file *f, void *v) {
 	for (i = 0; i < ARRAY_SIZE(g->target.ssrc); i++) {
 		if (!g->target.ssrc[i])
 			break;
-		if (i == 0)
-			seq_printf(f, " %lx", (unsigned long) ntohl(g->target.ssrc[i]));
-		else
-			seq_printf(f, ", %lx", (unsigned long) ntohl(g->target.ssrc[i]));
+		seq_printf(f, "%s %lx",
+				(i == 0) ? "" : ",",
+				(unsigned long) ntohl(g->target.ssrc[i]));
 	}
 	seq_printf(f, "\n");
 
@@ -1685,10 +1684,9 @@ static int proc_list_show(struct seq_file *f, void *v) {
 		for (j = 0; j < ARRAY_SIZE(o->output.ssrc_out); j++) {
 			if (!o->output.ssrc_out[j])
 				break;
-			if (j == 0)
-				seq_printf(f, " %lx", (unsigned long) ntohl(o->output.ssrc_out[j]));
-			else
-				seq_printf(f, ", %lx", (unsigned long) ntohl(o->output.ssrc_out[j]));
+			seq_printf(f, "%s %lx",
+					(j == 0) ? "" : ",",
+					(unsigned long) ntohl(o->output.ssrc_out[j]));
 		}
 		seq_printf(f, "\n");