[Backport v1.14-branch] Bluetooth: Mesh: Fix adhering to the configured Friend Queue size #18492
Conversation
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
added 3 commits
August 19, 2019 15:29
When sent solely to the Friend Queue the send callbacks were not getting called for unsegmented messages. Signed-off-by: Johan Hedberg <[email protected]>
The bt_mesh_trans_resend() function had no users, and had in fact not even a prototype in a header file. Just remove it. Signed-off-by: Johan Hedberg <[email protected]>
Qualification test case MESH/NODE/FRND/FN/BV-08-C requires that we do not store more messages than the reported Friend Queue size. The implementation was so far opportunistic and stored more if it could (it would later discard if necessary to make sure all queues can store the required amount). The spec also requires the queues to have new messages overwrite old ones (in the style of a circular buffer), so we have to keep track of which buffers are part of the same segmented message (so we discard all buffers belonging to the same message). To pass the test case, add APIs to check for space in the Friend queue, and track the number of buffers for each incoming segmented message. Fixes zephyrproject-rtos#18090 Signed-off-by: Johan Hedberg <[email protected]>
jhedberg
added
bug
trond-snekvik
approved these changes
Aug 19, 2019
The code for checking space in the Friend queue was faulty in the case that we receive a message with more segments than the configure Friend Queue size. This is not an issue for the default configuration but still a possible one. Move the check for exceeding Friend Queue Size to the per-LPN function, so that bt_mesh_friend_queue_has_space() iterates all LPNs before delivering its verdict. This allows us to return success in case no LPN matched (which is how the code was intended to work). Fixes zephyrproject-rtos#18522 Signed-off-by: Johan Hedberg <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Backport #18479 and #18528
These two backports are in a single PR since the patch from #18528 depends on (or actually fixes) an earlier patch in this PR.