From d9af4f46fa6d221f6caafe12c0b8a9ed0709834e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 28 Jan 2023 13:28:57 -0600 Subject: [PATCH 1/2] Skip decoding for Repeaters --- src/mesh/Router.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index e729a225d..a150e358c 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -300,8 +300,8 @@ void Router::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Rout bool perhapsDecode(meshtastic_MeshPacket *p) { - - // LOG_DEBUG("\n\n** perhapsDecode payloadVariant - %d\n\n", p->which_payloadVariant); + if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER) + return false; if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) return true; // If packet was already decoded just return From bdf3fe3f5cfe0867df6ed5d9789efd94c8de3f2e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 28 Jan 2023 13:40:14 -0600 Subject: [PATCH 2/2] Logging tweaks --- src/mesh/FloodingRouter.cpp | 4 +--- src/mesh/Router.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp index 6fd4d0401..16c20d7a2 100644 --- a/src/mesh/FloodingRouter.cpp +++ b/src/mesh/FloodingRouter.cpp @@ -48,15 +48,13 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas traceRouteModule->updateRoute(tosend); } - LOG_INFO("Rebroadcasting received floodmsg to neighbors", p); + LOG_INFO("Rebroadcasting received floodmsg to neighbors\n"); // Note: we are careful to resend using the original senders node id // We are careful not to call our hooked version of send() - because we don't want to check this again Router::send(tosend); - } else { LOG_DEBUG("Not rebroadcasting. Role = Role_ClientMute\n"); } - } else { LOG_DEBUG("Ignoring a simple (0 id) broadcast\n"); } diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index a150e358c..4ac6f8f46 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -453,7 +453,7 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src) else printPacket("handleReceived(REMOTE)", p); } else { - printPacket("packet decoding failed (no PSK?)", p); + printPacket("packet decoding failed or skipped (no PSK?)", p); } // call modules here