diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-12 13:01:17 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-12 13:01:17 +0000 |
| commit | 7ad38c4c9c09a600da83e2af8d6dc42dea2542d3 (patch) | |
| tree | f9a2f61820d6db158da177e353a58b4d70a3444f /epan/dissectors/packet-asterix.c | |
| parent | 9997e9f31531f484ee53b158fab07c904dd94139 (diff) | |
| download | wireshark-7ad38c4c9c09a600da83e2af8d6dc42dea2542d3.tar.gz | |
From Dirk De Schepper via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8926 :
The dissector defines some one-byte fields as UFLOAT. Defining them as UINT
fixes the decoding error for CAT48 version 1.21.
svn path=/trunk/; revision=50532
Diffstat (limited to 'epan/dissectors/packet-asterix.c')
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 98e6fd26ab..fa6276d7be 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -2496,19 +2496,19 @@ static const FieldPart I048_120_02_FRQ = { 16, 1.0, FIELD_PART_UINT, &hf_048_120 static const FieldPart *I048_120_02_PARTS[] = { &I048_120_02_DOP, &I048_120_02_AMB, &I048_120_02_FRQ, NULL }; /* Radar Plot Characteristics */ -static const FieldPart I048_130_SRL_VAL = { 8, 360.0/8192.0, FIELD_PART_UFLOAT, NULL/*&hf_048_130_01*/, NULL }; +static const FieldPart I048_130_SRL_VAL = { 8, 360.0/8192.0, FIELD_PART_UINT, NULL/*&hf_048_130_01*/, NULL }; static const FieldPart *I048_130_SRL[] = { &I048_130_SRL_VAL, NULL }; static const FieldPart I048_130_SRR_VAL = { 8, 1.0, FIELD_PART_UINT, NULL/*&hf_048_130_02*/, NULL }; static const FieldPart *I048_130_SRR[] = { &I048_130_SRR_VAL, NULL }; static const FieldPart I048_130_SAM_VAL = { 8, 1.0, FIELD_PART_INT, NULL/*&hf_048_130_03*/, NULL }; static const FieldPart *I048_130_SAM[] = { &I048_130_SAM_VAL, NULL }; -static const FieldPart I048_130_PRL_VAL = { 8, 360.0/8192.0, FIELD_PART_UFLOAT, NULL/*&hf_048_130_04*/, NULL }; +static const FieldPart I048_130_PRL_VAL = { 8, 360.0/8192.0, FIELD_PART_UINT, NULL/*&hf_048_130_04*/, NULL }; static const FieldPart *I048_130_PRL[] = { &I048_130_PRL_VAL, NULL }; static const FieldPart I048_130_PAM_VAL = { 8, 1.0, FIELD_PART_INT, NULL/*&hf_048_130_05*/, NULL }; static const FieldPart *I048_130_PAM[] = { &I048_130_PAM_VAL, NULL }; -static const FieldPart I048_130_RPD_VAL = { 8, 1.0/256.0, FIELD_PART_FLOAT, NULL/*&hf_048_130_06*/, NULL }; +static const FieldPart I048_130_RPD_VAL = { 8, 1.0/256.0, FIELD_PART_INT, NULL/*&hf_048_130_06*/, NULL }; static const FieldPart *I048_130_RPD[] = { &I048_130_RPD_VAL, NULL }; -static const FieldPart I048_130_APD_VAL = { 8, 360.0/16384.0, FIELD_PART_FLOAT, NULL/*&hf_048_130_07*/, NULL }; +static const FieldPart I048_130_APD_VAL = { 8, 360.0/16384.0, FIELD_PART_INT, NULL/*&hf_048_130_07*/, NULL }; static const FieldPart *I048_130_APD[] = { &I048_130_APD_VAL, NULL }; /* Track number */ @@ -4961,10 +4961,10 @@ void proto_register_asterix (void) { &hf_048_120_02_AMB, { "AMB[m/s]", "asterix.048_120_02_AMB", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_048_120_02_FRQ, { "FRQ[MHz]", "asterix.048_120_02_FRQ", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_048_130, { "130, Radar Plot Characteristics", "asterix.048_130", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_048_130_01, { "SRL[deg]", "asterix.048_130_01", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_048_130_01, { "SRL[deg]", "asterix.048_130_01", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_048_130_02, { "SRR", "asterix.048_130_02", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_048_130_03, { "SAM[dBm]", "asterix.048_130_03", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_048_130_04, { "PRL[deg]", "asterix.048_130_04", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_048_130_04, { "PRL[deg]", "asterix.048_130_04", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_048_130_05, { "PAM[dBm]", "asterix.048_130_05", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_048_130_06, { "RPD[NM]", "asterix.048_130_06", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_048_130_07, { "APD[deg]", "asterix.048_130_07", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, |