diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-12 13:46:51 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-12 13:46:51 +0000 |
| commit | 76bfa2ce1af4867baf4f6990ac233d04a1b3af23 (patch) | |
| tree | c665d826554ef5c3256b9a9b3fdc1fc9841ae56c /epan/dissectors/packet-rfid-pn532.c | |
| parent | 2b729ba554b5b5681f2304d0a51b63d3b250a9c0 (diff) | |
Remove usb_conv_info_t from packet_info and pass the data directly into the subdissectors. Bug 9413 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9413)
svn path=/trunk/; revision=53274
Diffstat (limited to 'epan/dissectors/packet-rfid-pn532.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-pn532.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 4936a33163..2fe0972d37 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -633,7 +633,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) tvbuff_t *next_tvb; gint offset = 0; command_data_t *command_data = NULL; - usb_data_t *usb_data; + usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; wmem_tree_key_t key[5]; guint32 bus_id; guint32 device_address; @@ -657,12 +657,11 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(cmd, &pn532_commands_ext, "Unknown command")); - usb_data = (usb_data_t *) data; - DISSECTOR_ASSERT(usb_data); + DISSECTOR_ASSERT(usb_conv_info); - bus_id = usb_data->bus_id; - device_address = usb_data->device_address; - endpoint = usb_data->endpoint; + bus_id = usb_conv_info->bus_id; + device_address = usb_conv_info->device_address; + endpoint = usb_conv_info->endpoint; k_bus_id = bus_id; k_device_address = device_address; |