Commit Graph

56985 Commits

Author SHA1 Message Date
Martin Kaiser 4282304a57 set protocol to USBHID for get descriptor request and response
if they're dealing with HID descriptors

Change-Id: Ia529fe373653ddf18e05e8ad148a2f5b5686fa95
Reviewed-on: https://code.wireshark.org/review/7010
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:59:40 +00:00
Martin Kaiser 5457865be3 use the value string for HID descriptor type
Change-Id: I19544eeccd5206de88fe480f9b02bc57fcc278bd
Reviewed-on: https://code.wireshark.org/review/7009
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:48:34 +00:00
Martin Kaiser 1a5b5fa043 remove the offset parameter from dissect_usb_standard_setup_request()
Change-Id: Iaf339310c3b606885e945d10cffc1956ce24578a
Reviewed-on: https://code.wireshark.org/review/7008
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:43:22 +00:00
Martin Kaiser 8bf65168ad dissect a get descriptor request and response for the HID report descriptor
treat those two messages as class-specific control messages, handle them
inside the USB HID dissector

Change-Id: I42d201df4a8fdb94c947b6118c0b50945c306423
Reviewed-on: https://code.wireshark.org/review/7006
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:19:59 +00:00
Martin Kaiser 540347850f refactor the dissection of USB setup requests
pass the data only to one subsequent dissection function
either we have a standard request or a non-standard request that can be
handled by a class dissector (we used to do both at the same time,
this makes the output difficult to read)

Change-Id: Ia46239b2b9e121c9ca165cc56d0b271345d7962e
Reviewed-on: https://code.wireshark.org/review/7005
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:19:40 +00:00
Martin Kaiser a09765955c change try_dissect_next_protocol() such that its parameter is the
top-most tree on which it operates

this gives callers more control over where things are displayed

Change-Id: I8cdc07b4f3569bca728781fb709e2a2bb37c433b
Reviewed-on: https://code.wireshark.org/review/7004
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:19:23 +00:00
Martin Kaiser 1648d6e283 new function is_usb_standard_setup_request() to check if a request is a
standard setup request

it's not sufficient to look at the type bits in the request type field

use the new function where we checked the type bits before

Change-Id: I65b901dca91607a4dad4e4296b3f3a877aebf346
Reviewed-on: https://code.wireshark.org/review/7003
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-07 18:18:59 +00:00
Michal Labedzki 13f6bce802 Bluetooth: ATT: Use proto_tree_add_new_bytes for UUID128
Change-Id: I018b3e125bcbb6908276dd2b3b9f66def9aa745b
Reviewed-on: https://code.wireshark.org/review/6907
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:56:17 +00:00
Michal Labedzki 617c733b9f Add proto_tree_add_new_bytes()
Version to add as generated field, without tvb offset, length.

Change-Id: If4c7aebcbf1b47faa483bcbd40995eff3ccb99f0
Reviewed-on: https://code.wireshark.org/review/6906
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:56:05 +00:00
Bill Meier 722ce56cf0 btatt: fix bug ("Labeled code is unreachable");
Introduced in gca3fe28;
 Found by MSVC2013 Code Analysis

Change-Id: I4c754dfacca492b53debdaf82557e4fe91698460
Reviewed-on: https://code.wireshark.org/review/6991
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:53:57 +00:00
Michal Labedzki fb00452b30 Bluetooth/GUI: ATT: Add Server Attribute Table
It is a GUI+QT feature that introduce Bluetooth menu and
"ATT Server Attributes" that present all handle+UUID pairs
as table. User may copy cell value, row, selected rows or whole
table within header. On activate user will go to packet that
introduce UUID for specified handle.

Change-Id: If17e53aff5feb89ededc740a595ba5882b90be5e
Reviewed-on: https://code.wireshark.org/review/6911
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:35:39 +00:00
Michal Labedzki 2ff79ddeb2 Bluetooth: ATT: Fix Running Walking Sensor field name
Change-Id: I595c169e476cf86aa77ca926f4ce0d5d0e4aecd1
Reviewed-on: https://code.wireshark.org/review/7002
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:32:05 +00:00
Michal Labedzki 7610a69251 Bluetooth: ATT: Fix not missing break
"Break" is not missing, "error opcode" is part of opcode "Error Response"
that is needed to fetch request data.

