Commit Graph

92 Commits

Author SHA1 Message Date
Martin Mathieson 276a70ea92 Fix more warnings from tools/check_typed_item_calls.py 2023-02-24 11:11:34 +00:00
Martin Mathieson be51acfffb Fix some issues seen by tools/check_typed_item_calls.py 2023-01-20 12:47:59 +00:00
Peter Ross 298eabc36c DIS: support Receiver PDUs 2022-08-14 20:59:14 +10:00
João Valverde 8efad466c4 Tools: Fix fix-encoding-args.pl ASCII string validation
Do not require a useless ENC_NA parameter for string encodings.
FT_STRING and FT_STRINGZ types don't have any ndianness.

Follow-up to 6ec429622c.
2022-02-15 11:38:16 +00:00
Martin Mathieson d8b28f8040 Fix some field mask widths. 2021-10-07 21:33:49 +00:00
Martin Mathieson dd667dddf0 Some spelling fixes 2021-09-18 20:52:04 +00:00
Joel Helling a72df64a60 Fixed Mode S Interrogator Identifier type check.
Changed the Mode S Interrogator Identifier summary info to check the type instead of the code.
2021-09-14 23:32:50 +00:00
Joel Helling 0844c0862a Fixed typo in Mode S Interrogator Identifier. 2021-09-14 23:32:50 +00:00
GBLCA\amrobles bf18882a42 DD-14 Made changes to Mode S interrogator layout. 2021-09-14 23:32:50 +00:00
GBLCA\amrobles a804547019 DD-14 Added Mode S Interrogator Identifier Information Column.
Created checks in order to appropiately display mode S and its different values.
2021-09-14 23:32:50 +00:00
GBLCA\amrobles ca83fbcf42 DD-14 Added Mode S Interroator Identifier Record.
Created a check to determine if mode S would be displayed in place of Mode 4.
2021-09-14 23:32:50 +00:00
GBLCA\amrobles a0600993a1 DD-14 Added RRB Trandponder Code Record. 2021-09-14 23:32:50 +00:00
GBLCA\amrobles 2fd0c3a976 DD-6 Added System Designator and System Specific Information
Updated call to dissect_DIS_PARSER_IFF_PDU so that it contains the DIS version.
Updated info column so that it appends text in the right order. Added
System Designator and System Specific Information to DIS v7 IFF PDUs.
2021-09-14 23:32:50 +00:00
GBLCA\amrobles 1c3729a9fd DD-6 Updated Layer 1 Dissection with DIS v7 IFF Layer 1
Added fields that are new to DIS v7. Updated fields to use
add_item instead of add_bits.  Changed the bit_mask of header
field declarations.
2021-09-14 23:32:50 +00:00
GBLCA\amrobles 7c59dd00c2 DD-6 Updated Dissection of PDU Header
Updated records in correspondence to 1278.1-2012
2021-09-14 23:32:50 +00:00
GBLCA\amrobles 2a2fbf3921 DD-6 Updated Enums with SISO 2019
Updated the UIDs to have the new values added in SISO Ref 2019. New Message
2021-09-14 23:32:50 +00:00
Evan Huus 8ee8808876 First pass pinfo->pool conversion, part 2
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
2021-07-21 09:54:57 -04:00
Martin Mathieson 678914ca0b Fix some item lengths.
As seen by tools/check_type_item_lengths.py
2021-03-29 05:30:27 +00:00
Martin Mathieson 607831d870 Fix more filter field strings.
These appear to be copy/paste errors detected by running
./tools/check_typed_item_calls.py --consecutive

Quite a few issues still remain after this batch.
2020-10-03 22:11:32 +00:00
Martin Mathieson 2999b7f6b3 More spelling fixes, part 2 of 2nd pass of dissectors. 2020-08-31 12:39:37 +01:00
Martin Mathieson b8a773dddc Fix some spelling errors in dissector strings.
A first batch of spelling errors, detected using a script that uses
pyspellcheck and a Wireshark-specific dictionary file.
2020-08-29 19:31:11 +00:00
Guy Harris e1d9a226a2 Fix the type of arrays of pointers to hf_ values for bitfield routines.
The static arrays are supposed to be arrays of const pointers to int,
not arrays of non-const pointers to const int.

Fixing that means some bugs (scribbling on what's *supposed* to be a
const array) will be caught (see packet-ieee80211-radiotap.c for
examples, the first of which inspired this change and the second of
which was discovered while testing compiles with this change), and
removes the need for some annoying casts.

Also make some of those arrays static while we're at it.

Update documentation and dissector-generator tools.

Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc
Reviewed-on: https://code.wireshark.org/review/37517
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 11:32:26 +00:00
Bert van Leeuwen 5a854b882f DIS: dissector fix for Articulated Part VP records.
The IEEE 1278.1-2012 spec for DIS (Distributed Interactive Simulation)
specifies the format of Articulated Part VP record as:
8bits  Record Type         enum
8bits  Change Indicator    unsigned integer
16bits ID                  unsigned integer
32bits Parameter Type      enum
32bits Parameter Value     floating point
32bits Padding             unused

