From b2a5f7f97ee13c0f3938bf49912814d47081ac39 Mon Sep 17 00:00:00 2001
From: hackerman-kl <hackerman-kl@kebag-logic.com>
Date: Sat, 25 Apr 2026 08:42:15 +0200
Subject: [PATCH] milan-avb: avdecc: add avb_log_state aggregator and detailed
 send error

---
 src/modules/module-avb/avdecc.c   | 19 ++++++++++++++++++-
 src/modules/module-avb/internal.h |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-avb/avdecc.c b/src/modules/module-avb/avdecc.c
index d05784205..1399bc110 100644
--- a/src/modules/module-avb/avdecc.c
+++ b/src/modules/module-avb/avdecc.c
@@ -31,6 +31,7 @@
 #include "mvrp.h"
 #include "descriptors.h"
 #include "utils.h"
+#include "acmp-cmds-resps/acmp-milan-v12.h"
 
 #define DEFAULT_INTERVAL	1
 
@@ -96,7 +97,7 @@ static int raw_send_packet(struct server *server, const uint8_t dest[6],
 
 	if (send(server->source->fd, data, size, 0) < 0) {
 		res = -errno;
-		pw_log_warn("got send error: %m");
+		pw_log_warn("got send error (size=%zu type=0x%04x): %m", size, type);
 	}
 	return res;
 }
@@ -450,3 +451,19 @@ const char *get_avb_mode_str(enum avb_mode mode)
 {
 	return avb_mode_str[mode];
 }
+
+void avb_log_state(struct server *server, const char *label)
+{
+	if (server == NULL)
+		return;
+#if 0
+	if (!pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
+		return;
+#endif
+	pw_log_debug("===== state @ %s =====", label);
+	adp_log_state(server, label);
+	avb_msrp_log_state(server, label);
+	if (server->avb_mode == AVB_MODE_MILAN_V12)
+		acmp_log_state_milan_v12(server, label);
+	pw_log_debug("===== end state =====");
+}
diff --git a/src/modules/module-avb/internal.h b/src/modules/module-avb/internal.h
index 125546ee8..29061e4ec 100644
--- a/src/modules/module-avb/internal.h
+++ b/src/modules/module-avb/internal.h
@@ -179,6 +179,8 @@ int avb_server_stream_setup_socket(struct server *server, struct stream *stream)
 ssize_t avb_server_stream_send(struct server *server, struct stream *stream,
 		struct msghdr *msg, int flags);
 
+void avb_log_state(struct server *server, const char *label);
+
 struct aecp {
 	struct server *server;
 	struct spa_hook server_listener;