Fix #3452: only alter received packet if port number matches - #3474
Merged
Conversation
`alterReceived()` should never return NULL Traceroute should be promiscuous
thebentern
approved these changes
Mar 23, 2024
Contributor
|
Very nice! It cleans up the code quite a bit to use that new alter method. |
mverch67
pushed a commit
that referenced
this pull request
Mar 24, 2024
jeek
pushed a commit
to jeek/Meshtastic-Exploiteers-Hacker-Pager
that referenced
this pull request
Jun 30, 2026
meshtastic#3474) * Use `alterReceivedProtobuf()` for NeighborInfo and Traceroute `alterReceived()` should never return NULL Traceroute should be promiscuous * Remove extensive logging from NeighborInfo module
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #3452.
If enabled, the NeighborInfo module was altering a packet even if it wasn’t a NeighborInfo packet. This was introduced when
wantPacket()was changed in PR #3321, because withhopStartwe can also determine who are neighbors for any other packet.To avoid this, I let the NeighborInfo module (and also Traceroute) now use
alterReceivedProtobuf()instead of calling the methods in the FloodingRouter. To make surealterReceived()of the Protobuf module does not call this withdecodedset to NULL, I moved that into the clause which checks if the port number matches.Tested that this fixes the decoding issues and it still works correctly for both the NeighborInfo module and Traceroute (also with hop in between).
Also removed some extensive logging from the NeighborInfo module since it would print your full NodeDB when sending a packet. Now it only prints your neighbors.