mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-29 15:46:46 +00:00
Merge remote-tracking branch 'upstream/develop' into multi-message-Storage
This commit is contained in:
commit
526c7f8e4d
@ -54,6 +54,10 @@ bool FloodingRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)
|
|||||||
// We already enqueued the improved copy, so make sure the incoming packet stops here.
|
// We already enqueued the improved copy, so make sure the incoming packet stops here.
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No queue entry was replaced by this upgraded copy, so treat it as a duplicate to avoid
|
||||||
|
// delivering the same packet to applications/phone twice with different hop limits.
|
||||||
|
seenRecently = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (seenRecently) {
|
if (seenRecently) {
|
||||||
|
|||||||
@ -64,6 +64,10 @@ bool NextHopRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)
|
|||||||
// We already enqueued the improved copy, so make sure the incoming packet stops here.
|
// We already enqueued the improved copy, so make sure the incoming packet stops here.
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No queue entry was replaced by this upgraded copy, so treat it as a duplicate to avoid
|
||||||
|
// delivering the same packet to applications/phone twice with different hop limits.
|
||||||
|
seenRecently = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (seenRecently) {
|
if (seenRecently) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user