Commit graph

75 commits

Author SHA1 Message Date
Atli Guðmundsson
28c5b73545 Updates and bugfixes of ASTERIX
Generic fixes
- subfields with small number of bits that belong to large
  bit fields are not being decoded correctly (they all become zero).

Generic update
- removed ett_[X] entries that were never being used

asterix bugfixes
- asterix.SAC bitmask not aligned
- asterix.SIC bitmask not aligned
I019 bugfixes
- I019/552 bitmask not aligned
I020 bugfixes
- I020/042 incorrect filter
- I020/170 too many spare bits
- I020/170 incorrect filter
- I020/230 incorrect filter
- I020/500#01.DOPy incorrect filter
- I020/500#03 incorrect filter
- I020/RE sub field names not in line with other CATs
- I020/RE.GVV.TA is signed (should be unsigned)
- I020/RE.GVA.TASD is signed (should be unsigned)
- I020/RE.PA#02 incorrect filter
- I020/RE.DA#04 incorrect filter
I021 bugfixes
- I021/110#01 is not a FIXED size field (it is an FX field)
- I021/260 bitmask not aligned
- I021/RE.MES#02 bitmask not aligned
- I021/RE.MES#03 bitmask not aligned
- I021/RE.MES#06 bitmask not aligned
I034 bugfixes
- I034/050 subfield indexes are missing
- I034/050#04 bitmask not aligned
- I034/060 subfield indexes are missing
I048 bugfixes
- I048/050 bitmask not aligned
- I048/060 bitmask not aligned
- I048/070 bitmask not aligned
- I048/080 bitmask not aligned
- I048/100 bitmask not aligned
- I048/120 bitmask not aligned
- I048/230 bitmask not aligned
- I048/RE.MD5 subfield indexes are followed by a comma
- I048/RE.MD5#02 bitmask not aligned
- I048/RE.MD5#05 bitmask not aligned
- I048/RE.M5N subfield indexes are followed by a comma
- I048/RE.M5N#02 bitmask not aligned
- I048/RE.M5N#05 bitmask not aligned
- I048/RE.RPC subfield indexes are followed by a comma
I062 bugfixes
- I062/060 bitmask not aligned
- I062/080.DUPF incorrect filter
- I062/110#02 bitmask not aligned
- I062/340#05 bitmask not aligned
- I062/380#10 bitmask not aligned
- I062/380#11 bitmask not aligned
- I062/390#03 bitmask not aligned
- I062/390#09.RWY is now a string instead of 3 different fields
- I062/390#12 bitmask not aligned
- I062/390#17 bitmask not aligned
- I062/510 bitmask not aligned
- I062/RE.CST bitmask not aligned

Change-Id: Ieefb53a10728205f2cefac718ac8668df29f1f8a
Reviewed-on: https://code.wireshark.org/review/32300
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-08 05:28:34 +00:00
Marko Hrastovec
187b587589 ASTERIX Category 020 Ed. 1.9 and Reserved Expansion Field Ed. 1.3
ASTERIX dissector now supports Category 020 Edition 1.9, which is used for
Multilateration Target Reports, and Reserved Expansion Field for
Category 020 Edition 1.3.

Specifications for Category 020 are:
https://www.eurocontrol.int/publications/cat020-multilateration-mlt-messages-part-14
https://www.eurocontrol.int/publications/cat020-coding-rule-reserved-expansion-field-part14-appendix

Change-Id: I867f48c3d4299c22f68edf1e3f9cdbcfabc47eb4
Reviewed-on: https://code.wireshark.org/review/31766
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-29 08:10:34 +00:00
Atli Guðmundsson
9e81fcf833 Updates and bugfixes of ASTERIX I021
I021 updates
- Added I021/RE.BPS
- Added I021/RE.SelH
- Added I021/RE.NAV
- Added I021/RE.GAO
- Added I021/RE.SGV
- Added I021/RE.STA
- Added I021/RE.MES
I021 bugfixes
- Fixed I021 Capitalisation inconsistencies
- Fixed I021/008.TC, incorrect mask
- Fixed I021/040, missing spare bits
- Fixed I021/074.TOMRP, incorrect type
- Fixed I021/076.TOMRV, incorrect type
- Fixed I021/090.SILS, incorrect name
- Fixed I021/110#2.TCP Number, incorrect name
- Fixed I021/110#2.TD, incorrect mask
- Fixed I021/146.Source, incorrect mask
- Fixed I021/160.GSPD, incorrect type
- Fixed I021/160.TA, incorrect type
- Fixed I021/165.TAR, incorrect number of bits
- Fixed I021/260.RAC, incorrect handling of 4 bits spanning 2 bytes
- Fixed I021/271, missing spare bits
I021 v2.1 bugfixes
- Fixed I021/040, missing spare bits
- Fixed I021/271, missing spare bits, incorrect field length
- Fixed I021/271.LW, incorrect mask

