diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-20 18:01:35 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-21 02:03:01 +0000 |
| commit | a299e69bb2be8e0532d190bd925b89d91487bc07 (patch) | |
| tree | 681638b961143af98cfc36ad6fc85d3e102f6b1d /epan/dissectors/packet-usb.c | |
| parent | 3514a5a11bed8f3ab2443ed191564f1a8ac27b55 (diff) | |
No need to export the 48-byte-header Linux USB dissector.
Nobody looks it up, so just register it in the wtap_encap table, as we
do with the 64-byte-header Linux USB dissector, the USBPCAP dissector,
and the FreeBSD USB dissector.
Change-Id: I5da098d799a63449f17a26924b3ba2de36536896
Reviewed-on: https://code.wireshark.org/review/14046
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-usb.c')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index bac019a17e..78c1db3238 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -267,8 +267,6 @@ static const int *usb_usbpcap_info_fields[] = { static int usb_tap = -1; static gboolean try_heuristics = TRUE; -static dissector_handle_t linux_usb_handle; - static dissector_handle_t data_handle; static dissector_table_t usb_bulk_dissector_table; @@ -5184,7 +5182,6 @@ proto_register_usb(void) proto_usb = proto_register_protocol("USB", "USB", "usb"); proto_register_field_array(proto_usb, hf, array_length(hf)); proto_register_subtree_array(usb_subtrees, array_length(usb_subtrees)); - linux_usb_handle = register_dissector("usb", dissect_linux_usb, proto_usb); expert_usb = expert_register_protocol(proto_usb); expert_register_field_array(expert_usb, ei, array_length(ei)); @@ -5226,12 +5223,14 @@ proto_register_usb(void) void proto_reg_handoff_usb(void) { + dissector_handle_t linux_usb_handle; dissector_handle_t linux_usb_mmapped_handle; dissector_handle_t win32_usb_handle; dissector_handle_t freebsd_usb_handle; data_handle = find_dissector("data"); + linux_usb_handle = create_dissector_handle(dissect_linux_usb, proto_usb); linux_usb_mmapped_handle = create_dissector_handle(dissect_linux_usb_mmapped, proto_usb); win32_usb_handle = create_dissector_handle(dissect_win32_usb, proto_usb); |