Added modes for rebroadcast #2224
Merged
Conversation
This file contains 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
🤖 Pull request artifacts
|
thebentern
added a commit
to meshtastic/artifacts
that referenced
this pull request
Jan 29, 2023
thebentern
added a commit
to meshtastic/artifacts
that referenced
this pull request
Jan 29, 2023
thebentern
added a commit
to meshtastic/artifacts
that referenced
this pull request
Jan 30, 2023
thebentern
added a commit
to meshtastic/artifacts
that referenced
this pull request
Jan 30, 2023
GUVWAF
reviewed
Jan 30, 2023
| @@ -60,6 +60,10 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas | |||
| } | |||
| } | |||
|
|
|||
| if (config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY) { | |||
There was a problem hiding this comment.
I think LOCAL_ONLY isn’t working correctly like this. Firstly, it will only end up at the clause when it didn’t go to Router::send() before. Secondly, cancelSending is only doing something when there is already a packet with that ID in the queue (in the first clause at line 34 a rebroadcast is canceled when in the meantime it already heard an ACK). Right now I think you will see
“cancelSending id=xxx, removed=0”
meaning nothing is canceled.
I think we should just set encryptedOk in the RoutingModule to false to ensure we don’t rebroadcast encrypted packets. Then, if you configure channels on a repeater with a different PSK than the default, we already also ignore packets from ‘open’ networks, right?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hopefully I got it in the right spot for the local_only cancellation of rebroadcasts