Pass the pseudo-header to wtap_encap dissectors via the "data" argument.

Have the "data" argument to dissectors registered in thw wtap_encap
dissector table point to the pseudo-header for the packet.

Use that argument in the Bluetooth dissector.

Change-Id: I022bbfb796ef51d95df09fb952a149960170d631
Reviewed-on: https://code.wireshark.org/review/8951
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 4 insertions, 4 deletions

diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index c3f5f1e580..f994576722 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -1380,10 +1380,10 @@ dissect_bluetooth_bthci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
     bluetooth_data = dissect_bluetooth_common(tvb, pinfo, tree);
 
     /*
-     * Point to the bthci pseudo-header.
+     * data points to a struct bthci_phdr.
      */
     bluetooth_data->previous_protocol_data_type = BT_PD_BTHCI;
-    bluetooth_data->previous_protocol_data.bthci = &pinfo->pseudo_header->bthci;
+    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);
@@ -1403,10 +1403,10 @@ dissect_bluetooth_btmon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
     bluetooth_data = dissect_bluetooth_common(tvb, pinfo, tree);
 
     /*
-     * Point to the btmon pseudo-header.
+     * data points to a struct btmon_phdr.
      */
     bluetooth_data->previous_protocol_data_type = BT_PD_BTMON;
-    bluetooth_data->previous_protocol_data.btmon = &pinfo->pseudo_header->btmon;
+    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);