Change-Id: I35432b22fae492a93332a8787213dd8fcf796e3b
Reviewed-on: https://code.wireshark.org/review/7001
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-07 16:31:51 +00:00
Alexis La Goutte 1eec03469d Bluetooth: ATT: Missing break in switch (CID 1268199)
Change-Id: I562f1b8c1d39586c2a3f25363e89e81587176c58
Reviewed-on: https://code.wireshark.org/review/6987
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-07 09:05:39 +00:00
Alexis La Goutte 1ecd0ad076 Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Id323b783e2931ad9b4e08727df91c8e0138d35c1
Reviewed-on: https://code.wireshark.org/review/6986
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-07 09:04:16 +00:00
Peter Wu 2c65b33b21 Fix RTP crash on RTP analysis attempt
The tap listener was handling rtpstream_tapinfo_t* types while other
users was expecting a GList* instead. Fix this and avoid future
confusion by replacing void* pointers.

Ping-Bug: 10714
Change-Id: I66f62eaaed4a529714264bbf4e7ad1e72b46ce5a
Reviewed-on: https://code.wireshark.org/review/6997
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-07 02:16:06 +00:00
Gerald Combs 6f22eb6f7f Qt: Fix coloring rules reordering.
Change-Id: I8bf36fffb3e3fc19c10c5f07db951cc5a4253556
Reviewed-on: https://code.wireshark.org/review/6998
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-07 00:44:08 +00:00
Gerald Combs c8cad99515 Qt: Add the Coloring Rules dialog.
Merge in the old ColorDialog which was a placeholder for
color_filter_add_cb.

Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10
Reviewed-on: https://code.wireshark.org/review/6996
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-07 00:30:30 +00:00
Gerald Combs b3f3dd8d82 Qt: Fix preference change behavior.
Main window:

Keep track of our current layout and only change it if the preferences
change. This keeps the panes from resizing.

Re-select the current packet if the layout changes so that the proto
tree and byte view aren't left in an invalid state. This fixes a crash
similar to bug 10896.

Search frame:

Get rid of an invalid error message. Update coding style.

I don't think any of these fix bug 10921 since Xiaochuan seems to get a
crash immediately upon opening the dialog.

Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4
Reviewed-on: https://code.wireshark.org/review/6989
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-06 23:23:02 +00:00
Bill Meier 3b3ce87899 qnet6: Fix a bug found by MSVC2013 Code Analysis.
wrongo:
  2 * 2 + 4 * 5 + (khdr.msgtype & QNET_KIF_CRED) ? (4 * 4 + 4 * 7) : 0

Change-Id: I79117a34528642a81d0c80427a8e41d733bef10d
Reviewed-on: https://code.wireshark.org/review/6995
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06 21:51:34 +00:00
Bill Meier ff6d503258 qnet6: Cleanup
- Remove some boilerplate comments;
- Use a consistent indent style (gnu);
- Use a consistent format for hf[] entries;
- Whitespace;
- Long lines;
- Rename a generic macro;

Change-Id: Ic2edcf8a8c0151d63a0d0ad901ddea9d7443ad19
Reviewed-on: https://code.wireshark.org/review/6994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06 21:50:47 +00:00
Bill Meier 49c27d3de9 cfdp: Fix bug ("Labeled code is unreachable")
Found by MSVC2013 Code Analysis

Change-Id: If8138ff3eab7daa1da728781314f8024e36545be
Reviewed-on: https://code.wireshark.org/review/6992
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06 21:22:22 +00:00
Jeff Morriss 501d996824 Further simplify the LSA-Update processing: the always-present forwarding block
can be considered TOS 0.

Use similar logic in LSA-Summary processing.

