updated coverage is not needed unless rebroadcasting

meshtastic · Jan 6, 2025 · 10103fe · 10103fe
1 parent 5c27934
commit 10103fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp
@@ -76,10 +76,7 @@ bool FloodingRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
                 CoverageFilter incomingCoverage;
                 loadCoverageFilterFromPacket(p, incomingCoverage);
 
-                CoverageFilter updatedCoverage = incomingCoverage;
-                mergeMyCoverage(updatedCoverage);
-
-                float forwardProb = calculateForwardProbability(incomingCoverage, updatedCoverage, p->from);
+                float forwardProb = calculateForwardProbability(incomingCoverage, p->from);
 
                 float rnd = static_cast<float>(rand()) / static_cast<float>(RAND_MAX);
                 if (rnd <= forwardProb) {
@@ -95,6 +92,9 @@ bool FloodingRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
                     }
 #endif
 
+                    CoverageFilter updatedCoverage = incomingCoverage;
+                    mergeMyCoverage(updatedCoverage);
+
                     storeCoverageFilterInPacket(updatedCoverage, tosend);
 
                     LOG_INFO("Rebroadcasting packet ID=0x%x with ForwardProb=%.2f", p->id, forwardProb);
@@ -161,7 +161,7 @@ void FloodingRouter::mergeMyCoverage(CoverageFilter &coverage)
     coverage.add(nodeDB->getNodeNum());
 }
 
-float FloodingRouter::calculateForwardProbability(const CoverageFilter &incoming, const CoverageFilter &updated, NodeNum from)
+float FloodingRouter::calculateForwardProbability(const CoverageFilter &incoming, NodeNum from)
 {
 #ifdef USERPREFS_USE_COVERAGE_FILTER
     bool useCoverageFilter = USERPREFS_USE_COVERAGE_FILTER;

diff --git a/src/mesh/FloodingRouter.h b/src/mesh/FloodingRouter.h
@@ -42,7 +42,7 @@ class FloodingRouter : public Router, protected PacketHistory
 
     void mergeMyCoverage(CoverageFilter &coverage);
 
-    float calculateForwardProbability(const CoverageFilter &incoming, const CoverageFilter &updated, NodeNum from);
+    float calculateForwardProbability(const CoverageFilter &incoming, NodeNum from);
 
   public:
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ class FloodingRouter : public Router, protected PacketHistory @@
         void mergeMyCoverage(CoverageFilter &coverage);
-        float calculateForwardProbability(const CoverageFilter &incoming, const CoverageFilter &updated, NodeNum from);
+        float calculateForwardProbability(const CoverageFilter &incoming, NodeNum from);
       public:
         /**
@@ Expand Down @@