diff options
| author | Prince Paul <prince.paul.k@gmail.com> | 2020-05-03 11:58:37 +0530 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-05-03 09:56:20 +0000 |
| commit | 35fa77ce96829edd22c9ca272c93fd85305f43ed (patch) | |
| tree | c311681684530f3d0a81e372a0cb8c48fa196b41 /epan/dissectors/packet-asterix.c | |
| parent | db717c2c019a7fe92f2e194d45100c5ffbd0ec1c (diff) | |
ASTERIX: Bugfix in CAT021 V0.26 and V0.23
Refer: https://www.eurocontrol.int/publication/cat021-eurocontrol-specification-surveillance-data-exchange-asterix-part-12-category-21
1. Fix scaling factor of I021_165_ROT from 1.0 to 1.0/4.0
2. Fix length of spare bit in I021/165
3. Fix mask of &hf_021_165_TI from 0x80 (1bit) to 0xc0 (2bits)
Change-Id: I81cf933e918672d3e3e49d6f38b6b9aefb7137c7
Reviewed-on: https://code.wireshark.org/review/37055
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-asterix.c')
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index f582e3c5d9..3eb18453bd 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -6327,9 +6327,9 @@ static const value_string valstr_021_165_TI[] = { }; static const FieldPart I021_165_TAR = { 10, 1.0/32.0, FIELD_PART_FLOAT, &hf_021_165_TAR, NULL }; static const FieldPart I021_165_TI = { 2, 1.0, FIELD_PART_UINT, &hf_021_165_TI, NULL }; -static const FieldPart I021_165_ROT = { 7, 1.0, FIELD_PART_UINT, &hf_021_165_ROT, NULL }; +static const FieldPart I021_165_ROT = { 7, 1.0/4.0, FIELD_PART_UINT, &hf_021_165_ROT, NULL }; static const FieldPart *I021_165_PARTS[] = { &IXXX_6bit_spare, &I021_165_TAR, NULL }; -static const FieldPart *I021_165_PARTS_v0_2[] = { &I021_165_TI, &IXXX_6bit_spare, &IXXX_FX, +static const FieldPart *I021_165_PARTS_v0_2[] = { &I021_165_TI, &IXXX_5bit_spare, &IXXX_FX, &I021_165_ROT, &IXXX_FX, NULL }; /* Target Status */ @@ -12908,7 +12908,7 @@ void proto_register_asterix (void) { &hf_021_165, { "165, Track Angle Rate", "asterix.021_165", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_021_165_v0_2, { "165, Rate of Turn", "asterix.021_165", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_021_165_TAR, { "TAR [deg/s]", "asterix.021_165_TAR", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_021_165_TI, { "TI", "asterix.021_165_TI", FT_UINT8, BASE_DEC, VALS (valstr_021_165_TI), 0x80, NULL, HFILL } }, + { &hf_021_165_TI, { "TI", "asterix.021_165_TI", FT_UINT8, BASE_DEC, VALS (valstr_021_165_TI), 0xc0, NULL, HFILL } }, { &hf_021_165_ROT, { "ROT", "asterix.021_165_ROT", FT_UINT8, BASE_DEC, NULL, 0xfe, NULL, HFILL } }, { &hf_021_170, { "170, Target Identification", "asterix.021_170", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_021_200, { "200, Target Status", "asterix.021_200", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, |