diff options
| author | Marko Hrastovec <marko.hrastovec@gmail.com> | 2014-04-06 07:34:33 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-06 10:15:31 +0000 |
| commit | a90dfcb325b6c6ea3e8a10ca1c3f4f6d41750c02 (patch) | |
| tree | 8ce3d630c858a24e90ba921253d1ec256b4b082d /epan/dissectors/packet-asterix.c | |
| parent | fdeed480bf89a1f43f7b3d4be67fa0e4333f7120 (diff) | |
| download | wireshark-a90dfcb325b6c6ea3e8a10ca1c3f4f6d41750c02.tar.gz | |
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>
Diffstat (limited to 'epan/dissectors/packet-asterix.c')
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 1312bbcdf7..9eda7ff3bc 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -3145,13 +3145,11 @@ static const FieldPart I021_076_TOMRV = { 30, 1.0/1073741824.0, FIELD_PART_FLOAT static const FieldPart *I021_076_PARTS[] = { &I021_076_FSI, &I021_076_TOMRV, NULL }; /* Quality Indicators */ -#if 0 -static const value_string valstr_021_090_SIL[] = { +static const value_string valstr_021_090_SIL_SUP[] = { { 0, "measured per flight-hour" }, { 1, "measured per sample" }, { 0, NULL } }; -#endif static const FieldPart I021_090_NUCR_NACV = { 3, 1.0, FIELD_PART_UINT, &hf_021_090_NUCR_NACV, NULL }; static const FieldPart I021_090_NUCP_NIC = { 4, 1.0, FIELD_PART_UINT, &hf_021_090_NUCP_NIC, NULL }; @@ -7306,7 +7304,7 @@ void proto_register_asterix (void) { &hf_021_090_NIC_BARO, { "NIC BARO", "asterix.021_090_NIC_BARO", FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL } }, { &hf_021_090_SIL, { "SIL", "asterix.021_090_SIL", FT_UINT8, BASE_DEC, NULL, 0x60, NULL, HFILL } }, { &hf_021_090_NACP, { "NACP", "asterix.021_090_NACP", FT_UINT8, BASE_DEC, NULL, 0x1e, NULL, HFILL } }, - { &hf_021_090_SIL_SUP, { "SIL-supplement", "asterix.021_090_SIL_SUP", FT_UINT8, BASE_DEC, NULL, 0x20, NULL, HFILL } }, + { &hf_021_090_SIL_SUP, { "SIL-supplement", "asterix.021_090_SIL_SUP", FT_UINT8, BASE_DEC, VALS (valstr_021_090_SIL_SUP), 0x20, NULL, HFILL } }, { &hf_021_090_SDA, { "SDA", "asterix.021_090_SDA", FT_UINT8, BASE_DEC, NULL, 0x18, NULL, HFILL } }, { &hf_021_090_GVA, { "GVA", "asterix.021_090_GVA", FT_UINT8, BASE_DEC, NULL, 0x06, NULL, HFILL } }, { &hf_021_090_PIC, { "PIC", "asterix.021_090_PIC", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL } }, |