Commit Graph

55 Commits

Author SHA1 Message Date
Pascal Quantin fa58d578f7 NAS EPS: upgrade dissector to v17.7.0 2022-09-23 19:41:07 +02:00
Anders Broman 1694820e84 GTPv2: Update IE 8.12 Indication 2020-12-17 12:35:01 +00:00
Martin Mathieson 3b67c5b308 TFS: Add some commonly-defined string pairs to tfs.c
'check_tfs.py --common'    can look for tfs values that appear multiple times.
Current output prior to these dssector changes was:

('No Extension', 'Extension') appears 3 times in:  ['epan/dissectors/packet-bssap.c', 'epan/dissectors/packet-camel.c', 'epan/dissectors/packet-gsm_map.c']
('Optimised for signalling traffic', 'Not optimised for signalling traffic') appears 3 times in:  ['epan/dissectors/packet-gsm_a_gm.c', 'epan/dissectors/packet-gsm_map.c', 'epan/dissectors/packet-gtp.c']
('Data PDU', 'Control PDU') appears 3 times in:  ['epan/dissectors/packet-pdcp-lte.c', 'epan/dissectors/packet-pdcp-nr.c', 'epan/dissectors/packet-rlc-nr.c']
('Message sent to originating side', 'Message sent from originating side') appears 3 times in:  ['epan/dissectors/packet-q2931.c', 'epan/dissectors/packet-q931.c', 'epan/dissectors/packet-q933.c']
('User', 'Provider') appears 3 times in:  ['epan/dissectors/packet-q2931.c', 'epan/dissectors/packet-q931.c', 'epan/dissectors/packet-q933.c']

The first and last ones were made common, the others seem a little too specialised.