Ping-Bug: 6302
Change-Id: I0a74b95f6c4413ebce240e6e1b46c7e88311713a
Reviewed-on: https://code.wireshark.org/review/6951
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 17:30:59 +00:00
Alexis La Goutte 8b095bc25e Multicast Stream (GTK): fix crash when try to select a stream
Change-Id: Iaaa9445ae99b37cfb1865251d50f38375f3eb272
Reviewed-on: https://code.wireshark.org/review/6985
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 16:19:40 +00:00
Petr Gotthard 55eb35adc0 AMQP: Fix one warning from Clang Code Analysis
Since 'values' is always 'length/4', we can have it as 'gint' and avoid
the Clang warning concerning the while cycle.
>> cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]

Change-Id: I4342f9e3fcd5df7779f41414ab6f789fe402e3af
Reviewed-on: https://code.wireshark.org/review/6979
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-06 12:32:07 +00:00
Petr Gotthard eb855554b6 AMQP: Add more COL_INFO description for some packets/frames.
Change-Id: If70dc3972d99d34d8e37dd26045076e515fd4d2c
Reviewed-on: https://code.wireshark.org/review/6968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-06 12:30:02 +00:00
Jeff Morriss 0b0f7fa091 More emem removal.
Remove emem's 8-byte-memory-alignment configure check as well as references
to all the environment variables emem used.

Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66
Reviewed-on: https://code.wireshark.org/review/6950
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06 08:11:49 +00:00
Gerald Combs 881ff5df92 Remove gethostbyaddr and gethostbyaddr2.
They've been deprecated for a very long time. Replace them with
getaddrinfo. Note that we might not want to do synchronous name
resolution at all.

Add HAVE_GETADDRINFO to the KfW win-mac.h collision list.

Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c
Reviewed-on: https://code.wireshark.org/review/6958
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06 08:07:10 +00:00
Jeff Morriss d6ebb82ed2 (Trivial) Reformat some.
Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37
Reviewed-on: https://code.wireshark.org/review/6977
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-06 02:34:30 +00:00
Gerald Combs 61e3bdc7ce WSDG: Wrap a line.
Change-Id: I21e573c3800a245cbdae4fcb4d4cfaf36f3a0abd
Reviewed-on: https://code.wireshark.org/review/6976
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-06 00:59:46 +00:00
Pascal Quantin 3badc30396 QNET6: do not use col_set_str with non constant strings
Change-Id: I63e965d819413299bf3e9a400b80ded23225598a
Reviewed-on: https://code.wireshark.org/review/6975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-05 22:22:38 +00:00
cbontje b3e82690a6 SEL Protocol Maintenance (2/2)
- Complete internal cleanup of 'fastser' -> 'fastmsg' syntax
- Includes all variables, comments and filter values

Change-Id: Ib58e470c9552387cb8c1d8c68fa1574cf7aa1691
Reviewed-on: https://code.wireshark.org/review/6974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-05 22:08:17 +00:00
Pascal Quantin 1fdc6f409f QNX6: avoid deferencing a null pointer
Bug: 10920
Change-Id: Ibf3539c188431d2514c523c094d1e2d86b77f0b5
Reviewed-on: https://code.wireshark.org/review/6967
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-05 20:07:46 +00:00
cbontje 3f480c6cd3 The 'mbrtu' dissector should be registered with RTAC Serial, not the 'modbus' one.
(This error was missed by me when confirming recent changes to the RTAC
serial dissector and fixes decoding of RTAC serial Modbus captures.)

Change-Id: I2df609f88263e90ae4815722ff76b6a0b988a01e
Reviewed-on: https://code.wireshark.org/review/6973
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-05 20:07:13 +00:00
Guy Harris 99761aab16 Remove endif() left over from previous change.
Change-Id: Ia5781bcb55b2cf2e5ab2bc8c6587348ffe62a5c2
Reviewed-on: https://code.wireshark.org/review/6972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-05 19:05:06 +00:00
Guy Harris 572b30a00b Get rid of the temporary OS X-specific hack.
Hopefully Gerald's change will fix this annoyance once and for all.

Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f
Reviewed-on: https://code.wireshark.org/review/6971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-05 18:23:46 +00:00
Gerald Combs d1380119d4 WSDG: Fixup admonition block formatting.
We tend to clobber the reader with admon blocks. Make the preceding and
succeeding ones normal paragraphs.

Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f
Reviewed-on: https://code.wireshark.org/review/6970
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-05 17:50:45 +00:00
Gerald Combs 410a8d1cab CMake: Make copy_data_files depend on html_docs.
Semi-blind attempt to fix what appears to be a race condition on the OS
X x86 buildbot.

Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec
Reviewed-on: https://code.wireshark.org/review/6969
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-05 17:30:46 +00:00
Richard Sharpe dff82e6034 Update the Windows build documentation with some common traps that stop people
from building as well as a hint about downloading the vcredist_xYY.exe file.

