Commit Graph

35 Commits

Author SHA1 Message Date
João Valverde 8198dd51cd pre-commit: Add an exception to duplicate filter name check 2022-02-15 11:38:16 +00:00
Georg Richter 2f1cf93174 MySQL: Added support for MariaDB protocol
MariaDB and MySQL are not longer drop-in compatible, they differ in very
different directions
for protocol and api. This patch contains support for MariaDB specific
commands and extensions:

- MariaDB specific character sets and collations (also updated MySQL
collations)
- MariaDB extended capabilities in greeting and login packets
- Support for MARIADB_STMT_BULK_EXECUTE command
- Removal of "5.5.5-" prefix in the version string.
2020-09-08 09:02:02 +02:00
Gerald Combs 43b5c63aea Tools: Use better terminology.
"Allowed" is a perfectly fine, non-biased word for designating things
that are allowed.

Change-Id: Ia1e0642a073210f0475fba3d437eac654ec36cb5
Reviewed-on: https://code.wireshark.org/review/37397
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-08 05:06:10 +00:00
Joakim Karlsson 5ffeabc8ce pfcp: Update to 3GPP TS 29.244 V16.2.0 part3
Change-Id: Id6c50426a586405db9f15bf16bc6b6d503b9848e
Reviewed-on: https://code.wireshark.org/review/35844
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-17 09:04:04 +00:00
Dmitry Linikov 22fd28940a packet-ieee1722: Added TSCF and NTSCF control frames support
Only CAN, CAN_BRIEF and LIN messages supported.

Change-Id: Id79574bcdab9f1ec66390357dd5860c73f194ccc
Reviewed-on: https://code.wireshark.org/review/31765
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-22 10:32:36 +00:00
Guy Harris 2e3dcd479e Fix dissection of gatewayed/bridged LLAP packets.
EtherTalk and TokenTalk frames use LLC/SNAP headers with an OUI of
08:00:07 and a PID of 0x809B.

Frames with an Ethertype of 0x809B - either as the Ethertype field of an
Ethernet frame or as the PID, in combination of an OUI of 00:00:00, of
an LLC/SNAP frame - have an LLAP frame, complete with an LLAP header, as
the payload.

Don't treat 08:00:07 as a special case - register it as an OUI and give
it a dissector table, and register the DDP dissector in that dissector
table with ETHERTYPE_ATALK.  Register the LLAP dissector in the
"ethertype" table with the Ethertype ETHERTYPE_ATALK.

This means we now have two separate LLC+SNAP PID tables for Apple; name
them appropriately.

That also means we need to add packet-atalk.c to the list of files
allowed to add "llc." named fields.

Change-Id: I00bafd692f83f73bd347628cb9e950863c26a2b7
Reviewed-on: https://code.wireshark.org/review/33125
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09 04:27:52 +00:00
Milan Stute 6f2ca96359 Add Apple Wireless Direct Link (AWDL) dissector
More information on Apple's proprietary AWDL protocol can be found in
  Milan Stute, David Kreitschmann, and Matthias Hollick. "One Billion Apples'
  Secret Sauce: Recipe for the Apple Wireless Direct Link Ad hoc Protocol"
  in ACM MobiCom '18. https://doi.org/10.1145/3241539.3241566

Bug: 15245
Change-Id: I5ce18125b3c957f338909e46f18e30405a3d3941
Reviewed-on: https://code.wireshark.org/review/30413
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29 22:12:42 +00:00
Michael Mann 7e842fa551 F5ETHTRAILER: Initial cleanup from submission
The dissector had been a plugin since at least 1.3 (based on comments in the
dissector).  Not all of the most current APIs were used for functionality
and there was some cruft left over.
Also disable F5ETHTRAILER by default since it doesn't have a discriminating
heuristic.

