Fix handling of short discriminator in Linux BLE scan. #21187
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
pullapprove
bot
requested review from
andy31415,
anush-apple,
arkq,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
franck-apple,
gjc13,
harsha-rajendran,
hawk248,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
lazarkov,
LuDuda,
mlepage-google,
msandstedt,
mspang,
rgoliver,
robszewczyk,
saurabhst and
selissia
github-actions
bot
added
ble
controller
darwin
examples
lib
linux
platform
setup payload
support
tools
labels
|
PR #21187: Size comparison from 1ff2174 to 39ebc91 Increases above 0.2%:
Increases (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (6 builds for cc13x2_26x2)
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
bzbarsky-apple
force-pushed
the
fix-ble-short-discriminator
branch
from
39ebc91 to
fce79f0
Compare
|
PR #21187: Size comparison from 2987329 to fce79f0 Increases above 0.2%:
Increases (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (6 builds for cc13x2_26x2)
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
Damian-Nordic
approved these changes
Jul 26, 2022
bzbarsky-apple
force-pushed
the
fix-ble-short-discriminator
branch
from
0afbe29 to
f84e2d4
Compare
|
PR #21187: Size comparison from 925cff6 to f84e2d4 Increases above 0.2%:
Increases (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (6 builds for cc13x2_26x2)
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
msandstedt
approved these changes
Jul 26, 2022
A few changes here: 1. Implement a SetupDiscriminator class that commons up logic like "does this discriminator, which might be short or long, match the given long discriminator?" and "extract short discriminator from long discriminator". 2. Change SetupPayload to more clearly indicate whether it's storing a short or long discriminator, instead of storing a short discriminator the same way as a long discriminator with the low bits all 0 and hoping consumers check isShortDiscriminator. 3. Update BLE scanning APIs to take SetupDiscriminator. 4. Fix the Linux and Tizen BLE code to properly handle short discriminators (which used to not match if the long discriminator happened to have the low 8 bits nonzero). 5. Fix the Darwin BLE code to properly handle long discriminators that have 0 low bits. Before this change they used to incorrectly match a long discriminator which had the same 4 high bits but different 8 low bits. Fixes project-chip#21160
bzbarsky-apple
force-pushed
the
fix-ble-short-discriminator
branch
from
f84e2d4 to
bfea979
Compare
|
PR #21187: Size comparison from d94cbdc to bfea979 Increases above 0.2%:
Increases (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (6 builds for cc13x2_26x2)
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
github-actions bot
pushed a commit
that referenced
this pull request
Jul 26, 2022
* Fix handling of short discriminator in Linux BLE scan. A few changes here: 1. Implement a SetupDiscriminator class that commons up logic like "does this discriminator, which might be short or long, match the given long discriminator?" and "extract short discriminator from long discriminator". 2. Change SetupPayload to more clearly indicate whether it's storing a short or long discriminator, instead of storing a short discriminator the same way as a long discriminator with the low bits all 0 and hoping consumers check isShortDiscriminator. 3. Update BLE scanning APIs to take SetupDiscriminator. 4. Fix the Linux and Tizen BLE code to properly handle short discriminators (which used to not match if the long discriminator happened to have the low 8 bits nonzero). 5. Fix the Darwin BLE code to properly handle long discriminators that have 0 low bits. Before this change they used to incorrectly match a long discriminator which had the same 4 high bits but different 8 low bits. Fixes #21160 * Address review comment.
woody-apple
added a commit
that referenced
this pull request
Jul 27, 2022
* Fix handling of short discriminator in Linux BLE scan. A few changes here: 1. Implement a SetupDiscriminator class that commons up logic like "does this discriminator, which might be short or long, match the given long discriminator?" and "extract short discriminator from long discriminator". 2. Change SetupPayload to more clearly indicate whether it's storing a short or long discriminator, instead of storing a short discriminator the same way as a long discriminator with the low bits all 0 and hoping consumers check isShortDiscriminator. 3. Update BLE scanning APIs to take SetupDiscriminator. 4. Fix the Linux and Tizen BLE code to properly handle short discriminators (which used to not match if the long discriminator happened to have the low 8 bits nonzero). 5. Fix the Darwin BLE code to properly handle long discriminators that have 0 low bits. Before this change they used to incorrectly match a long discriminator which had the same 4 high bits but different 8 low bits. Fixes #21160 * Address review comment. Co-authored-by: Boris Zbarsky <[email protected]>
isiu-apple
pushed a commit
to isiu-apple/connectedhomeip
that referenced
this pull request
Sep 16, 2022
…21187) * Fix handling of short discriminator in Linux BLE scan. A few changes here: 1. Implement a SetupDiscriminator class that commons up logic like "does this discriminator, which might be short or long, match the given long discriminator?" and "extract short discriminator from long discriminator". 2. Change SetupPayload to more clearly indicate whether it's storing a short or long discriminator, instead of storing a short discriminator the same way as a long discriminator with the low bits all 0 and hoping consumers check isShortDiscriminator. 3. Update BLE scanning APIs to take SetupDiscriminator. 4. Fix the Linux and Tizen BLE code to properly handle short discriminators (which used to not match if the long discriminator happened to have the low 8 bits nonzero). 5. Fix the Darwin BLE code to properly handle long discriminators that have 0 low bits. Before this change they used to incorrectly match a long discriminator which had the same 4 high bits but different 8 low bits. Fixes project-chip#21160 * Address review comment.
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.
A few changes here:
discriminator, which might be short or long, match the given long
discriminator?" and "extract short discriminator from long discriminator".
long discriminator, instead of storing a short discriminator the same way as
a long discriminator with the low bits all 0 and hoping consumers check
isShortDiscriminator.
(which used to not match if the long discriminator happened to have the low 8
bits nonzero).
low bits. Before this change they used to incorrectly match a long
discriminator which had the same 4 high bits but different 8 low bits.
Fixes #21160
Problem
See above.
Change overview
See above.
Testing
Ensured that BLE commissioning still works on Darwin (which is where I can test) and that chip-tool payload parsing commands work right.