(Section 6.2.94.2)

The dissector was interpreting the last 64bits as one value, this patch
fixes it to interpret it as 32bit float and 32bit padding.

Change-Id: Id509715f02daeecf12e3094fc1ed63e81705852b
Reviewed-on: https://code.wireshark.org/review/36922
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2020-04-25 18:10:46 +00:00
Tony Ciavarella 9567bf0595 packet-dis: fix dissection of Entity State Update PDUs
The dissector for Distributed Interactive Simulation reports malformed packets
for Entity State Update PDUs because the offset for the Number of Variable
Records field is off-by-one.  The Padding field dissection is also off-by-one.

This change fixes the problem by not incrementing the offset returned by the
parseField_Entity function which is already past the Entity ID field.  The
offset must be incremented after dissecting the Number of Variable Records
field to get to the start of the Entity Linear Velocity.

Change-Id: I942123be7a1d4e4e4fc587f757cb030a3daf8ef2
Reviewed-on: https://code.wireshark.org/review/36420
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-15 06:08:54 +00:00
Jean-Philippe Lebel 4eae6be17e DIS: Support for the EntityStateUpdate PDU
Updated the DIS protocol dissector to support the EntityStateUpdate PDU.
The EntityStateUpdatePDU is part of DIS 7 and was already "semi-handled"
by the dissector.

Change-Id: I3221520e0260dc836d373fa590b3941de45a2dcc
Reviewed-on: https://code.wireshark.org/review/34463
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-10 03:49:34 +00:00
Guy Harris 20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Gerald Combs 8c22c5bade Fix some spelling errors found by Lintian.
Change-Id: If6fc3aab7ad4fc634567121f7b9541bc6f6c5766
Reviewed-on: https://code.wireshark.org/review/30926
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 18:58:19 +00:00
Graham Shanks 17a080cc4c The number of beams field has the wrong title: was System Data Length
which is the name of the field before it

Change-Id: I7661bcff58b8a1031dcde84dd46499b7b93b42df
Reviewed-on: https://code.wireshark.org/review/26517
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17 07:26:01 +00:00
Graham Shanks ba72f731c3 DIS: move modulation parameters to correct place in tree
Move the modulation parameters record in the Transmitter PDU to its
correct place in the tree, i.e. under the Transmitter PDU element
instead of under the Encryption Key field.

Change-Id: I77b379823d5a43bd943ffabac2d9fa050b19abcd
Reviewed-on: https://code.wireshark.org/review/25972
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-22 06:42:11 +00:00
Uli Heilmeier bee04353b9 DIS: fix Modulation paremter length
According to https://www.sisostds.org/DigitalLibrary.aspx?Command=Core_Download&EntryId=43048
table 5.2.1 modulation paremter is 8 bytes long (and not 16).

Bug: 14441
Change-Id: I5d43411124e554721cfaa6c33561a04c91688aee
Reviewed-on: https://code.wireshark.org/review/25866
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-18 12:18:28 +00:00
Dario Lombardo fe219637a6 dissectors: use SPDX identifiers.
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a
Reviewed-on: https://code.wireshark.org/review/25756
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12 16:49:58 +00:00
Graham Shanks d291d1a423 Update enumerations for SISO-REF-010 v22
Change-Id: Icb326dac7cfe0478df3d892df279ad0f241c7ba6
Reviewed-on: https://code.wireshark.org/review/23981
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19 02:30:13 +00:00
Pascal Quantin 5db3a263c3 Revert "dis: Dead reckoning others Parameters display in wrong location"
This reverts commit ad0a3834a1.

Change-Id: I3a4ef0e3501e83a858f0a98f0c75e758ab245bba
Reviewed-on: https://code.wireshark.org/review/22828
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-28 07:00:14 +00:00
Alexis La Goutte ad0a3834a1 dis: Dead reckoning others Parameters display in wrong location
Ping-Bug: 13917
Change-Id: I362c14fefcc62b8d19789a13d319fba323836846
Reviewed-on: https://code.wireshark.org/review/22818
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-28 05:36:57 +00:00
Alexis La Goutte 1c8ec368f0 dis: it is more logic sub_tree2 is the subtree of sub_tree
Ping-Bug: 13917
Change-Id: Ic0b6408b9e0c2a21187b5fe01b8ebfd7493ba7c3
Reviewed-on: https://code.wireshark.org/review/22820
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-28 05:35:41 +00:00
Alexis La Goutte a4788324cb dis: proto_tree_add_bitmask return a item (and not a tree)
(item and tree is the same but avoid mistake)

