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-usb-ccid.c | |
| parent | 2b729ba554b5b5681f2304d0a51b63d3b250a9c0 (diff) | |
| download | wireshark-76bfa2ce1af4867baf4f6990ac233d04a1b3af23.tar.gz | |
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-usb-ccid.c')
| -rw-r--r-- | epan/dissectors/packet-usb-ccid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index cf25932d21..bd528bb3e0 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -348,9 +348,9 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree *ccid_tree; guint8 cmd; tvbuff_t *next_tvb; - usb_data_t *usb_data = (usb_data_t *) data; + usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; - DISSECTOR_ASSERT(usb_data); + DISSECTOR_ASSERT(usb_conv_info); col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBCCID"); col_set_str(pinfo->cinfo, COL_INFO, "CCID Packet"); @@ -445,7 +445,7 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (tvb_get_guint8(tvb, 15) == 0xD4) { /* Skip the 5 byte ACS Pseudo-Header */ - call_dissector_with_data(sub_handles[sub_selected], tvb_new_subset_remaining(tvb, 15), pinfo, tree, usb_data); + call_dissector_with_data(sub_handles[sub_selected], tvb_new_subset_remaining(tvb, 15), pinfo, tree, usb_conv_info); } else { @@ -496,7 +496,7 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* Strip the ISO 7816 status word at the end, like we do in the PN532 dissector for FeliCa payloads... */ next_tvb= tvb_new_subset(tvb, 10, (tvb_get_guint8(tvb, 1) - 2), (tvb_get_guint8(tvb, 1) - 2)); - call_dissector_with_data(sub_handles[SUB_PN532_ACS_PSEUDO_APDU], next_tvb, pinfo, tree, usb_data); + call_dissector_with_data(sub_handles[SUB_PN532_ACS_PSEUDO_APDU], next_tvb, pinfo, tree, usb_conv_info); } /* Try to dissect responses to GSM SIM packets */ |