Change-Id: I10a7d94d76fed436e9d103dfd13c472e66d45831
Reviewed-on: https://code.wireshark.org/review/31481
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-13 10:02:05 +00:00
Atli Guðmundsson
711eb94438 Minor bugfix of ASTERIX I023
I023 bugfixes
- Fixed I023 Capitalisation inconsistencies

Change-Id: I39eccd0b7c3a68a8b74d68cf16b988bacce92924
Reviewed-on: https://code.wireshark.org/review/31429
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-07 05:34:48 +00:00
Atli Guðmundsson
d13244c6f7 Updates and bugfixes of ASTERIX I048
I048 v1.23 updates (now the default)
- Added I048/020.ERR
- Updated I048/170.CDM value meaning
I048 v1.21 updates
- Added I048/020.XPP
- Updated I048/030.WE with new value codes (19-23)
I048 updates
- Added I048/RE.MD5, Mode 5 Reports
- Added I048/RE.M5N, Mode 5 Reports, New Format
- Added I048/RE.M4E, Extended Mode 4 Report
- Added I048/RE.RPC, Radar Plot Characteristics
- Added I048/RE.ERR, Extended Range Report
I048 bugfixes
- Fixed I048 Capitalisation and spelling inconsistencies
- Fixed I048/030, now displays up to 10 Warning/Error codes
- Fixed I048/100, fixed order and invalid masks of all sub-fields
- Fixed I048/120#0.CAL, incorrect type, missing mask
- Fixed I048/120#1.DOP, incorrect type
- Fixed I048/120#1.AMB, incorrect type
- Fixed I048/120#1.FRQ, incorrect type
- Fixed I048/260.ACAS, not displaying anything, incorrect type

Change-Id: I5d742fded258e3831392cb6f1e1d9d3eafd6e938
Reviewed-on: https://code.wireshark.org/review/31379
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-06 08:29:50 +00:00
Atli Guðmundsson
271b9e4385 Bugfixes of ASTERIX I034
I034 bugfixes
- Fixed I034 Capitalisation inconsistencies
- Fixed I034/041.ARS, incorrect name
- Fixed I034/060#2.RED-RAD, incorrect name
- Fixed I034/060#2.STC, incorrect mask
- Fixes I034/060#3.RED-RAD, incorrect name
- Fixes I034/060#4.RED-RAD, incorrect name
- Fixed I034/110.TYP, incorrect name

Change-Id: I9a78a08ecfd34044030e36c9050fd7b848b80051
Reviewed-on: https://code.wireshark.org/review/31398
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-06 08:28:15 +00:00
Atli Guðmundsson
22588bb924 Updates and bugfixes of ASTERIX I062
I062 v1.18 updates (now the default)
- Updated I062/380#10.STAT, new enum values  (6 & 7)
- Added asterix.062/080.SFC
- Added asterix.062/080.IDD
- Added asterix.062/080.IEC
I062 v1.17 updates
- Added asterix.062/060.V
- Added asterix.062/060.G
I062 bugfixes:
- Fixed I062 Capitalisation inconsistencies
- Fixed I062/080.FPLT, incorrect value mask
- Fixed I062/080.SDS, incorrect value mask
- Fixed I062/110#1.M5, incorrect name (was I062/110#1.MD5)
- Fixed I062/110#4, incorrect abbreviation (was asterix.062_11_04)
- Fixed I062/110#4, missing spare bit
- Fixed I062/110#4.RES, incorrect value mask
- Fixed I062/110#6, incorrect abbreviation (was asterix.062_11_06)
- Fixed I062/136.MFL, incorrect abbreviation (was asterix.062_136_ALT)
- Fixed I062/245.STI, was missing
- Fixed I062/245, did not display anything
- Fixed I062/290, incorrect abbreviation, (was asterix.062_)
- Fixed I062/295#7.MHG, incorrect name (was I062/295#07.MHD)
- Fixed I062/340#4/5, incorrect abbreviations (was asterix.062_340_)
- Fixed I062/380#4, incorrect abbreviation (was asterix.062_380_4)
- Fixed I062/380#4.IAS, incorrect scaling (depends on IM bit)
- Fixed I062/380#6.ALT, incorrect type (was unsigned)
- Fixed I062/380#7.ALT, incorrect type (was unsigned)
- Fixed I062/380#9.NC, incorrect value mask
- Fixed I062/380#9.TD, incorrect field size
- Fixed I062/380#9.TTR, incorrect type (was signed)
- Fixed I062/380#17.TA, incorrect type (was signed)
- Fixed I062/380#19.VUC, incorrect field size
- Fixed I062/390#3, incorrect type (was 32-bit), incorrect value mask
- Fixed I062/390#n, incorrect abbreviations (was asterix.062_nn)
- Fixed I062/500#3.APWLAT, incorrect type (was signed)
- Fixed I062/500#3.APWLON, incorrect type (was signed)
- Fixed I062/500#n, incorrect abbreviations (was asterix.062_nn)
- Fixed I062/510, missing support for slaved trackers
- Fixed I062/510.SUD, incorrect name (was I062/510.SID)
- Fixed I062/510.SUD, incorrect type (was 24-bit), incorrect value mask
- Fixed I062/510.STN, incorrect value mask
- Updated I062/RE.CST.SAC/SIC, now reports as asterix.SAC/SIC
- Updated I062/RE.CSNT.SAC/SIC, now reports as asterix.SAC/SIC

