diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-25 10:45:15 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-25 10:45:15 +0000 |
| commit | 337896f4c6777bc0b84a2e017ebcbb52100a312b (patch) | |
| tree | c2767ed0e9e6dcb5513746f7a40d6cb68fa58a1a /epan/dissectors | |
| parent | e0ce6d735d3e27e6f325d7a8ceeb5f208e504bfe (diff) | |
From Marton Nemeth via bug 4163:
Add support for input URBs.
svn path=/trunk/; revision=30690
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 5e253e0c40..a0155b0db4 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -162,10 +162,14 @@ static const value_string usb_interfaceclass_vals[] = { static const value_string usb_transfer_type_vals[] = { - {URB_CONTROL, "URB_CONTROL"}, - {URB_ISOCHRONOUS,"URB_ISOCHRONOUS"}, - {URB_INTERRUPT,"URB_INTERRUPT"}, - {URB_BULK,"URB_BULK"}, + {URB_CONTROL, "URB_CONTROL out"}, + {URB_ISOCHRONOUS,"URB_ISOCHRONOUS out"}, + {URB_INTERRUPT,"URB_INTERRUPT out"}, + {URB_BULK,"URB_BULK out"}, + {URB_CONTROL | URB_TRANSFER_IN, "URB_CONTROL in"}, + {URB_ISOCHRONOUS | URB_TRANSFER_IN,"URB_ISOCHRONOUS in"}, + {URB_INTERRUPT | URB_TRANSFER_IN,"URB_INTERRUPT in"}, + {URB_BULK | URB_TRANSFER_IN,"URB_BULK in"}, {0, NULL} }; @@ -1775,6 +1779,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, switch(type){ case URB_BULK: + case URB_BULK | URB_TRANSFER_IN: { proto_item *item; @@ -1810,6 +1815,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, } break; case URB_CONTROL: + case URB_CONTROL | URB_TRANSFER_IN: { const usb_setup_dissector_table_t *tmp; usb_setup_dissector dissector; @@ -2091,7 +2097,7 @@ proto_register_usb(void) NULL, HFILL }}, { &hf_usb_transfer_type, - { "URB transfer type", "usb.transfer_type", FT_UINT8, BASE_DEC, + { "URB transfer type", "usb.transfer_type", FT_UINT8, BASE_HEX, VALS(usb_transfer_type_vals), 0x0, NULL, HFILL }}, |