meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: make region auto-tagging opt-in with configurable hop limit

Browse source 
Adds two new repeater prefs to give admins explicit control over
VLAN-style region tagging of untagged flood packets:

  region.autotag           on|off   (default: off)
  region.autotag.max.hops  0-8      (default: 1)

Auto-tagging now only occurs when the setting is enabled AND the
received packet's path hash count is <= the configured max hops.
This prevents mis-tagging distant-origin floods that arrived via
untagged / older-firmware repeaters, and ensures home-region
selection is a deliberate admin decision rather than an implicit
side-effect of configuring a home region.
This commit is contained in:
Dale Ruane 2026-04-14 10:26:18 +01:00
parent 85a3b1d6db
commit d93746e257
3 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/simple_repeater/MyMesh.cpp
View file

@ -543,9 +543,10 @@ bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
}
} else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
// untagged packet: tag with home region if one is configured
// untagged packet: tag with home region if auto-tagging is enabled and a home region is configured
RegionEntry* home = region_map.getHomeRegion();
if (home && home->id != 0) {
if (_prefs.region_autotag && home && home->id != 0
&& pkt->getPathHashCount() <= _prefs.region_autotag_max_hops) {
// calculate transport code for home region and stamp onto packet
TransportKey key;
if (home->name[0] == '$') {
@ -901,6 +902,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
_prefs.advert_interval = 1; // default to 2 minutes for NEW installs
_prefs.flood_advert_interval = 12; // 12 hours
_prefs.flood_max = 64;
_prefs.region_autotag = 0; // opt-in, default off
_prefs.region_autotag_max_hops = 1; // only tag zero-hop / 1-hop packets by default
_prefs.interference_threshold = 0; // disabled
// bridge defaults