Note: incorrect value masks and field sizes would in most cases
cause an exception when trying to decode those fields.

Change-Id: If6b9662d20619dd30b4fe28907ab0630c6d55e44
Reviewed-on: https://code.wireshark.org/review/31214
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02 09:20:02 +00:00
Atli Guðmundsson
46e7148461 Fixed ASTERIX 6bit callsign decoding
The callsign was being truncated to 7 letters.
This affects the following fields:
- I004/100#01.AN
- I004/170#08.MS1
- I004/170#08.MS2
- I025/020.SD
- asterix.AI, which is included in:
-- I021/170
-- I048/240
-- I062/245
-- I062/380#02
-- I062/380#03_v0_17

Change-Id: Idbbb3891d96e906053fc1f0c447e37bae87d207a
Reviewed-on: https://code.wireshark.org/review/31230
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 21:27:12 +00:00
Atli Guðmundsson
5eacb25bec Updates and bugfix of ASTERIX 063
Updated I063 to v1.4
Fixed incorrect spelling of I063/090.PRG
Fixed I063 Capitalisation inconsistencies

Change-Id: I241fc15829d1ef2eddd4f68cf37b58d9f16f2aa8
Reviewed-on: https://code.wireshark.org/review/31174
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 08:07:33 +00:00
Atli Guðmundsson
70e3a48bc6 Updates and bugfix of ASTERIX 065
Added I065 v1.4
Added I065 v1.4 field (STTN)
Added I065 RE fields (SRP, ARL)
Fixed I065/000 message mappings
Fixed I065 Capitalisation inconsistencies

Change-Id: Id28c7214817654a2a1f18c8d54f0fd271eb44107
Reviewed-on: https://code.wireshark.org/review/31173
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 08:06:50 +00:00
Atli Guðmundsson
68b2eb2129 Added dissector for ASTERIX I019
Change-Id: I438f1224283f1a4b8300c73345d8e8f4ce3c7160
Reviewed-on: https://code.wireshark.org/review/31081
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-21 06:31:25 +00:00
Tomas Konecny
e87f9e8eac ASTERIX: fix dissection of 021/90 Quality Indicators item
The third extension is not decoded correctly because bad description of the second extension.
Spare bits 8 and 7 were missing in I021_090_PARTS[] structure.

Bug: 15076
Change-Id: I68b644b15177016e075c87004281b76b5c6f19e2
Reviewed-on: https://code.wireshark.org/review/29335
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-29 20:17:46 +00:00
Jaap Keuter
aa8ebb94e5 ASTERIX: Fix cat068/135 altitude value
The altitude value presented is the value converted into feet.
Instead, as the label suggests, the value should be presented
as a flight level. Change the conversion as such.

Bug: 15030
Change-Id: I131f6b586c6b1f59090f93862ea13b117403c502
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28961
Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com>
Tested-by: Petri Dish Buildbot
2018-08-04 22:55:08 +00:00
Guy Harris
b1de8c87a1 Older versions of Clang don't understand -Wpedantic.
Define DIAG_OFF_PEDANTIC and DIAG_ON_PEDANTIC, and have it do nothing on
Clang prior to 4.0.

