From 7419ed71f7a57f7bf6f2ec157d5222fa1fa2283c Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Thu, 6 Nov 2025 12:27:25 +1100
Subject: [PATCH] * region filtering now applied in allowPacketForward()

---
 examples/simple_repeater/MyMesh.cpp | 22 ++++++++++++++--------
 examples/simple_repeater/MyMesh.h   |  1 +
 src/Mesh.h                          |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 74fca86c..2fb01029 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -306,6 +306,10 @@ File MyMesh::openAppend(const char *fname) {
 bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
   if (_prefs.disable_fwd) return false;
   if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
+  if (packet->isRouteFlood() && recv_pkt_region == NULL) {
+    MESH_DEBUG_PRINTLN("allowPacketForward: unknown transport code, or wildcard not allowed for FLOOD packet");
+    return false;
+  }
   return true;
 }
 
@@ -405,19 +409,19 @@ uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
 }
 
 bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
+  // just try to determine region for packet (apply later in allowPacketForward())
   if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
-    auto region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
-    if (region == NULL) {
-      MESH_DEBUG_PRINTLN("onRecvPacket: unknown transport code for FLOOD packet");
-      return true;
-    }
+    recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
   } else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
     if (region_map.getWildcard().flags & REGION_DENY_FLOOD) {
-      MESH_DEBUG_PRINTLN("onRecvPacket: wildcard FLOOD packet not allowed");
-      return true;
+      recv_pkt_region = NULL;
+    } else {
+      recv_pkt_region =  &region_map.getWildcard();
     }
+  } else {
+    recv_pkt_region = NULL;
   }
-  // otherwise do normal processing
+  // do normal processing
   return false;
 }
 
@@ -973,6 +977,8 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
       load_stack[0] = &temp_map.getWildcard();
       region_load_active = true;
     } else if (n >= 2 && strcmp(parts[1], "save") == 0) {
+      _prefs.discovery_mod_timestamp = rtc_clock.getCurrentTime();   // this node is now 'modified' (for discovery info)
+      savePrefs();
       bool success = region_map.save(_fs);
       strcpy(reply, success ? "OK" : "Err - save failed");
     } else if (n >= 2 && strcmp(parts[1], "allowf") == 0) {
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index fd0b4d6a..45001597 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -91,6 +91,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   TransportKeyStore key_store;
   RegionMap region_map, temp_map;
   RegionEntry* load_stack[8];
+  RegionEntry* recv_pkt_region;
   bool region_load_active;
   unsigned long dirty_contacts_expiry;
 #if MAX_NEIGHBOURS
diff --git a/src/Mesh.h b/src/Mesh.h
index bc1ac54d..00f7ed00 100644
--- a/src/Mesh.h
+++ b/src/Mesh.h
@@ -44,6 +44,7 @@ protected:
   DispatcherAction routeRecvPacket(Packet* packet);
 
   /**
+   * \brief    Called _before_ the packet is dispatched to the on..Recv() methods.
    * \returns  true, if given packet should be NOT be processed.
    */
   virtual bool filterRecvFloodPacket(Packet* packet) { return false; }