Avoid assert on receiving undecryptable packet #4059
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
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.
Fixes #3959.
It actually was an assert, as I captured it also on an ESP32:
assert failed: CryptoKey Channels::getKey(ChannelIndex) Channels.cpp:108 (ch.has_settings)Problem was that it tried to send a NAK when decrypting failed. In that case, the channel index is still the hash, so it couldn’t get the channel settings when trying to encrypt the NAK. So now we’ll send the NAK on its primary channel in that case. It’s the best we can do, in the hope the other side understands that.
However, it tried to send the NAK because it thought
mp.decoded.want_responsewas set and no module responded, butdecodedis not valid if it’s not decrypted, so I also added additional checks for that.