diff options
| author | Sean O. Stalley <sean.stalley@intel.com> | 2014-08-25 15:02:10 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-26 06:10:20 +0000 |
| commit | 64cd8270c669e35bc2911133a9a7da31c4bb1965 (patch) | |
| tree | 73de92c942d5e2deda4affdac6ea0e87e0f14049 /epan/dissectors/packet-mausb.c | |
| parent | 3d4d0216e43fa2c8f1487103dc9f4185c471adf0 (diff) | |
Have dissect_usb_setup_request handle non-standard requests
Moved code for parsing non-standard setup requests from
dissect_usb_common() to dissect_usb_setup_request().
Also added header_info flag USB_HEADER_IS_MAUSB & updated mausb
dissector.
Change-Id: Ifa8abccbd57bf4dd3965f582872952383e6f737d
Reviewed-on: https://code.wireshark.org/review/3851
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mausb.c')
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index d9fcfcaa0e..a57ada204e 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -1150,7 +1150,6 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *mausb_tree; proto_tree *flags_tree; proto_tree *tflags_tree; - proto_tree *setup_tree; /* Other misc. local variables. */ struct mausb_header header; gint offset = 0; @@ -1240,7 +1239,8 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* TODO: set all the usb_conv_info values */ usb_conv_info->is_request = mausb_is_transfer_req(&header); - usb_trans_info = usb_get_trans_info(tvb, pinfo, tree, 0, usb_conv_info); + usb_trans_info = usb_get_trans_info(tvb, pinfo, tree, + USB_HEADER_IS_MAUSB, usb_conv_info); usb_conv_info->usb_trans_info = usb_trans_info; } @@ -1364,8 +1364,9 @@ 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, tvb, offset, - usb_conv_info, &setup_tree); + offset = dissect_usb_setup_request(pinfo, mausb_tree, mausb_tree, tvb, + offset, URB_SUBMIT, usb_conv_info, + USB_HEADER_IS_MAUSB); } if (mausb_is_setup_response(&header)) { |