Change-Id: Ic6b2e607659db66f3210401024bf3f2239665506
Reviewed-on: https://code.wireshark.org/review/27649
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18 22:31:05 +00:00
antony.bridle
0937979a61 Asterix: Definition for ASTERIX Category 032 - Miniplan Messages
Change-Id: I7a110014ef8089646371ec1b176d710de2e79905
Reviewed-on: https://code.wireshark.org/review/27590
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18 04:09:50 +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
Marko Hrastovec
b37aedb47a asterix: special processing for field item I021/150
There is a problem where one field decodes differently
depending on another fields content.

A code has been added to save information for 021_150_IM field.
When the next field 021_150_ASPD is decoded, the
stored information determines how it shall be scaled.
This is a special case for I021/150 only.

The same way as this change, other changes shall be done for
fields that are dependent on other fields.

Bug: 14076
Change-Id: I51f2c8f79bc6bde9efc0429e54fbea36818e9b36
Reviewed-on: https://code.wireshark.org/review/24734
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 09:03:11 +00:00
Marko Hrastovec
8cb9a094bf asterix: wrong presentation of fields I009/080 in CAT009.
Fields I009/080 were wrongly represented for CAT009. 8 and 16 bit
long fields were represented as 24 bit.

Change-Id: I5bd1c1f006292f58d0290ced80dde22324cb4002
Reviewed-on: https://code.wireshark.org/review/24746
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10 01:09:05 +00:00
Marko Hrastovec
f8203771ec Typing error correction for CAT002 settings selection.
Two settings had the same string "Select the CAT001 version".
One should be CAT002.

Change-Id: Iee6204a1064af786338d1b53c7b983763b985a0c
Reviewed-on: https://code.wireshark.org/review/24745
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08 19:45:04 +00:00
Dmitry Bravikov
2698324d28 Fix unit of measurement in category 048 of ASTERIX protocol.
Change-Id: Icdd39166059c080e7844968219f2a8f387c587a6
Reviewed-on: https://code.wireshark.org/review/23391
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-09-05 12:52:08 +00:00
Martin Kaiser
e77b7a167d asterix: add a link to the specifications
It was pointed out during the discussions in
https://code.wireshark.org/review/#/c/19568/
that the specifications are publicly available.

Change-Id: Idc21a606c9b9aedb16f7632b24322c901e7db524
Reviewed-on: https://code.wireshark.org/review/21963
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-06-05 13:43:26 +00:00
Michael Mann
0d040f699c packet-asterix.c: Make hf_021_230_RA FT_DOUBLE type
Bug: 13580
Change-Id: I4861c9b69bafe72ecb44e57c9be393506fb9715b
Reviewed-on: https://code.wireshark.org/review/21021
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-04-11 23:22:48 +00:00
Gerald Combs
781f03580c ASTERIX: Avoid an integer overflow.
Count using a guint instead of a guint8.

Bug: 13344
Change-Id: Ic7d337dbb29b92ebb8332f50fd47b5ba2aa3f41e
Reviewed-on: https://code.wireshark.org/review/19746
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-23 18:51:43 +00:00
Michael Mann
7925698340 packet-asterix.c doesn't need a preference callback function.
Just causes preference to be added twice.

Bug: 13113
Change-Id: Iebbe296a8b35cbe58c163c4f1f5fac9d27c76ead
Reviewed-on: https://code.wireshark.org/review/18737
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-11-11 09:27:00 +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
Martin Kaiser
f3d91fb58c asterix: remove unused hf entry
Change-Id: I17dc7cfb8144dbfe3e36ff1902ce91241c5629ed
Reviewed-on: https://code.wireshark.org/review/16536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-19 05:53:29 +00:00
João Valverde
ecb4dc396e Include ws_diag_control.h in config.h
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317
Reviewed-on: https://code.wireshark.org/review/14749
Petri-Dish: João Valverde <j@v6e.pt>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04 23:05:31 +00:00
Andrew Hoag
7b3bfb80d8 ASTERIX: Add CAT025 dissection
The CAT025 type of ASTERIX messages is "CNS/ATM Ground System Status Report".

