From ed746a12fac6f9ccd67a1f53ea9f3b269f1eff17 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 12 Feb 2026 08:08:25 -0600
Subject: [PATCH] fix(mesh): Set from field in locally handled packets (#4543)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
---
 .../java/com/geeksville/mesh/service/MeshCommandSender.kt  | 1 +
 .../java/com/geeksville/mesh/service/MeshHistoryManager.kt | 1 +
 .../main/java/com/geeksville/mesh/service/PacketHandler.kt | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshCommandSender.kt b/app/src/main/java/com/geeksville/mesh/service/MeshCommandSender.kt
index 2a3361b3e..f4418f5c1 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshCommandSender.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshCommandSender.kt
@@ -434,6 +434,7 @@ constructor(
         }
 
         return MeshPacket(
+            from = nodeManager?.myNodeNum ?: 0,
             to = to,
             id = id,
             want_ack = wantAck,
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshHistoryManager.kt b/app/src/main/java/com/geeksville/mesh/service/MeshHistoryManager.kt
index 8281ce529..230fb5028 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshHistoryManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshHistoryManager.kt
@@ -113,6 +113,7 @@ constructor(
         runCatching {
             packetHandler.sendToRadio(
                 MeshPacket(
+                    from = myNodeNum,
                     to = myNodeNum,
                     decoded = Data(portnum = PortNum.STORE_FORWARD_APP, payload = request.encode().toByteString()),
                     priority = MeshPacket.Priority.BACKGROUND,
diff --git a/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt b/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt
index a64cacfcf..59b14f308 100644
--- a/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt
@@ -203,8 +203,11 @@ constructor(
     private fun insertMeshLog(packetToSave: MeshLog) {
         scope.handledLaunch {
             // Do not log, because might contain PII
-            // info("insert: ${packetToSave.message_type} =
-            // ${packetToSave.raw_message.toOneLineString()}")
+
+            Logger.d {
+                "insert: ${packetToSave.message_type} = " +
+                    "${packetToSave.raw_message.toOneLineString()} from=${packetToSave.fromNum}"
+            }
             meshLogRepository.get().insert(packetToSave)
         }
     }