Change-Id: I6ae9a045939a77ba2c9584f05124fdc8f355f11c
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6916
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-05 16:16:52 +00:00
AndersBroman 48aa669528 CAPWAP: Fix a typo.
Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2
Reviewed-on: https://code.wireshark.org/review/6966
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05 09:19:46 +00:00
Alexis La Goutte fb9dc13fb6 MySQL: fix assert when the Connect Attrs capability is set, but no attributes
From
<http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse>
(emphasis mine):

Starting with MySQL 5.6.6 the client **may** send attributes if CLIENT_CONNECT_ATTRS is set:

Does this mean that the capability *may* be set, but the list of attributes can be empty?

Issue reported by Peter Wu

Ping-Bug:10351
Change-Id: Ib83c27f4a15341f791c443471d7a3bdbd942aef4
Reviewed-on: https://code.wireshark.org/review/6965
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05 08:53:00 +00:00
Evan Huus 2bcd38fec4 ethercat: add default case in FoeFormatter
Should probably fix an unintialized memory access caught by valgrind, although I
can't reproduce it because out-of-tree plugins are still broken.

Bug: 10919
Change-Id: Ib8c46e13922f25260ca0e8886368f5ce24e3d0b0
Reviewed-on: https://code.wireshark.org/review/6962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05 08:51:44 +00:00
Alexis La Goutte 8bad9edf06 CAPWAP : fix warning about wrong type after proto_tree_add_bitmask(_with_flags) change
Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type
Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type
...

Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e
Reviewed-on: https://code.wireshark.org/review/6964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05 08:51:20 +00:00
Alexis La Goutte 8ffaec90d4 CAPWAP: Don't try to dissect fragment packet (Only display are "Data")
Issue reported by Massimo Vellucci

Bug:10918
Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8
Reviewed-on: https://code.wireshark.org/review/6963
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05 08:49:43 +00:00
Guy Harris 5b6252654f OK, try cmake -E copy.
It didn't fail with cp, so maybe that's just random luck, or maybe the
built-in copy functions have an issue, or maybe just copy_if_different
has an issue (64-bit inode number issues?).  Try just copy, and see what
happens.

Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e
Reviewed-on: https://code.wireshark.org/review/6961
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-05 00:47:53 +00:00
Guy Harris a2e48c64e7 On OS X, temporarily use cp to install some files.
The 32-bit OS X build is failing rather often due to cmake -E
copy_if_different failing to copy wireshark.html, and to call cmake's
copy functions completely crappy at reporting errors is to insult
software that's merely completely crappy at reporting errors.  Try using
cp in the hopes that it'll actually tell us *WHY* the copy is failing
and see if we can fix it.

Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba
Reviewed-on: https://code.wireshark.org/review/6960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-04 23:57:04 +00:00
Pascal Quantin 86d24b0486 LPP: upgrade dissector to v12.3.0
Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe
Reviewed-on: https://code.wireshark.org/review/6959
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-04 22:47:34 +00:00
Gerald Combs 40d06bd6ea Don't clobber PROJECT_VERSION_EXTENSION.
PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake.
Try to preserve it if it's set.

Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59
Reviewed-on: https://code.wireshark.org/review/6957
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04 21:09:13 +00:00
Gerald Combs 52b4059b11 1.99.2 → 1.99.3.
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638
Reviewed-on: https://code.wireshark.org/review/6956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04 21:03:24 +00:00
Gerald Combs b2db3bfd3b Build 1.99.2.
Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d
Reviewed-on: https://code.wireshark.org/review/6955
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04 19:03:39 +00:00