Wireshark-commits: [Wireshark-commits] master 68e6502: Clean up handling of metadata in Bluetooth d
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=68e65021e07914e9be40776ac6cc0b5bc416a718
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
68e6502 by Guy Harris (guy@xxxxxxxxxxxx):
Clean up handling of metadata in Bluetooth dissectors.
Make the "previous protocol data" union in bluetooth_data_t a
discriminated union, and use the discriminator to decide whether to use
a given member of the union or not (or to check whether the member you
plan to use is valid).
Have separate top-level dissectors depending on what the data type
pointed to by the "data" argument is.
Use that member to point to pseudo-header metadata, and, for now, set it
to point to the appropriate pinfo->pseudo_header value; eventually, we
plan to pass the pseudo-header pointer in as the "data" argument from
the "frame" dissector.
Don't overwrite the pseudo-header in the packetlogger dissector -
construct a new one and pass it in.
Change-Id: Ia1ef71e7082a964c5d92d47221f8c00e32f3f087
Reviewed-on: https://code.wireshark.org/review/8943
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 60ab495 Accept drop events immediately.
adds 68e6502 Clean up handling of metadata in Bluetooth dissectors.
Summary of changes:
epan/dissectors/packet-bluetooth.c | 155 ++++++++++++++++++++++++++++-----
epan/dissectors/packet-bluetooth.h | 13 ++-
epan/dissectors/packet-btle.c | 4 +-
epan/dissectors/packet-hci_h1.c | 3 +-
epan/dissectors/packet-hci_mon.c | 7 +-
epan/dissectors/packet-hci_usb.c | 1 +
epan/dissectors/packet-packetlogger.c | 24 ++---
epan/dissectors/packet-ubertooth.c | 6 +-
8 files changed, 167 insertions(+), 46 deletions(-)
