meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consider hopStart=0 when calculating hops for packets (#4101)

Browse source
This commit is contained in:
Eric Severance 2025-12-31 04:46:59 -08:00 • committed by GitHub
parent 21ec78d8ef
commit a0910dfcb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -1573,8 +1573,13 @@ class MeshService : Service() {
private fun getHopsAwayForPacket(packet: MeshPacket): Int =
if (packet.decoded.portnumValue == Portnums.PortNum.RANGE_TEST_APP_VALUE) {
0 // These don't come with the .hop params, but do not propagate, so they must be 0
} else if (packet.hopStart == 0 || packet.hopLimit > packet.hopStart) {
} else if (packet.hopStart == 0 && !packet.decoded.hasBitfield()) {
// Firmware prior to 2.3.0 doesn't set hopStart. The bitfield was added in 2.5.0. Its
// absence is used to approximate firmware versions where hopStart is missing and when
// the number of hops away cannot be calculated.
-1
} else if (packet.hopLimit > packet.hopStart) {
-1 // Invalid hopStart/hopLimit.
} else {
packet.hopStart - packet.hopLimit
}