diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-bluetooth.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bluetooth.c')
| -rw-r--r-- | epan/dissectors/packet-bluetooth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 773a2a5cd3..12a6dbff55 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -55,7 +55,6 @@ static gint ett_bluetooth = -1; static dissector_handle_t btle_handle; static dissector_handle_t hci_usb_handle; -static dissector_handle_t data_handle; static dissector_table_t bluetooth_table; static dissector_table_t hci_vendor_table; @@ -1851,7 +1850,7 @@ dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat bluetooth_data->previous_protocol_data.none = NULL; if (!dissector_try_uint_new(bluetooth_table, pinfo->phdr->pkt_encap, tvb, pinfo, tree, TRUE, bluetooth_data)) { - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); } return tvb_captured_length(tvb); @@ -1880,7 +1879,7 @@ dissect_bluetooth_bthci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi bluetooth_data->previous_protocol_data.bthci = (struct bthci_phdr *)data; if (!dissector_try_uint_new(bluetooth_table, pinfo->phdr->pkt_encap, tvb, pinfo, tree, TRUE, bluetooth_data)) { - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); } return tvb_captured_length(tvb); @@ -1908,7 +1907,7 @@ dissect_bluetooth_btmon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi bluetooth_data->previous_protocol_data.btmon = (struct btmon_phdr *)data; if (!dissector_try_uint_new(bluetooth_table, pinfo->phdr->pkt_encap, tvb, pinfo, tree, TRUE, bluetooth_data)) { - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); } return tvb_captured_length(tvb); @@ -2055,7 +2054,6 @@ proto_reg_handoff_bluetooth(void) dissector_handle_t btl2cap_handle; btle_handle = find_dissector_add_dependency("btle", proto_bluetooth); - data_handle = find_dissector("data"); hci_usb_handle = find_dissector_add_dependency("hci_usb", proto_bluetooth); dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_HCI, bluetooth_bthci_handle); |