Checking some of the existing items in tfs.c (using QtCreator's 'Find Usages'),
some of the common items are used a lot, but many of them are not referenced.

Change-Id: Ia4006d2c4fa7cafbc3b004dc7a367a986dbeb0c4
Reviewed-on: https://code.wireshark.org/review/38177
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-17 02:58:01 +00:00
Jaap Keuter 0eb92d7aa0 Document unit string and true false string helper functions
Provide Doxygen comment blocks for unit string and true false string
helper functions.

Change-Id: I70801561e9cd3ead5e3417ea9d297d828105f3d0
Reviewed-on: https://code.wireshark.org/review/36968
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-29 10:07:51 +00:00
Uli Heilmeier 99ecab4122 New dissector: Dynamic Link Exchange Protocol
Code based on https://github.com/mit-ll/dlep-wireshark-dissector
authored by Jeffrey Wildman <jeffrey.wildman@ll.mit.edu>

Updated types according to
https://www.iana.org/assignments/dlep-parameters/dlep-parameters.xhtml

Changed:
* removed some tvb_get_*() calls
* updated expert info handling
* changed registering the dissector

Sample capture:
https://wiki.wireshark.org/SampleCaptures#Dynamic_Link_Exchange_Protocol_.28DLEP.29

Change-Id: I13e0c918f46af036c1be4acf34acab838aeaf342
Reviewed-on: https://code.wireshark.org/review/36901
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-28 06:13:10 +00:00
Jaap Keuter 9750d00ff1 Introduce tfs_get_string helper
true_false_strings have no helper function to properly retrieve the
string representing the true or false value, much like unit_strings,
even though this is not uncommon in dissectors.
This change introduces the helper function and modifies the dissectors,
so that they use this helper i.s.o. their own expressions.

Change-Id: I477ed2d90a9a529fc5dcfef7e3ea42ec180d27ae
Reviewed-on: https://code.wireshark.org/review/36920
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-25 04:39:46 +00:00
Anders Broman afeec6d646 NAS-5GS: Dissect more IEs
- 9.11.3.50A   SMS indication
- 9.11.3.51    SOR transparent container

Change-Id: I12bcb1ab1a94eb4fff1673979ff2862a2ec62654
Reviewed-on: https://code.wireshark.org/review/31839
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-31 14:39:49 +00:00
Anders Broman 03e1efd6fe NAS-5GS: Dissect more V15.2 IE's
Change-Id: I654b537b22776a599e4f2b2260c028d76ba5dfc2
Reviewed-on: https://code.wireshark.org/review/31805
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-30 09:13:48 +00:00
Taisuke Sasaki 5bef36f153 ISIS: Add Prefix Attribute Flags TLV (rfc7794)
Fix according to review 31069

Change-Id: I03552eaba434597386d8bf386117a3366f2c3446
Reviewed-on: https://code.wireshark.org/review/31101
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 06:11:50 +00:00
Robert Sauter fc6b725b18 tfs: Add high_normal and low_normal
Change-Id: Ie56e3546fc1bc5da61f95456e15544a2880c819d
Reviewed-on: https://code.wireshark.org/review/26418
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11 02:42:41 +00:00
Pascal Quantin 957b4a67ef Add tfs_activated_deactivated
Change-Id: I383ee93ec2a06ed2c2d07b702436035566591348
Reviewed-on: https://code.wireshark.org/review/26413
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-10 14:15:37 +00:00
Dario Lombardo 55c68ee69c epan: use SPDX indentifiers.
Skipping dissectors dir for now.

Change-Id: I717b66bfbc7cc81b83f8c2cbc011fcad643796aa
Reviewed-on: https://code.wireshark.org/review/25694
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08 19:29:45 +00:00
Pascal Quantin 03f9bd4091 MAC LTE: upgrade dissector to v14.3.0
Change-Id: Icd3b12b7d89df2050b9365b9b173949a7cdc455a
Reviewed-on: https://code.wireshark.org/review/22928
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-02 17:34:19 +00:00
Michael Mann ac0af07083 ENIP: Add support for CIP Security Information in ListIdentity
Add tfs_open_closed to general tfs collection (tfs.[ch])

Change-Id: I79b22b591128c33084489880842e19e9a0d80560
Reviewed-on: https://code.wireshark.org/review/22730
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>
2017-07-21 06:53:09 +00:00
Chris Brandson ee7d2a6010 ZigBee make ZCL Frame Control direction more descriptive
Using just client or server as a direction is a source of confusion so made a more
discriptive item

Change-Id: I8675aba555b04f6ae8848cf9e1c720eb4b44b553
Reviewed-on: https://code.wireshark.org/review/22628
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-19 03:50:04 +00:00
Pascal Quantin 0d1ea58e31 NAS EPS: upgrade dissector to v14.4.0
Change-Id: I8b0ae56889f6a52ba7d8c0c95a6b8e6a31557fa3
Reviewed-on: https://code.wireshark.org/review/22601
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-13 04:07:40 +00:00
Alexis La Goutte 91a49173ee tfs: Add up down
Change-Id: Ifb7354bbbc639b4191f611c7840094f16e1f6819
Reviewed-on: https://code.wireshark.org/review/22566
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>
2017-07-09 17:50:35 +00:00
Jonathan Munoz a3b47316eb 6LoWPAN: added dissection for 6LoRH. (RFC8138, RFC8025)
Change-Id: I13396077ec7f3ec4fe9cfea9b3bd03305a5ee332
Reviewed-on: https://code.wireshark.org/review/22484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-08 21:41:02 +00:00
Mike Morrin 006d9821f6 Adding a dissector for the Distributed Object Framework protocol.
The DOF is part of the open-source OpenDOF Project,
more information at https://opendof.org

There is a sample capture file (with encryption keys) at
https://wiki.wireshark.org/SampleCaptures#DOF_.28Distributed_Object_Framework.29_Protocols

Change-Id: I8d8ce3edf39904d0467a403157f9de2d2a165e90
Reviewed-on: https://code.wireshark.org/review/14394
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>
2016-04-14 12:27:24 +00:00
Victor Dodon c480652da9 bootp: Add support for iSNS (RFC4174) dissection
Change-Id: I2d1807e631991d4115ca33d351e85c36272c209b
Reviewed-on: https://code.wireshark.org/review/14523
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>
2016-03-26 19:05:07 +00:00
Michal Labedzki cbda60f7f5 Bluetooth: GATT: Add support for OTS/OTP
OTS/OTP is the newset "profile" announced by Bluetooth SIG.
It name describe what it doing: Object Transfer Service/Profile,
so it is something like OPP.

While we are at this move some HID attributes to get right
order in switch-case.

Change-Id: I460963a422c7292b2cabf7e88f32dbd6e8d7051f
Reviewed-on: https://code.wireshark.org/review/13735
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-02-06 11:52:26 +00:00
Martin Kaiser c8c8eefb47 zvt: handle multi-byte tags
and dissect the components of a tag
add a global true-false string for constructed vs. primitive

Change-Id: If10ecf97cde59e2be9ff5e3163073f6d14e6c61e
Reviewed-on: https://code.wireshark.org/review/9636
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-07-15 20:15:55 +00:00
Amine Kherbouche 2a5a560a64 VXLAN: Add Group Based Policy dissector
According to some advices from my last commit,i made some changes, and i
use proto_tree_add_bitmask for bits field.

Editing VXLAN dissector for supporting GBP extension described in the
following draft link :
https://tools.ietf.org/html/draft-smith-vxlan-group-policy-00

This pach works fine with "old" version of VXLAN (no GBP support)

The flags are now extended to 16 bits to support GBP extension, Group
Policy Id is on 16 bits, VNI always on 24 bits and remaining bits are reserved.
The following bits are defined in addition to the existing VXLAN fields:
	bit 0 : "G" Group Based Policy Extension bit
	bit 9 : "D" Don't Learn bit
	bit 12 : "A" Policy Applied bit
	the remaining bits are reserved

Bug: 11348
Change-Id: I425ed63cf76f134eb3d1680a1753ed31f252dfa8
Signed-off-by: Amine Kherbouche <amine.kherbouche@6wind.com>
Reviewed-on: https://code.wireshark.org/review/9537
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-07-09 20:28:11 +00:00
Alexis La Goutte 5a4f44a93e TFS: Mutualize Response/Request TFS
move tfs_response_request to epan/tfs.[ch] and use this

Change-Id: I29d5894fade721b5234649a7c2d83dd1d6a19a0d
Reviewed-on: https://code.wireshark.org/review/8930
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15 19:55:58 +00:00
Gerald Combs ec3f923e3e Add the Display Filter Expression dialog.
Changes from the GTK+ UI:
- The display filter is built on the fly with immediate syntax feedback.
- Slightly different layout.
- You can search for fields.

Make the plain SyntaxLineEdit a bit more plain.

Bug: 11128
Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7
Reviewed-on: https://code.wireshark.org/review/8742
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-06-03 02:27:00 +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 f5ed47dbbc Eliminate proto_tree_add_text from packet-q933.c
Change-Id: If5b85609d3daaf66cbcc15e3127af4e7f5736e52
Reviewed-on: https://code.wireshark.org/review/4995
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 20:53:52 +00:00
Michael Mann 371e4ae1c7 Eliminate some proto_tree_add_text from GSM dissectors (so now there are no dissectors with 100+ proto_tree_add_text calls).
Add tfs_allocated_by_receiver_sender to tfs.h because it seems "popular" enough.

Change-Id: I478461d9b951a2c3e3aec6aaf996d95ba2c0feee
Reviewed-on: https://code.wireshark.org/review/4708
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-10-15 19:16:37 +00:00
Michael Mann a9e6c2c917 Overhaul the filterability of packet-ansi_683.c
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl.  Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector.  That started the cleanup, and I did more while in the neighborhood.

Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
Reviewed-on: https://code.wireshark.org/review/4521
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 21:14:28 +00:00
AndersBroman 5b5d9a87c8 Add two new true_fals strings.
Change-Id: I43440ef6fac1a0c01eec630d2238fcfb085255a5
Reviewed-on: https://code.wireshark.org/review/3471
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07 13:34:29 +00:00
Michael Mann 4e5424af52 packet-q931.c: proto_tree_add_text -> something filterable.
Change-Id: I576f8d7fcf01a4c1dc6e486f7dd0a5b46edce502
Reviewed-on: https://code.wireshark.org/review/1935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04 04:21:29 +00:00
Sean O. Stalley 33ae4cb024 Fixed mausb valid bit & added invalid_valid TFS
Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit
is active low (ie: valid = 0, invalid = 1).

I noticed Some other dissectors also defined an tfs_invalid_valid,
so got rid of their local definitions & added it to epan/tfs.c.

Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286
Reviewed-on: https://code.wireshark.org/review/1766
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-24 06:51:17 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Alexis La Goutte ce4ad19204 Use "generic" tfs (tfs_supported_not_supported...)
Add Enforced / Not enforced to epan/tfs.[ch]

svn path=/trunk/; revision=50696
2013-07-17 10:44:35 +00:00
Alexis La Goutte e7316b7770 Move Do not clear / Clear & Confirmed / Unconfirmed TFS to epan/tfs.[ch]
svn path=/trunk/; revision=50695
2013-07-17 10:44:26 +00:00
Alexis La Goutte 4d37db3fee Use "generic" tfs (tfs_set_notset, tfs_supported_not_supported...)
Add complete / Incomplete & Valid / Not Valid TFS

svn path=/trunk/; revision=50693
2013-07-17 10:44:08 +00:00
Alexis La Goutte 5cdc82ab69 From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector
Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome.

[1] http://tools.ietf.org/html/rfc6844

svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Alexis La Goutte 961f9d1f70 Remove some "duplicate" TFS in 802.11 field capability Add in use / not in use in common TFS
svn path=/trunk/; revision=47856
2013-02-24 19:09:04 +00:00
Michael Mann 6b4ffe18d4 add the the necessary tfs variables for rev 45152
svn path=/trunk/; revision=45153
2012-09-26 18:19:15 +00:00
Michael Mann 4f9707469d replaced decode_boolean_bitfield calls with itemized filters
added tfs_no_yes to tfs.[ch]

svn path=/trunk/; revision=45115
2012-09-25 01:00:41 +00:00
Anders Broman 533c63eed1 Fix reversed values for Bearer Context IE decodes Bearer Level Quality of Service (Bearer QoS) in ARP field the wireshark decoded preemption values.
As reported in
http://ask.wireshark.org/questions/12907/pre-emption-decoding-on-s11-interface

svn path=/trunk/; revision=43930
2012-07-23 15:27:52 +00:00
Michael Mann 3d502b97f1 Updated patch from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3507
svn path=/trunk/; revision=43887
2012-07-21 12:38:59 +00:00
Anders Broman 9551f33d95 Bugfix and enhancement of MM Context dissection.
svn path=/trunk/; revision=42035
2012-04-12 14:07:31 +00:00
Anders Broman 5e05ed6632 Change a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based on Alexis La Gouttes patch.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

svn path=/trunk/; revision=35727
2011-01-31 20:37:17 +00:00
Anders Broman c3214a7c54 Add tfs_allowed_not_allowed.
svn path=/trunk/; revision=35664
2011-01-26 19:36:00 +00:00
Anders Broman 62bf860d4f Add tfs_reliable_not_reliable.
svn path=/trunk/; revision=35644
2011-01-25 13:55:20 +00:00
Anders Broman 71d02b5455 - Remove debug printout.
- Enhance dissection a bit.
- add new true_false_strings

svn path=/trunk/; revision=35566
2011-01-17 13:09:08 +00:00
Anders Broman a009cc0605 Doxygen changes.
svn path=/trunk/; revision=33990
2010-08-29 10:47:38 +00:00
Jaap Keuter f370f0fb26 Add some more strings.
svn path=/trunk/; revision=32579
2010-04-27 16:29:37 +00:00