Change-Id: Icf39d595cef8663357a487b799bf32e738236757
Reviewed-on: https://code.wireshark.org/review/14590
Tested-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26 18:59:28 +00:00
Marko Hrastovec
e7a24dc484 ASTERIX: fix for wrong RE and SP fields in CAT048.
Bug: 12267
Change-Id: I4871da19cb8b11e2df0de13993350a71168f7ab4
Reviewed-on: https://code.wireshark.org/review/14502
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-17 18:26:45 +00:00
Michael Mann
31a54708f4 new_register_dissector -> register_dissector for dissector directory.
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c
Reviewed-on: https://code.wireshark.org/review/12485
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:38:06 +00:00
Michael Mann
0aa9e98647 Convert some UDP subdissectors to "new" style.
Change-Id: I3c1ee97f68af4539b97d50b75c03ff82147dbc5e
Reviewed-on: https://code.wireshark.org/review/11649
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-09 15:59:42 +00:00
Pascal Quantin
05554f80f4 Asterix: field array must be NULL terminated
Bug: 11287
Change-Id: Iffcaa1cd2663768f616aedb550a101b7196e456b
Reviewed-on: https://code.wireshark.org/review/8975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18 10:33:10 +00:00
Andrew Hoag
d5f1ae709b Asterix dissector support for category 021 v2.3
- Add item 040 field LLC
- Add item 200 field ME
- Edit item 271 field LW

Change-Id: I13b3774b248731f208b3b950f7ae0736398edbe4
Reviewed-on: https://code.wireshark.org/review/8892
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-17 21:34:30 +00:00
Marko Hrastovec
6fe0751a53 Asterix dissector can now dissect ASTERIX Category 004.
The code was added to dissect CAT004.

Change-Id: I7be543468d7df959db6bcef53d21d49846d29990
Reviewed-on: https://code.wireshark.org/review/8883
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-12 04:47:51 +00:00
Gerald Combs
e56f34e200 Suppress more pedantic warnings.
Suppress

    warning: initialization of a flexible array member [-Wpedantic]

Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a
Reviewed-on: https://code.wireshark.org/review/7155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-16 03:27:44 +00:00
Marko Hrastovec
f8fa70f4e8 Decoding of Asterix categories 063 and 065 extended to item decoding.
Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.

Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 09:01:03 +00:00
Martin Mathieson
596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Bill Meier
b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Bill Meier
f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +00:00
Marko Hrastovec
0415df8951 Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch)
Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally.

Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd
Reviewed-on: https://code.wireshark.org/review/5554
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-01 08:54:35 +00:00
Bill Meier
c28f280c1d Fix a number of dup hf[] filter-names probably resulting from cut/paste errs.
Change-Id: I9242300b2ace3155c1506b584a90f073100a305e
Reviewed-on: https://code.wireshark.org/review/5512
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26 23:27:31 +00:00
Evan Huus
08ce84ebbe Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-25 18:12:00 +00:00
Marko Hrastovec
43bb76a720 Function to calculate twos complement is quicker and hopefully better understandable.
Change-Id: I1948eeaf5fa5aa4a5ccd0f81be894f655907a4dc
Reviewed-on: https://code.wireshark.org/review/1570
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 03:17:29 +00:00
Marko Hrastovec
e1ce405449 ASTERIX - added dissector for category 023.
Sample file with traffic is the same as for CAT021 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9953). Apply filter "asterix.category == 23" to see only CAT023 packets.
A small change in actual dissecting code was also needed because of strange item I023/101. The first FX bit is in the second byte and then grows only for a byte.

Change-Id: I3f80e6e46b642efc6f2e19e6f931cdef1c39495a
Reviewed-on: https://code.wireshark.org/review/993
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-08 00:38:50 +00:00
Marko Hrastovec
a90dfcb325 Bugfix for ASTERIX category 021.
It was found in https://code.wireshark.org/review/#/c/972/ and only commented out.
The bug is now fixed, the variable is used.

Change-Id: I0361b269a06f45f4d36b8bc97c3623618cb5f859
Reviewed-on: https://code.wireshark.org/review/976
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-06 10:15:31 +00:00
Hadriel Kaplan
293b5ea41d Get it compiling again: packet-asterix.c has unused const variable.
Change-Id: I07125f1779063527f24d9195a9999cef4c8fe343
Reviewed-on: https://code.wireshark.org/review/972
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-05 18:18:46 +00:00
Michael Mann
f415e23d90 Decoder for category 021 added to ASTERIX dissector. Bug 9953.
Change-Id: If72685f41cd32854d6c0c04716ee640196431f87
Reviewed-on: https://code.wireshark.org/review/961
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-05 02:21:45 +00:00
Marko Hrastovec
3b69de702e Asterix CAT062 fix. Units for cartesian velocity of track were displayed with wrong units.
Change-Id: I716dfeb16b049544e691dcdf75c488758d9e1fa0
Reviewed-on: https://code.wireshark.org/review/707
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17 09:59:19 +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
Bill Meier
93fe4d53e2 Remove trailing whitespace.
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6
Reviewed-on: https://code.wireshark.org/review/372
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 16:36:38 +00:00