unbreaking the usb dissector

since dlt189 was introduced   the dissector has been suboptimal


assuming the capture   usb_memory_stick.pcap on the wiki shows what this linktype
should look like, this patch
- adds request in/response in/time  generated fields to the dissect pane
- fixes the tracking of what is a request and what is a response (the old code just can not have worked!)
- fixes conversation tracking to work (dont add the port/endpoint into the length of the address)
- handles some mysterious extra 8 bytes prepended to a lot of different packets.



svn path=/trunk/; revision=21173

1 files changed, 2 insertions, 1 deletions

diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h
index fc9cc1e740..ace2084868 100644
--- a/epan/dissectors/packet-usb.h
+++ b/epan/dissectors/packet-usb.h
@@ -25,11 +25,11 @@
 #define __PACKET_USB_H__
 
 typedef struct _usb_address_t {
+#define USB_ADDR_LEN (sizeof(guint32)) /* size of the device field */
     guint32 device;
     guint32 endpoint;
 } usb_address_t;
 
-#define USB_ADDR_LEN (sizeof(usb_address_t))
 
 typedef struct _usb_conv_info_t usb_conv_info_t;
 
@@ -37,6 +37,7 @@ typedef struct _usb_conv_info_t usb_conv_info_t;
 typedef struct _usb_trans_info_t {
     guint32 request_in;
     guint32 response_in;
+    nstime_t req_time;
     guint8 requesttype;
     guint8 request;
     union {