diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-11-08 11:58:33 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-11-08 14:19:00 +0000 |
| commit | f82b2f2dd342b74f2ee6a7da2069614671ea8205 (patch) | |
| tree | e077d741ee9df89391f2f997c6bbbd2342fd5fbe | |
| parent | 570df7592d1f6a38b28438192536f8c4872e8437 (diff) | |
| download | wireshark-f82b2f2dd342b74f2ee6a7da2069614671ea8205.tar.gz | |
remove parent parameter from dissect_usb_setup_request()
Change-Id: I5a24de9a12e301d472e701140299304e2cb4fcfc
Reviewed-on: https://code.wireshark.org/review/5190
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 2fc47a2239..d4c5fb60c8 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -1370,8 +1370,8 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* If this packet contains USB Setup Data */ if (mausb_has_setup_data(&header)) { - offset = dissect_usb_setup_request(pinfo, mausb_tree, mausb_tree, tvb, - offset, URB_SUBMIT, usb_conv_info, + offset = dissect_usb_setup_request(pinfo, mausb_tree, tvb, offset, + URB_SUBMIT, usb_conv_info, USB_HEADER_IS_MAUSB); } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 6495899bdb..ea24354aca 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2893,12 +2893,12 @@ try_dissect_linux_usb_pseudo_header_ext(tvbuff_t *tvb, int offset, /* Dissector used for usb setup requests */ int dissect_usb_setup_request(packet_info *pinfo, proto_tree *tree, - proto_tree *parent, tvbuff_t *tvb, int offset, + tvbuff_t *tvb, int offset, guint8 urb_type, usb_conv_info_t *usb_conv_info, guint8 header_info) { gint req_type; - proto_tree *setup_tree; + proto_tree *parent, *setup_tree; tvbuff_t *setup_tvb; usb_trans_info_t *usb_trans_info; tvbuff_t *next_tvb, *data_tvb; @@ -2909,6 +2909,8 @@ dissect_usb_setup_request(packet_info *pinfo, proto_tree *tree, usb_trans_info = usb_conv_info->usb_trans_info; + parent = proto_tree_get_parent_tree(tree); + setup_tree = proto_tree_add_subtree(parent, tvb, offset, 8, usb_setup_hdr, NULL, "URB setup"); setup_tvb = tvb_new_subset_length(tvb, offset, 8); @@ -3481,7 +3483,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, if (usb_conv_info->is_request) { if (usb_conv_info->is_setup) { - offset = dissect_usb_setup_request(pinfo, tree, parent, tvb, offset, + offset = dissect_usb_setup_request(pinfo, tree, tvb, offset, urb_type, usb_conv_info, header_info); } else { diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 8f9d084cf5..f1e5254f5f 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -233,7 +233,7 @@ dissect_usb_setup_response(packet_info *pinfo, proto_tree *tree, int dissect_usb_setup_request(packet_info *pinfo, proto_tree *tree, - proto_tree *parent, tvbuff_t *tvb, int offset, + tvbuff_t *tvb, int offset, guint8 urb_type, usb_conv_info_t *usb_conv_info, guint8 header_info); |