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-com.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-usb-com.c')
| -rw-r--r-- | epan/dissectors/packet-usb-com.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index c95ed8695f..a6ff849ff6 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -198,7 +198,7 @@ dissect_usb_com_descriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case 0x1b: case 0x1c: - offset = call_dissector_only(mbim_descriptor_handle, tvb, pinfo, subtree, NULL); + offset = call_dissector_only(mbim_descriptor_handle, tvb, pinfo, subtree, data); break; default: break; @@ -216,15 +216,13 @@ dissect_usb_com_descriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } static int -dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - usb_conv_info_t *usb_conv_info; + usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; proto_tree *subtree; proto_item *ti; gint offset = 0; - usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info; - col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBCOM"); ti = proto_tree_add_item(tree, proto_usb_com, tvb, 0, -1, ENC_NA); @@ -254,9 +252,7 @@ dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi static int dissect_usb_com_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - usb_conv_info_t *usb_conv_info; - - usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info; + usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; if (usb_conv_info) { switch (usb_conv_info->interfaceProtocol) |