Change-Id: I8c977167a906eafd6fbb663d2fe6c44f080f2209
Reviewed-on: https://code.wireshark.org/review/26428
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11 15:08:16 +00:00
Joerg Mayer 68efae8588 Adapt to current WS code base to make it compile and run without warnings or errors
Change-Id: I135df8b0e49346e32a19620d52cd1a9a44b4ac08
Reviewed-on: https://code.wireshark.org/review/26426
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-11 11:17:47 +00:00
Dario Lombardo fe71e26af2 spdx: more licenses converted.
Change-Id: I3861061ec261e63b23621799e020e811ed78a343
Reviewed-on: https://code.wireshark.org/review/26333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07 15:56:44 +00:00
Lazar Sumar 0d5cbc7303 Added the Proconx CAN-ETH protocol dissector
Change-Id: I306341c7cddf8facb4a9ca62254a465a1da22174
Reviewed-on: https://code.wireshark.org/review/25423
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-26 03:19:50 +00:00
Nathaniel Clark 958374f352 [lustre] Initial Lustre support
This interperates the main body of Lustre traffic.
This dissects all current Lustre OPCODES (as of Lustre 2.10.2)
This dissects MDS REINT sub-opcodes
This dissects LDLM Intent opcodes
This dissects LLOG EADATA

Conversation matching is just IP based and not IP/port based.
Only one lustre "instance" can be running on a given host at a given time,
and request / reply pairs aren't don't always match by port numbers.

Add exception for lustre_* structure names in PROTOABBREV.
We have several lustre.lustre_* because the internal lustre structre is
named lustre_ (i.e. lustre_handle or lustre_msg_v2)

This is still a work in progress, as there are missing FLAG values
and some LLOG EADATA structures that aren't fully decoded.

Change-Id: If57085e2692565336e49f40fb475ca1035da7a35
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24800
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 06:38:05 +00:00
Michael Mann d2e7e0b519 Allow proto_register_protocol_in_name_only values to be used as valid hf_ field prefixes.
Change-Id: Ic9998d1f8c6719c7cba78966691295ff9ffbc12a
Reviewed-on: https://code.wireshark.org/review/21612
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 03:05:59 +00:00
Robert Cragie 14ba81598d MLE and Thread: Additional dissectors
Additional dissectors for Mesh Link Establishment (MLE) and Thread CoAP
TMF messages. MLE is also used in ZigBee IP.

Change-Id: I5b9c224d7df48855b79ccac67dca7661a51d0a9b
Bug: 13495
Reviewed-on: https://code.wireshark.org/review/20594
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-10 20:34:34 +00:00
Michal Labedzki 5df6983486 checkfiltername: Add llc.bluetooth_pid to the whitelist
"llc.bluetooth_pid" is now placed in bluetooth-file, it seems to be
fine, but there is a need to avoid terrible/horrible scream from
this script.

Change-Id: I0bf3f5b5f6459ab1f13a8c2c6ad12859af608e85
Reviewed-on: https://code.wireshark.org/review/19969
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06 12:41:53 +00:00
João Valverde c6e981bcff checkfiltername.pl: Don't print empty line on successful run
Change-Id: I3915a5771786bc763747ed74fadede15353fdf40
Reviewed-on: https://code.wireshark.org/review/13165
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-10 18:43:53 +00:00
James Lynch 77f2ae0ce7 eCMP Dissector - Extensible Control & Management Protocol
Developed by Emerson Industrial Automation (Control Techniques Division)
eCMP is a protocol for setting up and controlling the devices in a factory
automation system. eCMP has about 30 commands; most are embedded into TCP/IP
messages, but cyclic data messages use the UDP protocol.

