Disable hop limit enforcement

Disable hop limit enforcement for Vangelis linear topology.
semper-ad-fundum · Jul 11, 2024 · d2f3832 · d2f3832
1 parent abea389
commit d2f3832
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/protobufs b/protobufs
diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp
@@ -45,8 +45,9 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
         if (p->id != 0) {
             if (config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE) {
                 meshtastic_MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
-
-                tosend->hop_limit--; // bump down the hop count
+// Commented out because new role value breaks iOS/Android clients, so this is just disabled for this firmware build
+//                if(config.device.role != meshtastic_Config_DeviceConfig_Role_NO_HOP_LIMIT)
+//                    tosend->hop_limit--; // bump down the hop count
 
                 LOG_INFO("Rebroadcasting received floodmsg to neighbors\n");
                 // Note: we are careful to resend using the original senders node id
@@ -61,4 +62,4 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
     }
     // handle the packet as normal
     Router::sniffReceived(p, c);
-}
+}
diff --git a/src/mesh/ReliableRouter.cpp b/src/mesh/ReliableRouter.cpp
@@ -79,7 +79,8 @@ bool ReliableRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)
     if (wasSeenRecently(p, false) && isRepeated && !MeshModule::currentReply && p->to != nodeDB->getNodeNum()) {
         LOG_DEBUG("Resending implicit ack for a repeated floodmsg\n");
         meshtastic_MeshPacket *tosend = packetPool.allocCopy(*p);
-        tosend->hop_limit--; // bump down the hop count
+//        if(config.device.role != meshtastic_Config_DeviceConfig_Role_NO_HOP_LIMIT)
+//            tosend->hop_limit--; // bump down the hop count
         Router::send(tosend);
     }
 

diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
@@ -58,7 +58,8 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
  Technical Details: Turns off many of the routine broadcasts to favor ATAK CoT packet stream
     and automatic TAK PLI (position location information) broadcasts.
     Uses position module configuration to determine TAK PLI broadcast interval. */
-    meshtastic_Config_DeviceConfig_Role_TAK_TRACKER = 10
+    meshtastic_Config_DeviceConfig_Role_TAK_TRACKER = 10,
+    meshtastic_Config_DeviceConfig_Role_NO_HOP_LIMIT = 11
 } meshtastic_Config_DeviceConfig_Role;
 
 /* Defines the device's behavior for how messages are rebroadcast */
@@ -538,8 +539,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_Config_DeviceConfig_Role_MIN meshtastic_Config_DeviceConfig_Role_CLIENT
-#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_TAK_TRACKER
-#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_TAK_TRACKER+1))
+#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_NO_HOP_LIMIT
+#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_NO_HOP_LIMIT+1))
 
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN meshtastic_Config_DeviceConfig_RebroadcastMode_ALL
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MAX meshtastic_Config_DeviceConfig_RebroadcastMode_KNOWN_ONLY
+15 −4		meshtastic/config.proto
+0 −1		meshtastic/deviceonly.proto
+2 −2		meshtastic/mesh.options
+21 −0		meshtastic/mesh.proto
+7 −0		meshtastic/module_config.proto
+5 −0		meshtastic/portnums.proto
+52 −0		meshtastic/powermon.proto
+10 −0		meshtastic/telemetry.proto