Ping-Bug: 13917
Change-Id: Ica5cc1b62aa8d359aea19a8292bfcd2cc5c4ae9b
Reviewed-on: https://code.wireshark.org/review/22819
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-28 01:14:55 +00:00
Alexis La Goutte c3a91e51d0 dis: Appearance Record displayed in wrong location
Bug: 13917
Change-Id: I26211dfcb15fe5e4ffc69ae297c64e380cd7b128
Reviewed-on: https://code.wireshark.org/review/22799
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 15:30:21 +00:00
Alexis La Goutte 1c9588ddc3 dis: fix conflicting entry in its value_string
Field 'Country' (dis.country) has a conflicting entry in its value_string: 107 is at indices 106 (Cote D'Ivoire (aka Ivory Coast)) and 107 (Ivory Coast (aka Cote D'Ivoire)))

Field 'Country' (dis.aggregate.country) has a conflicting entry in its value_string: 107 is at indices 106 (Cote D'Ivoire (aka Ivory Coast)) and 107 (Ivory Coast (aka Cote D'Ivoire)))

Change-Id: Iabc2fafae5d756ff0cdfb4d16a8751b573378f06
Reviewed-on: https://code.wireshark.org/review/21396
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-28 11:54:31 +00:00
Alexis La Goutte eab8050fdd dis: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: I8d28637d5262fd0e06d80607adb6f88b3d909a9e
Reviewed-on: https://code.wireshark.org/review/20465
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-13 00:03:14 +00:00
Michael Mann 2eb7b05b8c Convert most UDP dissectors to use "auto" preferences.
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67,
convert dissectors that use "udp.port".

More cleanup done on dissectors that use both TCP and UDP dissector
tables, so that less preference callbacks exist.

Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3
Reviewed-on: https://code.wireshark.org/review/18120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13 02:51:18 +00:00
Michael Mann be1398c17c Convert uses of g_alloced data with tvb_new_child_real_data to use pinfo->pool instead.
Aldo update documentation to suggest using wmem pinfo->pool instead of glib memory

Change-Id: I5d34cc6c1515aa9f0d57784b38da501ffcb95ccc
Reviewed-on: https://code.wireshark.org/review/16551
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2016-07-20 22:12:56 +00:00
Hendrik Uhlmann f5eaf538b0 DIS: Introduced support of Collision PDU
Parse all Attributes of Collision PDU and display them in wireshark HMI.

Change-Id: I3003c6dd709498cc6c1adf784800047d0984bafa
Reviewed-on: https://code.wireshark.org/review/16299
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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-07-06 06:58:39 +00:00
Dario Lombardo 0b35075866 dis: cast to guint64 to avoid potential overflow (CID 1214480).
Change-Id: I24ae4a7a5ef8b4ed363ec849ac9c8aeeefe836dd
Reviewed-on: https://code.wireshark.org/review/16288
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05 12:12:41 +00:00
Michael Mann 2ab4155794 tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
Also some other tricks to remove unnecessary tvb_get_string_enc calls.

Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
Reviewed-on: https://code.wireshark.org/review/16158
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27 15:20:06 +00:00
alpartis cb2627c77f format DIS header timestamp as mm:ss.nnnnnn
Older versions of this dissector displayed the header timestamp formatted to show
minutes, seconds, and milliseconds past the hour (the DIS spec actually defines the
timestamp in terms of microseconds).  This commit fulfills a feature request to
return to that format.

Bug: 12402
Change-Id: Ide4adf8f80306f2458e48e8b2f78c911782669e5
Reviewed-on: https://code.wireshark.org/review/15276
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-09 16:10:31 +00:00
Alexis La Goutte 55ac64ff3e dis: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I30e5384dff0d97ea32ea24c82a91d30c26e6023c
Reviewed-on: https://code.wireshark.org/review/14979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18 11:21:38 +00:00
Michael Mann 9bcac48403 Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector.  Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.

Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 12:48:48 +00:00
alpartis d5f2db6a7f DISv7: parse PDU Status field
Section 6.2.67 in IEEE 1278.1-2012 defines PDU Status bit field in
the PDU Header.  The bit meaning varies with the PDU type.  This
change provides full parsing and presentation for all fields and
PDU types.

Bug: 12043
Change-Id: I8f4ef6606ff59a1ef0ed97630c4832b2b6a4dff7
Reviewed-on: https://code.wireshark.org/review/14232
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 05:49:48 +00:00
alpartis 0a0acd9aaa Present PDU header timestamps with microsecond resolution as exists in packet data.
On behalf of SimPhonics, Inc.

IEEE 1278.1-2012 DIS spec details the PDU header timestamp in section
6.2.88 as a 31-bit unsigned integer count of microseconds since the start
of the current interval.  Likewise, the DIS dissector should reflect this
information accurately, based on the actual complete contents of captured
packets.

Tested with DIS packets generated from VPlus for radio simulation by
SimPhonics.

Change-Id: I73b9689e1fb35900b7063746cac604a72a69ab16
Reviewed-on: https://code.wireshark.org/review/13210
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>
2016-01-14 05:31:18 +00:00
Michael Mann 443a7ed259 new_create_dissector_handle -> create_dissector_handle for dissector directory.
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.

Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:37:36 +00:00