From d6e1783ca40b0df9087843492835248a6a071de7 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 4 Feb 2022 11:55:25 -0500
Subject: [PATCH] TT#14008 add extra logging for packet recv/send

Change-Id: I4e57de0d116f54929321f55b7921d6cd82c8e5db
(cherry picked from commit 258f02b1c1ff389014c4842d19905a64d33ec13b)
---
 daemon/media_player.c | 16 +++++++++-------
 daemon/media_socket.c | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/daemon/media_player.c b/daemon/media_player.c
index 49937913a..6fb456627 100644
--- a/daemon/media_player.c
+++ b/daemon/media_player.c
@@ -189,17 +189,19 @@ static void __send_timer_send_common(struct send_timer *st, struct codec_packet
 
 	struct rtp_header *rh = cp->rtp;
 	if (rh) {
-		ilog(LOG_DEBUG, "Forward to sink endpoint: %s%s:%d%s (RTP seq %u TS %u)",
-				FMT_M(sockaddr_print_buf(&st->sink->endpoint.address),
-				st->sink->endpoint.port),
+		ilog(LOG_DEBUG, "Forward to sink endpoint: local %s -> remote %s%s%s "
+				"(RTP seq %u TS %u SSRC %x)",
+				endpoint_print_buf(&st->sink->selected_sfd->socket.local),
+				FMT_M(endpoint_print_buf(&st->sink->endpoint)),
 				ntohs(rh->seq_num),
-				ntohl(rh->timestamp));
+				ntohl(rh->timestamp),
+				ntohl(rh->ssrc));
 		codec_calc_jitter(cp->ssrc_out, ntohl(rh->timestamp), cp->clockrate, &rtpe_now);
 	}
 	else
-		ilog(LOG_DEBUG, "Forward to sink endpoint: %s%s:%d%s",
-				FMT_M(sockaddr_print_buf(&st->sink->endpoint.address),
-				st->sink->endpoint.port));
+		ilog(LOG_DEBUG, "Forward to sink endpoint: local %s -> remote %s%s%s",
+				endpoint_print_buf(&st->sink->selected_sfd->socket.local),
+				FMT_M(endpoint_print_buf(&st->sink->endpoint)));
 
 	socket_sendto(&st->sink->selected_sfd->socket,
 			cp->s.s, cp->s.len, &st->sink->endpoint);
diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index b844c190c..9359313c8 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -2335,6 +2335,21 @@ static int stream_packet(struct packet_handler_ctx *phc) {
 	// this set payload_type, ssrc_in, and mp payloads
 	media_packet_rtp_in(phc);
 
+	if (phc->mp.rtp)
+		ilog(LOG_DEBUG, "Handling packet: remote %s%s%s (expected: %s%s%s) -> local %s "
+				"(RTP seq %u TS %u SSRC %s%x%s)",
+				FMT_M(endpoint_print_buf(&phc->mp.fsin)),
+				FMT_M(endpoint_print_buf(&phc->mp.stream->endpoint)),
+				endpoint_print_buf(&phc->mp.sfd->socket.local),
+				ntohs(phc->mp.rtp->seq_num),
+				ntohl(phc->mp.rtp->timestamp),
+				FMT_M(ntohl(phc->mp.rtp->ssrc)));
+	else
+		ilog(LOG_DEBUG, "Handling packet: remote %s%s%s (expected: %s%s%s) -> local %s",
+				FMT_M(endpoint_print_buf(&phc->mp.fsin)),
+				FMT_M(endpoint_print_buf(&phc->mp.stream->endpoint)),
+				endpoint_print_buf(&phc->mp.sfd->socket.local));
+
 	// SSRC receive stats
 	if (phc->mp.ssrc_in && phc->mp.rtp) {
 		atomic64_inc(&phc->mp.ssrc_in->packets);