Bluetooth LE: multiple improvements #1855
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #1855 +/- ##
==========================================
+ Coverage 85.76% 85.79% +0.02%
==========================================
Files 185 186 +1
Lines 42473 42638 +165
==========================================
+ Hits 36429 36583 +154
- Misses 6044 6055 +11
|
gpotter2
reviewed
Feb 17, 2019
micolous
force-pushed
the
bluetooth-fun
branch
from
17e8c1e to
a3fee2b
Compare
Member
|
SIde note: if you’re wondering why tests are failing (even though it’s a draft), modules now require to have special tags defined (it has existed for a long time, but wasn’t enforced since very recently so there’s no other doc that Edit: doc will be added in #1865 Those tags allow Scapy to display the file correctly when using the |
micolous
force-pushed
the
bluetooth-fun
branch
3 times, most recently
from
43f7af2 to
e33057a
Compare
micolous
changed the title
Member
|
Hi ! PR’s looking great. Note we apply a strict PEP8 linter in order to keep code consistency across the codebase. Your PR has a few errors, available at https://travis-ci.org/secdev/scapy/jobs/497727702#L880 (one of them is that we disallow star ( Edit: List of errors |
* **Fix:** `BluetoothHCISocket.sr` now works * **Fix:** Python 3 issue with `LEMacField` * **New:** Bluetooth documentation page, explaining Bluetooth physical layer differences and some basic recipes for connecting to the HCI, BLE discovery and advertising. * **New:** cross-references for Bluetooth SIG assigned numbers * **New:** `BTUUID128Field` for 128-bit UUID fields * **New:** Adds some more `EIR_Hdr` enum types, and sort them * **New:** `EIR_CompleteList128BitServiceUUIDs` (and `IncompleteList`) * **New:** `EIR_ServiceData16BitUUID` (with protocol stacking support) * **Fix:** Protocol stacking for `EIR_Manufacturer_Specific_Data` * **Fix:** Renames `HCI_Event_Hdr.length` to `.len` (for consistency), and fixes calculation of it * **Fix:** Can now dissect packets composed of multiple `HCI_LE_Meta_Advertising_Report` (`.number > 1`), by adding `HCI_LE_Meta_Advertising_Reports`, which contains a list of `HCI_LE_Meta_Advertising_Report`. * **Fix:** Set a default MTU on `Bluetooth*Socket` classes * **New:** HCI BLE whitelist commands * **New:** [Eddystone beacons](https://github.com/google/eddystone) which uses the new stackable functionality of `EIR_ServiceData16BitUUID` * Adds tests for new functionality, and regression tests for fixes where plausible
micolous
force-pushed
the
bluetooth-fun
branch
from
7d07efd to
8e093ac
Compare
Contributor
Author
|
Thanks, pep8 issues should be addressed now. I have done another rebase/squash with those extra commits -- it looks like PyPI |
Member
|
Yeah, I’m investigating. One of our optional dependencies ( I’ll be following up the issue with them hardbyte/python-can#520 |
Member
|
They fixed it. Just restarted all failing tests (on all failing PRs, might take some time) |
gpotter2
approved these changes
Feb 25, 2019
Member
gpotter2
left a comment
gpotter2
left a comment
There was a problem hiding this comment.
All good to me ! Great PR ! Thanks a lot
I'll merge it later today
Closed
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.
A number of fixes and enhancements, primarily for Bluetooth Low Energy:
BluetoothHCISocket.srnow worksLEMacFieldBTUUID128Fieldfor 128-bit UUID fieldsEIR_Hdrenum types, and sort themEIR_CompleteList128BitServiceUUIDs(andIncompleteList)EIR_ServiceData16BitUUID(with protocol stacking support)EIR_Manufacturer_Specific_DataHCI_Event_Hdr.lengthto.len(for consistency), and fixes calculation of itHCI_LE_Meta_Advertising_Report(.number > 1), by addingHCI_LE_Meta_Advertising_Reports, which contains a list ofHCI_LE_Meta_Advertising_Report.Bluetooth*SocketclassesEIR_ServiceData16BitUUIDThis PR looks huge, but nearly half of the lines in this PR come from the documentation!