Commit graph

132 commits

Author SHA1 Message Date
Bill Meier
df41b2aefa #include <epan/reassemble.h> not needed.
svn path=/trunk/; revision=47212
2013-01-22 15:55:59 +00:00
Anders Broman
ccb3fb14e2 From Michal Labedzki:
Bluetooth: Fix uninitialized fields on the USB side

Also make indentation/spaces cleanup in hci_usb dissector.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46341
2012-12-03 11:26:36 +00:00
Anders Broman
962aaf121f From Michal Labedzki:
PATCH] USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46306
2012-11-30 12:33:37 +00:00
Anders Broman
21abe5567c From Michal Labedzki:
USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol
 tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46283
2012-11-29 13:59:36 +00:00
Jeff Morriss
910097ffb6 Remove the second definition of a variable. Define an undefined variable.
svn path=/trunk/; revision=46282
2012-11-29 13:54:07 +00:00
Anders Broman
5a61f202d4 From Michal Labedzki:
USB: Add support for vendor and product names from
 usb.ids database

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46280
2012-11-29 13:39:08 +00:00
Anders Broman
a8b7b8b86c From Michal Labedzki:
USB: Update some descriptions found in USB 3.0
 specification

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46279
2012-11-29 13:29:50 +00:00
Guy Harris
1ce0f9234d "??" introduces a trigraph in C; escape "???" to avoid that.
svn path=/trunk/; revision=46256
2012-11-28 21:05:17 +00:00
Bill Meier
c1b6433dcf Fix a [-Wshadow] warning;
Also:
 - create/use several extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46253
2012-11-28 20:03:10 +00:00
Martin Kaiser
77db504364 From Tomasz Mon
handle USB string type descriptors with odd bLength
dissect them by omitting the last byte and report the illegal length

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7959

svn path=/trunk/; revision=45964
2012-11-07 22:17:10 +00:00
Anders Broman
416fe3bb5b From Steve Magnani:
Add display of (bInterfaceNumber.bAlternateSetting) and bInterfaceClass to the
root item of INTERFACE descriptor subtrees.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7957

svn path=/trunk/; revision=45930
2012-11-05 15:03:15 +00:00
Martin Kaiser
31f7fee054 From Steve Magnani
fix USB descriptor parsing

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7909

svn path=/trunk/; revision=45742
2012-10-23 21:02:28 +00:00
Evan Huus
d0183357dc From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7796
Add summary information to USB isodesc trees to make interesting descriptors
obvious to the user.

svn path=/trunk/; revision=45403
2012-10-08 19:31:17 +00:00
Evan Huus
dfd86092f2 Fix error caught by valgrind where we were running off the end of a
variable because we were passing the address of a single guint8 as a
char*. Work around it by making the guint8 an array and filling the last
element with 0 as if it were a null-terminated string.

svn path=/trunk/; revision=45339
2012-10-06 14:23:44 +00:00
Martin Kaiser
a0ce1f8fc2 try to fix usb-related fuzz test crashes
in dissect_usb_interface_descriptor() and
dissect_usb_endpoint_descriptor, the offset should be incremented
depending on the number of bytes we dissected, not based on the len
field (len field==0 would then cause an endless loop)

also fixed one occurrence of old_offset-offset, that's probably a typo,
the values will always be negative...

svn path=/trunk/; revision=45310
2012-10-04 15:37:38 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki
dee4443809 Add data parameter to dissector_try_heuristic
svn path=/trunk/; revision=44871
2012-09-11 08:26:48 +00:00
Michael Mann
1741731384 remove unnecessary underscores from display filters
svn path=/trunk/; revision=44181
2012-08-01 02:59:17 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Bill Meier
6fbb09d50b General Cleanup including:
- Remove unneeded #include <stdlib.h>;
- Remove "README.developer" comments;
- Reformat hf[] entries;
- Remove unneeded variable initialization;
- "localize" some variables;
- Whitespace/indentation/long lines/formatting
- (In one case) proto_tree_add_uint returns a proto_item* (not a proto_tree *);

svn path=/trunk/; revision=42678
2012-05-17 14:35:11 +00:00
Anders Broman
3b0c9892a0 From Steve Magnani:
Add decoding of fields within endpoint descriptor wMaxPacketSize

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7206

svn path=/trunk/; revision=42286
2012-04-27 08:44:36 +00:00
Alexis La Goutte
cba02e0a50 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=42165
2012-04-20 15:33:23 +00:00
pascal
e0e5b02bca From Johannes Stezenbach:
Use right value for SET_FEATURE request code
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7058

svn path=/trunk/; revision=42009
2012-04-10 16:05:52 +00:00
Jakub Zawadzki
80445e5a99 Fix off by one shift errors introduced in r39530 where it seemed proper[1]
[1] I'm unsure of packet-dtpt, so I haven't patch it.

