Skip to content

Consider hopStart=0 when calculating hops for packets #4101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 2 commits into from
Dec 31, 2025
Merged

Consider hopStart=0 when calculating hops for packets #4101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
979ea1e
Consider hopStart=0 when calculating hops for packets
esev Dec 31, 2025
f32b28f
Remove unnecessary extra space
esev Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading