Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[WIP] Adding more BTLE PDUs #2215

Closed
wants to merge 1 commit into from
Closed

[WIP] Adding more BTLE PDUs #2215

wants to merge 1 commit into from

Conversation

Matheus-Garbelini
Copy link
Contributor

@Matheus-Garbelini Matheus-Garbelini commented Aug 17, 2019 •
edited
Loading

Hello @gpotter2 and @guedou I'm doing this preliminary PR to add more PDUs for BTLE layer and fix some problems I've found for CRC and BTLE_CONNECT_REQ. Keep in mind that this is a way preliminary PR just to sync what changes needs to be done, that's why I didn't even run flake8 and the tests will probably fail as of now.
Here's the summary of new additions, fixes and observations for this PR:

  • Added most data PDUs up to BLE 4.2;
  • Fixed connection request endianness. AA and crc_init should be little endian;
  • Fixed the CtrlPDU layer For some reason it was the same as LL_VERSION_IND layer;
  • Added more BTLE_Versions
  • LL_FEATURE_RSP is not ready, somewhat I had to brak the bitfield in 16 bits as it was no working well with an odd bit field number;
  • The CRC only corresponds to wireshark, if it's in little endian. The bits reversed is fine though.
  • The Data channel PDUs name was bases on the BLE standard, but let me know if you'd prefer different and simpler names.

gpotter2
gpotter2 reviewed Aug 18, 2019
View reviewed changes
scapy/layers/bluetooth4LE.py
if cls is not None:
raise
p = conf.raw_layer(s, _internal=1, _underlayer=self)
self.add_payload(p)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a duplicate the default func.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, gonna change this by using dissection_done as proposed by @guedou

@Matheus-Garbelini Matheus-Garbelini changed the title [Preliminary] Adding more BTLE PDUs [WIP] Adding more BTLE PDUs Aug 19, 2019
@gpotter2
Copy link
Member

gpotter2 commented Feb 7, 2020

any updates ?

@Matheus-Garbelini
Copy link
Contributor Author

@gpotter2 I still haven't updated the code to use dissection_done as @guedou mentioned.

@rugeGerritsen rugeGerritsen mentioned this pull request Dec 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpotter2 gpotter2 gpotter2 left review comments

Assignees
No one assigned
Labels
broken enhancement needs rework/cleanup needs testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Matheus-Garbelini @gpotter2