Bug: 10562
Change-Id: I9a421f39dfbdbc9e28d8f7cba72c22e270064641
Reviewed-on: https://code.wireshark.org/review/3157
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-02 01:25:52 +00:00
Michael Mann a25c46bc7b Remove proto_tree_add_text from some dissectors.
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc
Reviewed-on: https://code.wireshark.org/review/8654
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:20:46 +00:00
Michael Mann 6f8de873c7 Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)
Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45
Reviewed-on: https://code.wireshark.org/review/5943
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21 12:57:58 +00:00
Michael Mann 577e6a133c Allow "cba" filter prefix for hf_ fields. Seems like something with "pn" or (abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check.
Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a
Reviewed-on: https://code.wireshark.org/review/5838
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-18 19:45:33 +00:00
Chris Brandson df639f509e Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.
Removed attrID and cmdID ZCL cluster functions.
Bug in ZCL HVAC attribute registration.
Fixed bug in ZCL command ID field registration.
Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014
Fixed broken fragmented ZigBee packet collection and reassembly
Use protocol fields for Thermostat schedule transitions.
Added support for Key Establishment Cluster (CBKE) at SE 1.2a
Updated Message cluster to SE 1.2a spec
Added attribute reporting status which is common to all SE 1.2a clusters
Added SE 1.2a tunnel cluster support
ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences
The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance
ZigBee security added key display for decrypted packets
ZigBee Security Preferences fixed UAT type for Label so key label is editable again
Added definition for Retail Service profile
Added dissection for profile-wide (General Command Frame) commands when the profile is unknown
Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files

Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad
Reviewed-on: https://code.wireshark.org/review/5565
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17 11:53:26 +00:00
Michael Mann 86c659c272 Improve checkfiltername.pl for pre-commit script.
1. Bugfix grep statement checking if file is "autogenerated"
2. Add to the list of "whitelist" duplicates.  Many more were found after #1 was changed.

Change-Id: Idea764c0c8b5fa4f30c9acaab9ba10340834d4f5
Reviewed-on: https://code.wireshark.org/review/5547
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-01 05:43:25 +00:00
Michael Mann 570df7592d Add checkfiltername.pl to pre-commit script
Change-Id: I34d8aa7034a4aacc2a95b35a30f25356b33a51b9
Reviewed-on: https://code.wireshark.org/review/5187
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-08 07:23:42 +00:00
Michael Mann 09cdfe851e Fix all remaining filter name errors found with checkfiltername.pl
This should make it possible to add checkfiltername.pl to the pre-commit script.

Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
Reviewed-on: https://code.wireshark.org/review/5166
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-07 05:25:53 +00:00
Bill Meier 1b3bc9b71e checkhf.pl: (Trivial) remove trailing whitespace.
Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33
Reviewed-on: https://code.wireshark.org/review/3879
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-27 16:18:34 +00:00
Michael Mann df93705cc2 Improve the tolerance of checkfiltername.pl so it can be added to the pre-commit script.
1. Correctly identify ASN.1 dissectors (so checkfiltername.pl can be more lenient on them)
2. "Whitelist" known (good) filters

Change-Id: Iea662190b6655a1919bf08bc35e7978eb2693509
Reviewed-on: https://code.wireshark.org/review/2453
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20 04:04:13 +00:00
Michał Orynicz 94dcbfd9ac Fix annoying warnings that a variable is uninitialized in checkfiltername.pl
Change-Id: Ibb291747570e48af6306357cc13fd3a149ca88c9
Reviewed-on: https://code.wireshark.org/review/2071
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-10 14:15:32 +00:00
Jeff Morriss 82e2865739 Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention.

Don't regenerate anything now.

Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14 01:35:57 +00:00
Michael Mann 9822a1f00a Add support for filterable expert info fields. Statistics don't separate out the expert info fields from the hf_ fields because we're really just looking for display filter name errors, regardless of source.
svn path=/trunk/; revision=50398
2013-07-06 02:52:16 +00:00
Michael Mann 64d81e7477 Check for PFNAME #define as it is a common substitute for a literal string for the proto filter name and consider it the proto filter name.
Ignore "duplicates" that are generated because a display filter is prefixed by a #define (which checkfiltername.pl is not smart enough to handle), causing an empty string

svn path=/trunk/; revision=44654
2012-08-24 03:05:05 +00:00
Michael Mann 8242949ebc Allow proto filter names to have a period in them and allow display filter names to use any period separated value as a prefix. For example "gmr1.foo.bar" would allow "gmr1", "gmr1.foo" and "gmr1.foo.bar" as valid prefixes. Otherwise it will be flagged as a possible error.
Also added a "FILE TYPE" for proto filter names with a period so that they can be verified.  Presumably only "large", possibly "meta" protocols (probably spanning multiple dissector files) will be allowed to use a period in the proto filter name.

svn path=/trunk/; revision=44648
2012-08-23 21:31:20 +00:00
Michael Mann 65379209d6 Add support for (ignoring) idl2wrs generated dissectors.
Add commandline options to show file line numbers of dissectors.  The default is to have no line numbers shown as its easier to compare results without a minor file change causing the line number of the filter to change resulting in an unnecessary difference.
Add commandline option to check filter names of automated files (default disabled).
Check for underscores prefacing or following a period in filter names as this is probably a typo.
Cleaned up output when checking a single file.

svn path=/trunk/; revision=44182
2012-08-01 03:10:34 +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
Chris Maynard fc83c4cfc7 Fix SVN Id.
svn path=/trunk/; revision=38412
2011-08-08 17:47:05 +00:00
Chris Maynard 237cfb674f From Michael Mann via bug 2794: A Perl script to expose "questionable" display filter field names.
svn path=/trunk/; revision=38411
2011-08-08 17:42:26 +00:00