svn path=/trunk/; revision=41873
2012-03-31 20:57:15 +00:00
Jeff Morriss
5629a3fa00 Fix fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6976 :

Don't assume that all responses have conversations to find.

svn path=/trunk/; revision=41726
2012-03-21 21:21:58 +00:00
Anders Broman
b971f1b1a0 From Steve Magnani:
USB: incorrect generated bInterfaceClass for composite device CONTROL transactions.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6964

svn path=/trunk/; revision=41715
2012-03-21 08:40:19 +00:00
Jeff Morriss
7bc574b776 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6963 :
Conversation address generation during processing of endpoint descriptors
is not being done in a manner consistent with that of general USB
packet dissection. I am not aware of any observable manifestation of this
bug.

svn path=/trunk/; revision=41634
2012-03-17 23:46:39 +00:00
Anders Broman
c00ca87104 From Steve Magnani: knock URB Setup out from under USB URB https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6934
svn path=/trunk/; revision=41492
2012-03-11 22:31:18 +00:00
Anders Broman
970272235d From martijn: subdissectors for URB_INTERRUPT. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6929
svn path=/trunk/; revision=41459
2012-03-10 16:16:07 +00:00
Anders Broman
f030f799bd From Steve Magnani: USB: centralize some common dissection code for class reuse. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6930
svn path=/trunk/; revision=41458
2012-03-10 16:09:28 +00:00
Anders Broman
9581065b3f USB: unknown GET DESCRIPTOR response triggers assert failure https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6826
svn path=/trunk/; revision=41388
2012-03-07 09:35:44 +00:00
Anders Broman
064276f53b From Steve Magnani: USB: incorrect decoding of Endpoint-targeted class-specific SETUP https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6910
svn path=/trunk/; revision=41371
2012-03-06 09:25:53 +00:00
Jeff Morriss
4289f6d7be Don't add an FT_BYTES with proto_tree_add_uint().
svn path=/trunk/; revision=41325
2012-03-02 22:24:12 +00:00
Alexis La Goutte
28f4c55b5b From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6873
USB: SETUP information can be added to incorrect tree

svn path=/trunk/; revision=41210
2012-02-27 16:48:29 +00:00
Anders Broman
416117f63a From Steve Magnani:
USB: Add dissection for Interface Association descriptor.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6842

svn path=/trunk/; revision=41157
2012-02-23 11:20:52 +00:00
Anders Broman
c36b0f1b03 From Steve Magnani:
USB: add infrastructure for dissecting class-specific descriptors.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6825

svn path=/trunk/; revision=40979
2012-02-12 07:18:05 +00:00
Anders Broman
75de89cd1b From Steve Magnani:
USB: support filtering of isochronous packets via usb.bInterfaceClass.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6824

svn path=/trunk/; revision=40973
2012-02-11 16:59:38 +00:00
Anders Broman
5da72b4d78 From Steve Magnani:
USB: Endpoint bmAttributes not decoded correctly.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6814

svn path=/trunk/; revision=40939
2012-02-08 20:21:44 +00:00
Chris Maynard
faf9175665 Add support for dissecting AT commands in USB URB_CONTROL packets. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6037
svn path=/trunk/; revision=40247
2011-12-19 23:44:01 +00:00
Bill Meier
54b72021bb Fix encoding arg for various fcn calls:
- proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64


svn path=/trunk/; revision=39539
2011-10-24 19:57:53 +00:00
Bill Meier
d7a1840204 Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.

svn path=/trunk/; revision=39530
2011-10-23 22:58:45 +00:00
Jeff Morriss
431332092d From Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6461 :
Register the USB dissector by name.

svn path=/trunk/; revision=39453
2011-10-18 01:05:57 +00:00
Bill Meier
67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Bill Meier
4e57694d4a Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
Bill Meier
94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Chris Maynard
3037a852a8 No need to check that usb_trans_info is not NULL here. The only way it could have been NULL is if se_alloc0() returned NULL, but then it would have already been dereferenced before now. Fixes Coverity CID 612, "REVERSE INULL".
svn path=/trunk/; revision=38417
2011-08-08 20:08:24 +00:00
Chris Maynard
261875b924 Allow both PPP and ISO/IEC 13818-1 over USB to be dissected using heuristics.
Resolves bug 4814.

svn path=/trunk/; revision=37039
2011-05-10 14:22:17 +00:00
Bill Meier
513a5f5154 Add #include <ctype.h> before #include "isprint.h";
Remove an unneeded line of code;
Do some indentation & whitespace cleanup.

svn path=/trunk/; revision=36785
2011-04-21 22:42:32 +00:00
Alexis La Goutte
0b097292d2 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36765
2011-04-21 13:45:14 +00:00
Alexis La Goutte
7e979f95aa Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36761
2011-04-21 13:34:43 +00:00