-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Bluetooth LE: Add support for iBeacon #1893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Codecov Report
@@ Coverage Diff @@
## master #1893 +/- ##
==========================================
- Coverage 85.88% 85.88% -0.01%
==========================================
Files 188 189 +1
Lines 43007 43031 +24
==========================================
+ Hits 36936 36956 +20
- Misses 6071 6075 +4
|
|
Now that #1892 is merged, I've rebased on |
|
Hi, I’ve cleaned up the doc, and moved all layer-specific docs. This PR now conflicts. Sorry for the delay, I didn’t wanted this PR to conflict the other one 😄 Otherwise all good to me |
|
Rebased on master. Codacy was sad about changes introduced by this PR when checking #1957, so lets see how this goes... |
|
OK, looks like Codacy and the Travis CI linters are happy now! The AppVeyor issues look like you're trying to resolve them in another PR. |
|
Nice PR! From a usage point of view. do you think that IBeacon_Data could be integrated intp Apple_BLE_Submessage? |
They're intentionally split -- the structure is described in the documentation. This allows the non-iBeacon Apple BLE frames to be implemented later, if/when the format becomes publicly known. Right now, they're just Merging them would cause any capture containing a frame from some other Apple BLE device to have some unexpected behaviour. And who knows, someone might want to fuzz this protocol... |
(includes 1 fix-up; excludes iBeacon in secdev#1893)
|
This is now rebased such that common changes needed for #1957 are in both PRs, and the iBeacon-specific changes are in one (squashed) commit. Hopefully won't conflict if both are merged... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feel free to merge. Great PR to me
(includes 1 fix-up; excludes iBeacon in #1893)
- Decodes iBeacon as a submessage of Apple's BLE broadcast frame format. Does not implement support for other types of Apple BLE broadcasts. - Adds tests and example documentation.
|
Rebased against master to fix the doc conflicts |
ibeacon: New layer!
scapy.layers.bluetooth.This also includes some minor documentation changes for Eddystone, in order to reference the same
Beacon LocatorAndroid app used for testing iBeacons (as it can handle both -- whereas the Eddystone Validator only handles Eddystone).This PR requires #1892 to be merged first, as it requiresDone!UUIDField.