diff --git a/AUTHORS b/AUTHORS index 8ed790b59e..39c52841ee 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4619,6 +4619,7 @@ Jonas Wamsler Jonathan Brucker Jonathan Fleming Jonathan Landis +Jonathan Lennox Jonathan Muñoz Jonathan Nieder Jones Syue @@ -4899,6 +4900,7 @@ Nils Hanke Nils Ohlmeier Nitzan Carmi Noan +Noan Perrot Noel Power Nora Sandler Odysseus Yang @@ -4934,6 +4936,7 @@ Patrick MacArthur Patrick Rauscher Patrick Servello Patrik Moško +Patrik Thunström Patryk Nowak Pau Espin Pedrol Paul Aurich @@ -5328,6 +5331,7 @@ lizhengqiang lutianxiong m.kaldenbach mGhony99 +marmonier_c mbutkereit mirkodeckert mistral13 @@ -5351,7 +5355,9 @@ snicket2100 sofiane degoui steve71 subhav8 +vxcute wi24rd +winprotocolwireshark yuanjungong zhudewen Émilio Gonzalez diff --git a/NEWS b/NEWS index 2b3458fbf9..90a9bce59c 100644 --- a/NEWS +++ b/NEWS @@ -65,6 +65,10 @@ Wireshark 4.3.0 Release Notes properties. Check the wireshark-filter(5) manpage for more information. + • Added new display filter functions to convert unsigned integer + types to decimal or hexadecimal. Check the wireshark-filter(5) + manpage for more information. + • Display filter macros can be written with a semicolon after the macro name before the argument list, e.g. `${mymacro;arg1;…​;argN}`, instead of `${mymacro:arg1;…​;argN}`. @@ -123,7 +127,7 @@ Wireshark 4.3.0 Release Notes • Any combination of the above also works. • Multifield columns are still available. For backwards - compatiblity, `X or Y` is interpreted as a multifield column as + compatibility, `X or Y` is interpreted as a multifield column as before. To represent a logical test for the presence of multiple fields instead of concatenating values, use parenthesis, like `(tcp.options.timestamp or tcp.options.nop`. diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 661b2f6963..921bc89eaf 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -9,7 +9,7 @@ See tools/asterix/README.md for details. Data source: https://zoranbosnjak.github.io/asterix-specs -git revision: 02101f405c0ac65ed80bbe497c204eab475090cb +git revision: 941f5ce71b19d4659401e84b83b084505dd53e28 */ @@ -6296,9 +6296,9 @@ static const FieldPart *I008_V1_2_020_PARTS[] = { static const AsterixField I008_V1_2_020 = { FX, 1, 0, 0, &hf_008_V1_2_020, I008_V1_2_020_PARTS, { NULL } }; static int hf_008_V1_2_034; static int hf_008_V1_2_034_STR; -static const FieldPart I008_V1_2_034_STR = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_034_STR, NULL }; +static const FieldPart I008_V1_2_034_STR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_V1_2_034_STR, NULL }; static int hf_008_V1_2_034_ENDR; -static const FieldPart I008_V1_2_034_ENDR = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_034_ENDR, NULL }; +static const FieldPart I008_V1_2_034_ENDR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_V1_2_034_ENDR, NULL }; static int hf_008_V1_2_034_AZ; static const FieldPart I008_V1_2_034_AZ = { 16, 0.0054931640625, FIELD_PART_UFLOAT, &hf_008_V1_2_034_AZ, NULL }; static const FieldPart *I008_V1_2_034_PARTS[] = { @@ -6310,11 +6310,11 @@ static const FieldPart *I008_V1_2_034_PARTS[] = { static const AsterixField I008_V1_2_034 = { REPETITIVE, 4, 1, 0, &hf_008_V1_2_034, I008_V1_2_034_PARTS, { NULL } }; static int hf_008_V1_2_036; static int hf_008_V1_2_036_X; -static const FieldPart I008_V1_2_036_X = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_036_X, NULL }; +static const FieldPart I008_V1_2_036_X = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_036_X, NULL }; static int hf_008_V1_2_036_Y; -static const FieldPart I008_V1_2_036_Y = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_036_Y, NULL }; +static const FieldPart I008_V1_2_036_Y = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_036_Y, NULL }; static int hf_008_V1_2_036_LENGTH; -static const FieldPart I008_V1_2_036_LENGTH = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_036_LENGTH, NULL }; +static const FieldPart I008_V1_2_036_LENGTH = { 8, 0.015625, FIELD_PART_UFLOAT, &hf_008_V1_2_036_LENGTH, NULL }; static const FieldPart *I008_V1_2_036_PARTS[] = { &I008_V1_2_036_X, &I008_V1_2_036_Y, @@ -6324,13 +6324,13 @@ static const FieldPart *I008_V1_2_036_PARTS[] = { static const AsterixField I008_V1_2_036 = { REPETITIVE, 3, 1, 0, &hf_008_V1_2_036, I008_V1_2_036_PARTS, { NULL } }; static int hf_008_V1_2_038; static int hf_008_V1_2_038_X1; -static const FieldPart I008_V1_2_038_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_038_X1, NULL }; +static const FieldPart I008_V1_2_038_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_038_X1, NULL }; static int hf_008_V1_2_038_Y1; -static const FieldPart I008_V1_2_038_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_038_Y1, NULL }; +static const FieldPart I008_V1_2_038_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_038_Y1, NULL }; static int hf_008_V1_2_038_X2; -static const FieldPart I008_V1_2_038_X2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_038_X2, NULL }; +static const FieldPart I008_V1_2_038_X2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_038_X2, NULL }; static int hf_008_V1_2_038_Y2; -static const FieldPart I008_V1_2_038_Y2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_038_Y2, NULL }; +static const FieldPart I008_V1_2_038_Y2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_038_Y2, NULL }; static const FieldPart *I008_V1_2_038_PARTS[] = { &I008_V1_2_038_X1, &I008_V1_2_038_Y1, @@ -6371,9 +6371,9 @@ static const FieldPart *I008_V1_2_040_PARTS[] = { static const AsterixField I008_V1_2_040 = { FIXED, 2, 0, 0, &hf_008_V1_2_040, I008_V1_2_040_PARTS, { NULL } }; static int hf_008_V1_2_050; static int hf_008_V1_2_050_X1; -static const FieldPart I008_V1_2_050_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_050_X1, NULL }; +static const FieldPart I008_V1_2_050_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_050_X1, NULL }; static int hf_008_V1_2_050_Y1; -static const FieldPart I008_V1_2_050_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_2_050_Y1, NULL }; +static const FieldPart I008_V1_2_050_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_2_050_Y1, NULL }; static const FieldPart *I008_V1_2_050_PARTS[] = { &I008_V1_2_050_X1, &I008_V1_2_050_Y1, @@ -6390,7 +6390,7 @@ static const FieldPart *I008_V1_2_090_PARTS[] = { static const AsterixField I008_V1_2_090 = { FIXED, 3, 0, 0, &hf_008_V1_2_090, I008_V1_2_090_PARTS, { NULL } }; static int hf_008_V1_2_100; static int hf_008_V1_2_100_F; -static const FieldPart I008_V1_2_100_F = { 5, 1.0, FIELD_PART_FLOAT, &hf_008_V1_2_100_F, NULL }; +static const FieldPart I008_V1_2_100_F = { 5, 1.0, FIELD_PART_INT, &hf_008_V1_2_100_F, NULL }; static int hf_008_V1_2_100_R; static const FieldPart I008_V1_2_100_R = { 3, 1.0, FIELD_PART_HEX, &hf_008_V1_2_100_R, NULL }; static int hf_008_V1_2_100_Q; @@ -6526,9 +6526,9 @@ static const FieldPart *I008_V1_3_020_PARTS[] = { static const AsterixField I008_V1_3_020 = { FX, 1, 0, 0, &hf_008_V1_3_020, I008_V1_3_020_PARTS, { NULL } }; static int hf_008_V1_3_034; static int hf_008_V1_3_034_STR; -static const FieldPart I008_V1_3_034_STR = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_034_STR, NULL }; +static const FieldPart I008_V1_3_034_STR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_V1_3_034_STR, NULL }; static int hf_008_V1_3_034_ENDR; -static const FieldPart I008_V1_3_034_ENDR = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_034_ENDR, NULL }; +static const FieldPart I008_V1_3_034_ENDR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_V1_3_034_ENDR, NULL }; static int hf_008_V1_3_034_AZ; static const FieldPart I008_V1_3_034_AZ = { 16, 0.0054931640625, FIELD_PART_UFLOAT, &hf_008_V1_3_034_AZ, NULL }; static const FieldPart *I008_V1_3_034_PARTS[] = { @@ -6540,11 +6540,11 @@ static const FieldPart *I008_V1_3_034_PARTS[] = { static const AsterixField I008_V1_3_034 = { REPETITIVE, 4, 1, 0, &hf_008_V1_3_034, I008_V1_3_034_PARTS, { NULL } }; static int hf_008_V1_3_036; static int hf_008_V1_3_036_X; -static const FieldPart I008_V1_3_036_X = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_036_X, NULL }; +static const FieldPart I008_V1_3_036_X = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_036_X, NULL }; static int hf_008_V1_3_036_Y; -static const FieldPart I008_V1_3_036_Y = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_036_Y, NULL }; +static const FieldPart I008_V1_3_036_Y = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_036_Y, NULL }; static int hf_008_V1_3_036_LENGTH; -static const FieldPart I008_V1_3_036_LENGTH = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_036_LENGTH, NULL }; +static const FieldPart I008_V1_3_036_LENGTH = { 8, 0.015625, FIELD_PART_UFLOAT, &hf_008_V1_3_036_LENGTH, NULL }; static const FieldPart *I008_V1_3_036_PARTS[] = { &I008_V1_3_036_X, &I008_V1_3_036_Y, @@ -6554,13 +6554,13 @@ static const FieldPart *I008_V1_3_036_PARTS[] = { static const AsterixField I008_V1_3_036 = { REPETITIVE, 3, 1, 0, &hf_008_V1_3_036, I008_V1_3_036_PARTS, { NULL } }; static int hf_008_V1_3_038; static int hf_008_V1_3_038_X1; -static const FieldPart I008_V1_3_038_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_038_X1, NULL }; +static const FieldPart I008_V1_3_038_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_038_X1, NULL }; static int hf_008_V1_3_038_Y1; -static const FieldPart I008_V1_3_038_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_038_Y1, NULL }; +static const FieldPart I008_V1_3_038_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_038_Y1, NULL }; static int hf_008_V1_3_038_X2; -static const FieldPart I008_V1_3_038_X2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_038_X2, NULL }; +static const FieldPart I008_V1_3_038_X2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_038_X2, NULL }; static int hf_008_V1_3_038_Y2; -static const FieldPart I008_V1_3_038_Y2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_038_Y2, NULL }; +static const FieldPart I008_V1_3_038_Y2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_038_Y2, NULL }; static const FieldPart *I008_V1_3_038_PARTS[] = { &I008_V1_3_038_X1, &I008_V1_3_038_Y1, @@ -6601,9 +6601,9 @@ static const FieldPart *I008_V1_3_040_PARTS[] = { static const AsterixField I008_V1_3_040 = { FIXED, 2, 0, 0, &hf_008_V1_3_040, I008_V1_3_040_PARTS, { NULL } }; static int hf_008_V1_3_050; static int hf_008_V1_3_050_X1; -static const FieldPart I008_V1_3_050_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_050_X1, NULL }; +static const FieldPart I008_V1_3_050_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_050_X1, NULL }; static int hf_008_V1_3_050_Y1; -static const FieldPart I008_V1_3_050_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_V1_3_050_Y1, NULL }; +static const FieldPart I008_V1_3_050_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_V1_3_050_Y1, NULL }; static const FieldPart *I008_V1_3_050_PARTS[] = { &I008_V1_3_050_X1, &I008_V1_3_050_Y1, @@ -6620,7 +6620,7 @@ static const FieldPart *I008_V1_3_090_PARTS[] = { static const AsterixField I008_V1_3_090 = { FIXED, 3, 0, 0, &hf_008_V1_3_090, I008_V1_3_090_PARTS, { NULL } }; static int hf_008_V1_3_100; static int hf_008_V1_3_100_F; -static const FieldPart I008_V1_3_100_F = { 5, 1.0, FIELD_PART_FLOAT, &hf_008_V1_3_100_F, NULL }; +static const FieldPart I008_V1_3_100_F = { 5, 1.0, FIELD_PART_INT, &hf_008_V1_3_100_F, NULL }; static int hf_008_V1_3_100_R; static const FieldPart I008_V1_3_100_R = { 3, 1.0, FIELD_PART_HEX, &hf_008_V1_3_100_R, NULL }; static int hf_008_V1_3_100_Q; @@ -6733,9 +6733,9 @@ static const FieldPart *I008_020_PARTS[] = { static const AsterixField I008_020 = { FX, 1, 0, 0, &hf_008_020, I008_020_PARTS, { NULL } }; static int hf_008_034; static int hf_008_034_STR; -static const FieldPart I008_034_STR = { 8, 1.0, FIELD_PART_HEX, &hf_008_034_STR, NULL }; +static const FieldPart I008_034_STR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_034_STR, NULL }; static int hf_008_034_ENDR; -static const FieldPart I008_034_ENDR = { 8, 1.0, FIELD_PART_HEX, &hf_008_034_ENDR, NULL }; +static const FieldPart I008_034_ENDR = { 8, 0.0078125, FIELD_PART_UFLOAT, &hf_008_034_ENDR, NULL }; static int hf_008_034_AZ; static const FieldPart I008_034_AZ = { 16, 0.0054931640625, FIELD_PART_UFLOAT, &hf_008_034_AZ, NULL }; static const FieldPart *I008_034_PARTS[] = { @@ -6747,11 +6747,11 @@ static const FieldPart *I008_034_PARTS[] = { static const AsterixField I008_034 = { REPETITIVE, 4, 1, 0, &hf_008_034, I008_034_PARTS, { NULL } }; static int hf_008_036; static int hf_008_036_X; -static const FieldPart I008_036_X = { 8, 1.0, FIELD_PART_HEX, &hf_008_036_X, NULL }; +static const FieldPart I008_036_X = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_036_X, NULL }; static int hf_008_036_Y; -static const FieldPart I008_036_Y = { 8, 1.0, FIELD_PART_HEX, &hf_008_036_Y, NULL }; +static const FieldPart I008_036_Y = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_036_Y, NULL }; static int hf_008_036_LENGTH; -static const FieldPart I008_036_LENGTH = { 8, 1.0, FIELD_PART_HEX, &hf_008_036_LENGTH, NULL }; +static const FieldPart I008_036_LENGTH = { 8, 0.015625, FIELD_PART_UFLOAT, &hf_008_036_LENGTH, NULL }; static const FieldPart *I008_036_PARTS[] = { &I008_036_X, &I008_036_Y, @@ -6761,13 +6761,13 @@ static const FieldPart *I008_036_PARTS[] = { static const AsterixField I008_036 = { REPETITIVE, 3, 1, 0, &hf_008_036, I008_036_PARTS, { NULL } }; static int hf_008_038; static int hf_008_038_X1; -static const FieldPart I008_038_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_038_X1, NULL }; +static const FieldPart I008_038_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_038_X1, NULL }; static int hf_008_038_Y1; -static const FieldPart I008_038_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_038_Y1, NULL }; +static const FieldPart I008_038_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_038_Y1, NULL }; static int hf_008_038_X2; -static const FieldPart I008_038_X2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_038_X2, NULL }; +static const FieldPart I008_038_X2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_038_X2, NULL }; static int hf_008_038_Y2; -static const FieldPart I008_038_Y2 = { 8, 1.0, FIELD_PART_HEX, &hf_008_038_Y2, NULL }; +static const FieldPart I008_038_Y2 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_038_Y2, NULL }; static const FieldPart *I008_038_PARTS[] = { &I008_038_X1, &I008_038_Y1, @@ -6808,9 +6808,9 @@ static const FieldPart *I008_040_PARTS[] = { static const AsterixField I008_040 = { FIXED, 2, 0, 0, &hf_008_040, I008_040_PARTS, { NULL } }; static int hf_008_050; static int hf_008_050_X1; -static const FieldPart I008_050_X1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_050_X1, NULL }; +static const FieldPart I008_050_X1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_050_X1, NULL }; static int hf_008_050_Y1; -static const FieldPart I008_050_Y1 = { 8, 1.0, FIELD_PART_HEX, &hf_008_050_Y1, NULL }; +static const FieldPart I008_050_Y1 = { 8, 0.015625, FIELD_PART_FLOAT, &hf_008_050_Y1, NULL }; static const FieldPart *I008_050_PARTS[] = { &I008_050_X1, &I008_050_Y1, @@ -6827,7 +6827,7 @@ static const FieldPart *I008_090_PARTS[] = { static const AsterixField I008_090 = { FIXED, 3, 0, 0, &hf_008_090, I008_090_PARTS, { NULL } }; static int hf_008_100; static int hf_008_100_F; -static const FieldPart I008_100_F = { 5, 1.0, FIELD_PART_FLOAT, &hf_008_100_F, NULL }; +static const FieldPart I008_100_F = { 5, 1.0, FIELD_PART_INT, &hf_008_100_F, NULL }; static int hf_008_100_R; static const FieldPart I008_100_R = { 3, 1.0, FIELD_PART_HEX, &hf_008_100_R, NULL }; static int hf_008_100_Q; @@ -6966,11 +6966,11 @@ static const FieldPart *I009_V2_1_020_PARTS[] = { static const AsterixField I009_V2_1_020 = { FX, 1, 0, 0, &hf_009_V2_1_020, I009_V2_1_020_PARTS, { NULL } }; static int hf_009_V2_1_030; static int hf_009_V2_1_030_X; -static const FieldPart I009_V2_1_030_X = { 16, 1.0, FIELD_PART_FLOAT, &hf_009_V2_1_030_X, NULL }; +static const FieldPart I009_V2_1_030_X = { 16, 0.015625, FIELD_PART_FLOAT, &hf_009_V2_1_030_X, NULL }; static int hf_009_V2_1_030_Y; -static const FieldPart I009_V2_1_030_Y = { 16, 1.0, FIELD_PART_FLOAT, &hf_009_V2_1_030_Y, NULL }; +static const FieldPart I009_V2_1_030_Y = { 16, 0.015625, FIELD_PART_FLOAT, &hf_009_V2_1_030_Y, NULL }; static int hf_009_V2_1_030_L; -static const FieldPart I009_V2_1_030_L = { 16, 1.0, FIELD_PART_UINT, &hf_009_V2_1_030_L, NULL }; +static const FieldPart I009_V2_1_030_L = { 16, 0.015625, FIELD_PART_UFLOAT, &hf_009_V2_1_030_L, NULL }; static const FieldPart *I009_V2_1_030_PARTS[] = { &I009_V2_1_030_X, &I009_V2_1_030_Y, @@ -6998,7 +6998,7 @@ static const FieldPart *I009_V2_1_070_PARTS[] = { static const AsterixField I009_V2_1_070 = { FIXED, 3, 0, 0, &hf_009_V2_1_070, I009_V2_1_070_PARTS, { NULL } }; static int hf_009_V2_1_080; static int hf_009_V2_1_080_F; -static const FieldPart I009_V2_1_080_F = { 5, 1.0, FIELD_PART_FLOAT, &hf_009_V2_1_080_F, NULL }; +static const FieldPart I009_V2_1_080_F = { 5, 1.0, FIELD_PART_INT, &hf_009_V2_1_080_F, NULL }; static int hf_009_V2_1_080_R; static const FieldPart I009_V2_1_080_R = { 3, 1.0, FIELD_PART_HEX, &hf_009_V2_1_080_R, NULL }; static int hf_009_V2_1_080_Q; @@ -7101,11 +7101,11 @@ static const FieldPart *I009_020_PARTS[] = { static const AsterixField I009_020 = { FX, 1, 0, 0, &hf_009_020, I009_020_PARTS, { NULL } }; static int hf_009_030; static int hf_009_030_X; -static const FieldPart I009_030_X = { 16, 1.0, FIELD_PART_FLOAT, &hf_009_030_X, NULL }; +static const FieldPart I009_030_X = { 16, 0.015625, FIELD_PART_FLOAT, &hf_009_030_X, NULL }; static int hf_009_030_Y; -static const FieldPart I009_030_Y = { 16, 1.0, FIELD_PART_FLOAT, &hf_009_030_Y, NULL }; +static const FieldPart I009_030_Y = { 16, 0.015625, FIELD_PART_FLOAT, &hf_009_030_Y, NULL }; static int hf_009_030_L; -static const FieldPart I009_030_L = { 16, 1.0, FIELD_PART_UINT, &hf_009_030_L, NULL }; +static const FieldPart I009_030_L = { 16, 0.015625, FIELD_PART_UFLOAT, &hf_009_030_L, NULL }; static const FieldPart *I009_030_PARTS[] = { &I009_030_X, &I009_030_Y, @@ -7133,7 +7133,7 @@ static const FieldPart *I009_070_PARTS[] = { static const AsterixField I009_070 = { FIXED, 3, 0, 0, &hf_009_070, I009_070_PARTS, { NULL } }; static int hf_009_080; static int hf_009_080_F; -static const FieldPart I009_080_F = { 5, 1.0, FIELD_PART_FLOAT, &hf_009_080_F, NULL }; +static const FieldPart I009_080_F = { 5, 1.0, FIELD_PART_INT, &hf_009_080_F, NULL }; static int hf_009_080_R; static const FieldPart I009_080_R = { 3, 1.0, FIELD_PART_HEX, &hf_009_080_R, NULL }; static int hf_009_080_Q; @@ -56962,30 +56962,30 @@ void proto_register_asterix (void) { &hf_008_V1_2_020_TST, { "TST", "asterix.008_V1_2_020_TST", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_2_020_TST), 0x04, NULL, HFILL } }, { &hf_008_V1_2_020_ER, { "ER", "asterix.008_V1_2_020_ER", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_2_020_ER), 0x02, NULL, HFILL } }, { &hf_008_V1_2_034, { "034, Sequence of Polar Vectors in SPF Notation", "asterix.008_V1_2_034", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_034_STR, { "STR, Start Range", "asterix.008_V1_2_034_STR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_034_ENDR, { "ENDR, End Range", "asterix.008_V1_2_034_ENDR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_034_STR, { "STR, Start Range, [(NM)]", "asterix.008_V1_2_034_STR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_034_ENDR, { "ENDR, End Range, [(NM)]", "asterix.008_V1_2_034_ENDR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_034_AZ, { "AZ, Azimuth, [°]", "asterix.008_V1_2_034_AZ", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_036, { "036, Sequence of Cartesian Vectors in SPF Notation", "asterix.008_V1_2_036", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_036_X, { "X, X-Component", "asterix.008_V1_2_036_X", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_036_Y, { "Y, Y-Component", "asterix.008_V1_2_036_Y", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_036_LENGTH, { "LENGTH, Length", "asterix.008_V1_2_036_LENGTH", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_036_X, { "X, X-Component, [(NM)]", "asterix.008_V1_2_036_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_036_Y, { "Y, Y-Component, [(NM)]", "asterix.008_V1_2_036_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_036_LENGTH, { "LENGTH, Length, [(NM)]", "asterix.008_V1_2_036_LENGTH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_038, { "038, Sequence of Weather Vectors in SPF Notation", "asterix.008_V1_2_038", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_038_X1, { "X1, X1-Component", "asterix.008_V1_2_038_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_038_Y1, { "Y1, Y1-Component", "asterix.008_V1_2_038_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_038_X2, { "X2, X2-Component", "asterix.008_V1_2_038_X2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_038_Y2, { "Y2, Y2-Component", "asterix.008_V1_2_038_Y2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_038_X1, { "X1, X1-Component, [(NM)]", "asterix.008_V1_2_038_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_038_Y1, { "Y1, Y1-Component, [(NM)]", "asterix.008_V1_2_038_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_038_X2, { "X2, X2-Component, [(NM)]", "asterix.008_V1_2_038_X2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_038_Y2, { "Y2, Y2-Component, [(NM)]", "asterix.008_V1_2_038_Y2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_040, { "040, Contour Identifier", "asterix.008_V1_2_040", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_040_ORG, { "ORG", "asterix.008_V1_2_040_ORG", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_2_040_ORG), 0x80, NULL, HFILL } }, { &hf_008_V1_2_040_I, { "I, Intensity Level", "asterix.008_V1_2_040_I", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_008_V1_2_040_FSTLST, { "FSTLST", "asterix.008_V1_2_040_FSTLST", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_2_040_FSTLST), 0x03, NULL, HFILL } }, { &hf_008_V1_2_040_CSN, { "CSN, Contour Serial Number", "asterix.008_V1_2_040_CSN", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_050, { "050, Sequence of Contour Points in SPF Notation", "asterix.008_V1_2_050", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_050_X1, { "X1", "asterix.008_V1_2_050_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_050_Y1, { "Y1", "asterix.008_V1_2_050_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_050_X1, { "X1, [(NM)]", "asterix.008_V1_2_050_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_050_Y1, { "Y1, [(NM)]", "asterix.008_V1_2_050_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_090, { "090, Time of Day", "asterix.008_V1_2_090", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_090_VALUE, { "Time of Day, [s]", "asterix.008_V1_2_090_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_2_100, { "100, Processing Status", "asterix.008_V1_2_100", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_2_100_F, { "F, Scaling Factor", "asterix.008_V1_2_100_F", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_2_100_F, { "F, Scaling Factor", "asterix.008_V1_2_100_F", FT_INT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, { &hf_008_V1_2_100_R, { "R, Current Reduction Stage in Use", "asterix.008_V1_2_100_R", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL } }, { &hf_008_V1_2_100_Q, { "Q, Processing Parameters", "asterix.008_V1_2_100_Q", FT_UINT16, BASE_DEC, NULL, 0xfffe, NULL, HFILL } }, { &hf_008_V1_2_110, { "110, Station Configuration Status", "asterix.008_V1_2_110", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57005,30 +57005,30 @@ void proto_register_asterix (void) { &hf_008_V1_3_020_TST, { "TST", "asterix.008_V1_3_020_TST", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_3_020_TST), 0x04, NULL, HFILL } }, { &hf_008_V1_3_020_ER, { "ER", "asterix.008_V1_3_020_ER", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_3_020_ER), 0x02, NULL, HFILL } }, { &hf_008_V1_3_034, { "034, Sequence of Polar Vectors in SPF Notation", "asterix.008_V1_3_034", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_034_STR, { "STR, Start Range", "asterix.008_V1_3_034_STR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_034_ENDR, { "ENDR, End Range", "asterix.008_V1_3_034_ENDR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_034_STR, { "STR, Start Range, [(NM)]", "asterix.008_V1_3_034_STR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_034_ENDR, { "ENDR, End Range, [(NM)]", "asterix.008_V1_3_034_ENDR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_034_AZ, { "AZ, Azimuth, [°]", "asterix.008_V1_3_034_AZ", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_036, { "036, Sequence of Cartesian Vectors in SPF Notation", "asterix.008_V1_3_036", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_036_X, { "X, X-Component", "asterix.008_V1_3_036_X", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_036_Y, { "Y, Y-Component", "asterix.008_V1_3_036_Y", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_036_LENGTH, { "LENGTH, Length", "asterix.008_V1_3_036_LENGTH", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_036_X, { "X, X-Component, [(NM)]", "asterix.008_V1_3_036_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_036_Y, { "Y, Y-Component, [(NM)]", "asterix.008_V1_3_036_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_036_LENGTH, { "LENGTH, Length, [(NM)]", "asterix.008_V1_3_036_LENGTH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_038, { "038, Sequence of Weather Vectors in SPF Notation", "asterix.008_V1_3_038", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_038_X1, { "X1, X1-Component", "asterix.008_V1_3_038_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_038_Y1, { "Y1, Y1-Component", "asterix.008_V1_3_038_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_038_X2, { "X2, X2-Component", "asterix.008_V1_3_038_X2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_038_Y2, { "Y2, Y2-Component", "asterix.008_V1_3_038_Y2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_038_X1, { "X1, X1-Component, [(NM)]", "asterix.008_V1_3_038_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_038_Y1, { "Y1, Y1-Component, [(NM)]", "asterix.008_V1_3_038_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_038_X2, { "X2, X2-Component, [(NM)]", "asterix.008_V1_3_038_X2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_038_Y2, { "Y2, Y2-Component, [(NM)]", "asterix.008_V1_3_038_Y2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_040, { "040, Contour Identifier", "asterix.008_V1_3_040", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_040_ORG, { "ORG", "asterix.008_V1_3_040_ORG", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_3_040_ORG), 0x80, NULL, HFILL } }, { &hf_008_V1_3_040_I, { "I, Intensity Level", "asterix.008_V1_3_040_I", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_008_V1_3_040_FSTLST, { "FSTLST", "asterix.008_V1_3_040_FSTLST", FT_UINT8, BASE_DEC, VALS (valstr_008_V1_3_040_FSTLST), 0x03, NULL, HFILL } }, { &hf_008_V1_3_040_CSN, { "CSN, Contour Serial Number", "asterix.008_V1_3_040_CSN", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_050, { "050, Sequence of Contour Points in SPF Notation", "asterix.008_V1_3_050", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_050_X1, { "X1", "asterix.008_V1_3_050_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_050_Y1, { "Y1", "asterix.008_V1_3_050_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_050_X1, { "X1, [(NM)]", "asterix.008_V1_3_050_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_050_Y1, { "Y1, [(NM)]", "asterix.008_V1_3_050_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_090, { "090, Time of Day", "asterix.008_V1_3_090", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_090_VALUE, { "Time of Day, [s]", "asterix.008_V1_3_090_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_V1_3_100, { "100, Processing Status", "asterix.008_V1_3_100", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_V1_3_100_F, { "F, Scaling Factor", "asterix.008_V1_3_100_F", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_V1_3_100_F, { "F, Scaling Factor", "asterix.008_V1_3_100_F", FT_INT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, { &hf_008_V1_3_100_R, { "R, Current Reduction Stage in Use", "asterix.008_V1_3_100_R", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL } }, { &hf_008_V1_3_100_Q, { "Q, Processing Parameters", "asterix.008_V1_3_100_Q", FT_UINT16, BASE_DEC, NULL, 0xfffe, NULL, HFILL } }, { &hf_008_V1_3_110, { "110, Station Configuration Status", "asterix.008_V1_3_110", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57048,30 +57048,30 @@ void proto_register_asterix (void) { &hf_008_020_TST, { "TST", "asterix.008_020_TST", FT_UINT8, BASE_DEC, VALS (valstr_008_020_TST), 0x04, NULL, HFILL } }, { &hf_008_020_ER, { "ER", "asterix.008_020_ER", FT_UINT8, BASE_DEC, VALS (valstr_008_020_ER), 0x02, NULL, HFILL } }, { &hf_008_034, { "034, Sequence of Polar Vectors in SPF Notation", "asterix.008_034", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_034_STR, { "STR, Start Range", "asterix.008_034_STR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_034_ENDR, { "ENDR, End Range", "asterix.008_034_ENDR", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_034_STR, { "STR, Start Range, [(NM)]", "asterix.008_034_STR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_034_ENDR, { "ENDR, End Range, [(NM)]", "asterix.008_034_ENDR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_034_AZ, { "AZ, Azimuth, [°]", "asterix.008_034_AZ", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_036, { "036, Sequence of Cartesian Vectors in SPF Notation", "asterix.008_036", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_036_X, { "X, X-Component", "asterix.008_036_X", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_036_Y, { "Y, Y-Component", "asterix.008_036_Y", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_036_LENGTH, { "LENGTH, Length", "asterix.008_036_LENGTH", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_036_X, { "X, X-Component, [(NM)]", "asterix.008_036_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_036_Y, { "Y, Y-Component, [(NM)]", "asterix.008_036_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_036_LENGTH, { "LENGTH, Length, [(NM)]", "asterix.008_036_LENGTH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_038, { "038, Sequence of Weather Vectors in SPF Notation", "asterix.008_038", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_038_X1, { "X1, X1-Component", "asterix.008_038_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_038_Y1, { "Y1, Y1-Component", "asterix.008_038_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_038_X2, { "X2, X2-Component", "asterix.008_038_X2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_038_Y2, { "Y2, Y2-Component", "asterix.008_038_Y2", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_038_X1, { "X1, X1-Component, [(NM)]", "asterix.008_038_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_038_Y1, { "Y1, Y1-Component, [(NM)]", "asterix.008_038_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_038_X2, { "X2, X2-Component, [(NM)]", "asterix.008_038_X2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_038_Y2, { "Y2, Y2-Component, [(NM)]", "asterix.008_038_Y2", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_040, { "040, Contour Identifier", "asterix.008_040", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_040_ORG, { "ORG", "asterix.008_040_ORG", FT_UINT8, BASE_DEC, VALS (valstr_008_040_ORG), 0x80, NULL, HFILL } }, { &hf_008_040_I, { "I, Intensity Level", "asterix.008_040_I", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_008_040_FSTLST, { "FSTLST", "asterix.008_040_FSTLST", FT_UINT8, BASE_DEC, VALS (valstr_008_040_FSTLST), 0x03, NULL, HFILL } }, { &hf_008_040_CSN, { "CSN, Contour Serial Number", "asterix.008_040_CSN", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_008_050, { "050, Sequence of Contour Points in SPF Notation", "asterix.008_050", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_050_X1, { "X1", "asterix.008_050_X1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, - { &hf_008_050_Y1, { "Y1", "asterix.008_050_Y1", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_008_050_X1, { "X1, [(NM)]", "asterix.008_050_X1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_050_Y1, { "Y1, [(NM)]", "asterix.008_050_Y1", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_090, { "090, Time of Day", "asterix.008_090", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_090_VALUE, { "Time of Day, [s]", "asterix.008_090_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_008_100, { "100, Processing Status", "asterix.008_100", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_008_100_F, { "F, Scaling Factor", "asterix.008_100_F", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_008_100_F, { "F, Scaling Factor", "asterix.008_100_F", FT_INT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, { &hf_008_100_R, { "R, Current Reduction Stage in Use", "asterix.008_100_R", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL } }, { &hf_008_100_Q, { "Q, Processing Parameters", "asterix.008_100_Q", FT_UINT16, BASE_DEC, NULL, 0xfffe, NULL, HFILL } }, { &hf_008_110, { "110, Station Configuration Status", "asterix.008_110", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57089,15 +57089,15 @@ void proto_register_asterix (void) { &hf_009_V2_1_020_I, { "I, Intensity Level", "asterix.009_V2_1_020_I", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_009_V2_1_020_S, { "S, Shading Orientation with Respect to North", "asterix.009_V2_1_020_S", FT_UINT8, BASE_DEC, VALS (valstr_009_V2_1_020_S), 0x0e, NULL, HFILL } }, { &hf_009_V2_1_030, { "030, Sequence of Cartesian Vectors", "asterix.009_V2_1_030", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_V2_1_030_X, { "X, X-coordinate, [NM]", "asterix.009_V2_1_030_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_V2_1_030_Y, { "Y, Y-coordinate, [NM]", "asterix.009_V2_1_030_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_V2_1_030_L, { "L, Vector Length", "asterix.009_V2_1_030_L", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_009_V2_1_030_X, { "X, X-coordinate, [(NM)]", "asterix.009_V2_1_030_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_V2_1_030_Y, { "Y, Y-coordinate, [(NM)]", "asterix.009_V2_1_030_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_V2_1_030_L, { "L, Vector Length, [(NM)]", "asterix.009_V2_1_030_L", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_V2_1_060, { "060, Synchronisation/Control Signal", "asterix.009_V2_1_060", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_V2_1_060_SN, { "SN, Step Number", "asterix.009_V2_1_060_SN", FT_UINT8, BASE_DEC, NULL, 0xfc, NULL, HFILL } }, { &hf_009_V2_1_070, { "070, Time of Day", "asterix.009_V2_1_070", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_V2_1_070_VALUE, { "Time of Day, [s]", "asterix.009_V2_1_070_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_V2_1_080, { "080, Processing Status", "asterix.009_V2_1_080", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_V2_1_080_F, { "F, Scaling Factor", "asterix.009_V2_1_080_F", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_V2_1_080_F, { "F, Scaling Factor", "asterix.009_V2_1_080_F", FT_INT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, { &hf_009_V2_1_080_R, { "R, Current Reduction Stage in Use", "asterix.009_V2_1_080_R", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL } }, { &hf_009_V2_1_080_Q, { "Q, Processing Parameters", "asterix.009_V2_1_080_Q", FT_UINT16, BASE_DEC, NULL, 0xfffe, NULL, HFILL } }, { &hf_009_V2_1_090, { "090, Radar Configuration and Status", "asterix.009_V2_1_090", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57118,15 +57118,15 @@ void proto_register_asterix (void) { &hf_009_020_I, { "I, Intensity Level", "asterix.009_020_I", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_009_020_S, { "S, Shading Orientation with Respect to North", "asterix.009_020_S", FT_UINT8, BASE_DEC, VALS (valstr_009_020_S), 0x0e, NULL, HFILL } }, { &hf_009_030, { "030, Sequence of Cartesian Vectors", "asterix.009_030", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_030_X, { "X, X-coordinate, [NM]", "asterix.009_030_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_030_Y, { "Y, Y-coordinate, [NM]", "asterix.009_030_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_030_L, { "L, Vector Length", "asterix.009_030_L", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_009_030_X, { "X, X-coordinate, [(NM)]", "asterix.009_030_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_030_Y, { "Y, Y-coordinate, [(NM)]", "asterix.009_030_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_030_L, { "L, Vector Length, [(NM)]", "asterix.009_030_L", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_060, { "060, Synchronisation/Control Signal", "asterix.009_060", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_060_SN, { "SN, Step Number", "asterix.009_060_SN", FT_UINT8, BASE_DEC, NULL, 0xfc, NULL, HFILL } }, { &hf_009_070, { "070, Time of Day", "asterix.009_070", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_070_VALUE, { "Time of Day, [s]", "asterix.009_070_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_009_080, { "080, Processing Status", "asterix.009_080", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_009_080_F, { "F, Scaling Factor", "asterix.009_080_F", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_009_080_F, { "F, Scaling Factor", "asterix.009_080_F", FT_INT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, { &hf_009_080_R, { "R, Current Reduction Stage in Use", "asterix.009_080_R", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL } }, { &hf_009_080_Q, { "Q, Processing Parameters", "asterix.009_080_Q", FT_UINT16, BASE_DEC, NULL, 0xfffe, NULL, HFILL } }, { &hf_009_090, { "090, Radar Configuration and Status", "asterix.009_090", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57198,8 +57198,8 @@ void proto_register_asterix (void) { &hf_010_V1_1_202_VX, { "VX, X Velocity, [m/s]", "asterix.010_V1_1_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_V1_1_202_VY, { "VY, Y Velocity, [m/s]", "asterix.010_V1_1_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_V1_1_210, { "210, Calculated Acceleration", "asterix.010_V1_1_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_010_V1_1_210_AX, { "AX, X Acceleration, [m/s2]", "asterix.010_V1_1_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_010_V1_1_210_AY, { "AY, Y Acceleration, [m/s2]", "asterix.010_V1_1_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_010_V1_1_210_AX, { "AX, X Acceleration, [m/s²]", "asterix.010_V1_1_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_010_V1_1_210_AY, { "AY, Y Acceleration, [m/s²]", "asterix.010_V1_1_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_V1_1_220, { "220, Target Address", "asterix.010_V1_1_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_V1_1_220_VALUE, { "Target Address", "asterix.010_V1_1_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_010_V1_1_245, { "245, Target Identification", "asterix.010_V1_1_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57294,8 +57294,8 @@ void proto_register_asterix (void) { &hf_010_202_VX, { "VX, X Velocity, [m/s]", "asterix.010_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_202_VY, { "VY, Y Velocity, [m/s]", "asterix.010_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_210, { "210, Calculated Acceleration", "asterix.010_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_010_210_AX, { "AX, X Acceleration, [m/s2]", "asterix.010_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_010_210_AY, { "AY, Y Acceleration, [m/s2]", "asterix.010_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_010_210_AX, { "AX, X Acceleration, [m/s²]", "asterix.010_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_010_210_AY, { "AY, Y Acceleration, [m/s²]", "asterix.010_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_220, { "220, Target Address", "asterix.010_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_010_220_VALUE, { "Target Address", "asterix.010_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_010_245, { "245, Target Identification", "asterix.010_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57376,8 +57376,8 @@ void proto_register_asterix (void) { &hf_011_V1_2_202_VX, { "VX, Vx, [m/s]", "asterix.011_V1_2_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_202_VY, { "VY, Vy, [m/s]", "asterix.011_V1_2_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_210, { "210, Calculated Acceleration", "asterix.011_V1_2_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_2_210_AX, { "AX, Ax, [m/s2]", "asterix.011_V1_2_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_2_210_AY, { "AY, Ay, [m/s2]", "asterix.011_V1_2_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_2_210_AX, { "AX, Ax, [m/s²]", "asterix.011_V1_2_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_2_210_AY, { "AY, Ay, [m/s²]", "asterix.011_V1_2_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_215, { "215, Calculated Rate Of Climb/Descent", "asterix.011_V1_2_215", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_215_VALUE, { "Calculated Rate Of Climb/Descent, [ft/min]", "asterix.011_V1_2_215_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_245, { "245, Target Identification", "asterix.011_V1_2_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57499,8 +57499,8 @@ void proto_register_asterix (void) { &hf_011_V1_2_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb / Descent", "asterix.011_V1_2_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb / Descent, [m/s]", "asterix.011_V1_2_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_500_AAC, { "AAC, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.011_V1_2_500_AAC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_2_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s2]", "asterix.011_V1_2_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_2_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s2]", "asterix.011_V1_2_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_2_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s²]", "asterix.011_V1_2_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_2_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s²]", "asterix.011_V1_2_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_600, { "600, Alert Messages", "asterix.011_V1_2_600", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_2_600_ACK, { "ACK, Alert Acknowleged", "asterix.011_V1_2_600_ACK", FT_UINT8, BASE_DEC, VALS (valstr_011_V1_2_600_ACK), 0x80, NULL, HFILL } }, { &hf_011_V1_2_600_SVR, { "SVR, Alert Severity", "asterix.011_V1_2_600_SVR", FT_UINT8, BASE_DEC, VALS (valstr_011_V1_2_600_SVR), 0x60, NULL, HFILL } }, @@ -57577,8 +57577,8 @@ void proto_register_asterix (void) { &hf_011_V1_3_202_VX, { "VX, Vx, [m/s]", "asterix.011_V1_3_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_202_VY, { "VY, Vy, [m/s]", "asterix.011_V1_3_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_210, { "210, Calculated Acceleration", "asterix.011_V1_3_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_3_210_AX, { "AX, Ax, [m/s2]", "asterix.011_V1_3_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_3_210_AY, { "AY, Ay, [m/s2]", "asterix.011_V1_3_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_3_210_AX, { "AX, Ax, [m/s²]", "asterix.011_V1_3_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_3_210_AY, { "AY, Ay, [m/s²]", "asterix.011_V1_3_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_215, { "215, Calculated Rate Of Climb/Descent", "asterix.011_V1_3_215", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_215_VALUE, { "Calculated Rate Of Climb/Descent, [ft/min]", "asterix.011_V1_3_215_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_245, { "245, Target Identification", "asterix.011_V1_3_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57700,8 +57700,8 @@ void proto_register_asterix (void) { &hf_011_V1_3_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb / Descent", "asterix.011_V1_3_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb / Descent, [m/s]", "asterix.011_V1_3_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_500_AAC, { "AAC, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.011_V1_3_500_AAC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_3_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s2]", "asterix.011_V1_3_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_V1_3_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s2]", "asterix.011_V1_3_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_3_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s²]", "asterix.011_V1_3_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_V1_3_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s²]", "asterix.011_V1_3_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_600, { "600, Alert Messages", "asterix.011_V1_3_600", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_V1_3_600_ACK, { "ACK, Alert Acknowleged", "asterix.011_V1_3_600_ACK", FT_UINT8, BASE_DEC, VALS (valstr_011_V1_3_600_ACK), 0x80, NULL, HFILL } }, { &hf_011_V1_3_600_SVR, { "SVR, Alert Severity", "asterix.011_V1_3_600_SVR", FT_UINT8, BASE_DEC, VALS (valstr_011_V1_3_600_SVR), 0x60, NULL, HFILL } }, @@ -57778,8 +57778,8 @@ void proto_register_asterix (void) { &hf_011_202_VX, { "VX, Vx, [m/s]", "asterix.011_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_202_VY, { "VY, Vy, [m/s]", "asterix.011_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_210, { "210, Calculated Acceleration", "asterix.011_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_210_AX, { "AX, Ax, [m/s2]", "asterix.011_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_210_AY, { "AY, Ay, [m/s2]", "asterix.011_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_210_AX, { "AX, Ax, [m/s²]", "asterix.011_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_210_AY, { "AY, Ay, [m/s²]", "asterix.011_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_215, { "215, Calculated Rate Of Climb/Descent", "asterix.011_215", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_215_VALUE, { "Calculated Rate Of Climb/Descent, [ft/min]", "asterix.011_215_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_245, { "245, Target Identification", "asterix.011_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -57901,8 +57901,8 @@ void proto_register_asterix (void) { &hf_011_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb / Descent", "asterix.011_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb / Descent, [m/s]", "asterix.011_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_500_AAC, { "AAC, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.011_500_AAC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s2]", "asterix.011_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_011_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s2]", "asterix.011_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_500_AAC_X, { "X, Estimated Accuracy Of Acceleration of X Component, [m/s²]", "asterix.011_500_AAC_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_011_500_AAC_Y, { "Y, Estimated Accuracy Of Acceleration of Y Component, [m/s²]", "asterix.011_500_AAC_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_600, { "600, Alert Messages", "asterix.011_600", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_011_600_ACK, { "ACK, Alert Acknowleged", "asterix.011_600_ACK", FT_UINT8, BASE_DEC, VALS (valstr_011_600_ACK), 0x80, NULL, HFILL } }, { &hf_011_600_SVR, { "SVR, Alert Severity", "asterix.011_600_SVR", FT_UINT8, BASE_DEC, VALS (valstr_011_600_SVR), 0x60, NULL, HFILL } }, @@ -58023,11 +58023,11 @@ void proto_register_asterix (void) { &hf_015_V1_0_602_COHVHP_COHVYHPY, { "COHVYHPY", "asterix.015_V1_0_602_COHVHP_COHVYHPY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603, { "603, Horizontal Acceleration Information", "asterix.015_V1_0_603", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603_HA, { "HA, Horizontal Acceleration Vector", "asterix.015_V1_0_603_HA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_603_HA_X, { "X, [m/s2]", "asterix.015_V1_0_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_603_HA_Y, { "Y, [m/s2]", "asterix.015_V1_0_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_603_HA_X, { "X, [m/s²]", "asterix.015_V1_0_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_603_HA_Y, { "Y, [m/s²]", "asterix.015_V1_0_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603_SDHA, { "SDHA, Horizontal Acceleration Precision", "asterix.015_V1_0_603_SDHA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_603_SDHA_X, { "X, [m/s2]", "asterix.015_V1_0_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_603_SDHA_Y, { "Y, [m/s2]", "asterix.015_V1_0_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_603_SDHA_X, { "X, [m/s²]", "asterix.015_V1_0_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_603_SDHA_Y, { "Y, [m/s²]", "asterix.015_V1_0_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603_SDHA_COHAXY, { "COHAXY", "asterix.015_V1_0_603_SDHA_COHAXY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603_COHAHP, { "COHAHP, Correlation of Horizontal Acceleration and Horizontal Position", "asterix.015_V1_0_603_COHAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_603_COHAHP_COHAXHPX, { "COHAXHPX", "asterix.015_V1_0_603_COHAHP_COHAXHPX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58058,9 +58058,9 @@ void proto_register_asterix (void) { &hf_015_V1_0_604_COVVHA_Y, { "Y", "asterix.015_V1_0_604_COVVHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605, { "605, Vertical Velocity Information", "asterix.015_V1_0_605", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605_VA, { "VA, Vertical Acceleration", "asterix.015_V1_0_605_VA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_605_VA_VALUE, { "Vertical Acceleration, [m/s2]", "asterix.015_V1_0_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_605_VA_VALUE, { "Vertical Acceleration, [m/s²]", "asterix.015_V1_0_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605_RSVA, { "RSVA, Vertical Acceleration Precision", "asterix.015_V1_0_605_RSVA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_605_RSVA_SDVA, { "SDVA, [m/s2]", "asterix.015_V1_0_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_605_RSVA_SDVA, { "SDVA, [m/s²]", "asterix.015_V1_0_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605_RSVA_COVAGH, { "COVAGH", "asterix.015_V1_0_605_RSVA_COVAGH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605_RSVA_COVAVV, { "COVAVV", "asterix.015_V1_0_605_RSVA_COVAVV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_605_COVAHP, { "COVAHP, Correlation of Vertical Acceleration and Horizontal Position", "asterix.015_V1_0_605_COVAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58087,9 +58087,9 @@ void proto_register_asterix (void) { &hf_015_V1_0_625_SDRR_SDRR, { "SDRR, [m/s]", "asterix.015_V1_0_625_SDRR_SDRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_625_SDRR_CORRR, { "CORRR", "asterix.015_V1_0_625_SDRR_CORRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_625_RA, { "RA, Range Acceleration", "asterix.015_V1_0_625_RA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_625_RA_VALUE, { "Range Acceleration, [m/s2]", "asterix.015_V1_0_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_625_RA_VALUE, { "Range Acceleration, [m/s²]", "asterix.015_V1_0_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_625_SDRA, { "SDRA, Range Acceleration Precision", "asterix.015_V1_0_625_SDRA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_625_SDRA_SDRA, { "SDRA, [m/s2]", "asterix.015_V1_0_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_625_SDRA_SDRA, { "SDRA, [m/s²]", "asterix.015_V1_0_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_625_SDRA_CORAR, { "CORAR", "asterix.015_V1_0_625_SDRA_CORAR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_625_SDRA_CORARR, { "CORARR", "asterix.015_V1_0_625_SDRA_CORARR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626, { "626, Doppler Information", "asterix.015_V1_0_626", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58098,9 +58098,9 @@ void proto_register_asterix (void) { &hf_015_V1_0_626_SDDV, { "SDDV, Precision of Doppler Velocity", "asterix.015_V1_0_626_SDDV", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_SDDV_VALUE, { "Precision of Doppler Velocity, [m/s]", "asterix.015_V1_0_626_SDDV_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_DA, { "DA, Doppler Acceleration", "asterix.015_V1_0_626_DA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_626_DA_VALUE, { "Doppler Acceleration, [m/s2]", "asterix.015_V1_0_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_626_DA_VALUE, { "Doppler Acceleration, [m/s²]", "asterix.015_V1_0_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_SDDA, { "SDDA, Precision of Doppler Acceleration", "asterix.015_V1_0_626_SDDA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_0_626_SDDA_SDDA, { "SDDA, [m/s2]", "asterix.015_V1_0_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_0_626_SDDA_SDDA, { "SDDA, [m/s²]", "asterix.015_V1_0_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_SDDA_CODADV, { "CODADV", "asterix.015_V1_0_626_SDDA_CODADV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_CODVR, { "CODVR, Correlation of Doppler Velocity and Range", "asterix.015_V1_0_626_CODVR", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_0_626_CODVR_VALUE, { "Correlation of Doppler Velocity and Range", "asterix.015_V1_0_626_CODVR_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58256,11 +58256,11 @@ void proto_register_asterix (void) { &hf_015_V1_1_602_COHVHP_COHVYHPY, { "COHVYHPY", "asterix.015_V1_1_602_COHVHP_COHVYHPY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603, { "603, Horizontal Acceleration Information", "asterix.015_V1_1_603", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603_HA, { "HA, Horizontal Acceleration Vector", "asterix.015_V1_1_603_HA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_603_HA_X, { "X, [m/s2]", "asterix.015_V1_1_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_603_HA_Y, { "Y, [m/s2]", "asterix.015_V1_1_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_603_HA_X, { "X, [m/s²]", "asterix.015_V1_1_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_603_HA_Y, { "Y, [m/s²]", "asterix.015_V1_1_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603_SDHA, { "SDHA, Horizontal Acceleration Precision", "asterix.015_V1_1_603_SDHA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_603_SDHA_X, { "X, [m/s2]", "asterix.015_V1_1_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_603_SDHA_Y, { "Y, [m/s2]", "asterix.015_V1_1_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_603_SDHA_X, { "X, [m/s²]", "asterix.015_V1_1_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_603_SDHA_Y, { "Y, [m/s²]", "asterix.015_V1_1_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603_SDHA_COHAXY, { "COHAXY", "asterix.015_V1_1_603_SDHA_COHAXY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603_COHAHP, { "COHAHP, Correlation of Horizontal Acceleration and Horizontal Position", "asterix.015_V1_1_603_COHAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_603_COHAHP_COHAXHPX, { "COHAXHPX", "asterix.015_V1_1_603_COHAHP_COHAXHPX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58291,9 +58291,9 @@ void proto_register_asterix (void) { &hf_015_V1_1_604_COVVHA_Y, { "Y", "asterix.015_V1_1_604_COVVHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605, { "605, Vertical Velocity Information", "asterix.015_V1_1_605", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605_VA, { "VA, Vertical Acceleration", "asterix.015_V1_1_605_VA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_605_VA_VALUE, { "Vertical Acceleration, [m/s2]", "asterix.015_V1_1_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_605_VA_VALUE, { "Vertical Acceleration, [m/s²]", "asterix.015_V1_1_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605_RSVA, { "RSVA, Vertical Acceleration Precision", "asterix.015_V1_1_605_RSVA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_605_RSVA_SDVA, { "SDVA, [m/s2]", "asterix.015_V1_1_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_605_RSVA_SDVA, { "SDVA, [m/s²]", "asterix.015_V1_1_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605_RSVA_COVAGH, { "COVAGH", "asterix.015_V1_1_605_RSVA_COVAGH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605_RSVA_COVAVV, { "COVAVV", "asterix.015_V1_1_605_RSVA_COVAVV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_605_COVAHP, { "COVAHP, Correlation of Vertical Acceleration and Horizontal Position", "asterix.015_V1_1_605_COVAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58320,9 +58320,9 @@ void proto_register_asterix (void) { &hf_015_V1_1_625_SDRR_SDRR, { "SDRR, [m/s]", "asterix.015_V1_1_625_SDRR_SDRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_625_SDRR_CORRR, { "CORRR", "asterix.015_V1_1_625_SDRR_CORRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_625_RA, { "RA, Range Acceleration", "asterix.015_V1_1_625_RA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_625_RA_VALUE, { "Range Acceleration, [m/s2]", "asterix.015_V1_1_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_625_RA_VALUE, { "Range Acceleration, [m/s²]", "asterix.015_V1_1_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_625_SDRA, { "SDRA, Range Acceleration Precision", "asterix.015_V1_1_625_SDRA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_625_SDRA_SDRA, { "SDRA, [m/s2]", "asterix.015_V1_1_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_625_SDRA_SDRA, { "SDRA, [m/s²]", "asterix.015_V1_1_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_625_SDRA_CORAR, { "CORAR", "asterix.015_V1_1_625_SDRA_CORAR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_625_SDRA_CORARR, { "CORARR", "asterix.015_V1_1_625_SDRA_CORARR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626, { "626, Doppler Information", "asterix.015_V1_1_626", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58331,9 +58331,9 @@ void proto_register_asterix (void) { &hf_015_V1_1_626_SDDV, { "SDDV, Precision of Doppler Velocity", "asterix.015_V1_1_626_SDDV", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_SDDV_VALUE, { "Precision of Doppler Velocity, [m/s]", "asterix.015_V1_1_626_SDDV_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_DA, { "DA, Doppler Acceleration", "asterix.015_V1_1_626_DA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_626_DA_VALUE, { "Doppler Acceleration, [m/s2]", "asterix.015_V1_1_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_626_DA_VALUE, { "Doppler Acceleration, [m/s²]", "asterix.015_V1_1_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_SDDA, { "SDDA, Precision of Doppler Acceleration", "asterix.015_V1_1_626_SDDA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_V1_1_626_SDDA_SDDA, { "SDDA, [m/s2]", "asterix.015_V1_1_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_V1_1_626_SDDA_SDDA, { "SDDA, [m/s²]", "asterix.015_V1_1_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_SDDA_CODADV, { "CODADV", "asterix.015_V1_1_626_SDDA_CODADV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_CODVR, { "CODVR, Correlation of Doppler Velocity and Range", "asterix.015_V1_1_626_CODVR", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_V1_1_626_CODVR_VALUE, { "Correlation of Doppler Velocity and Range", "asterix.015_V1_1_626_CODVR_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58489,11 +58489,11 @@ void proto_register_asterix (void) { &hf_015_602_COHVHP_COHVYHPY, { "COHVYHPY", "asterix.015_602_COHVHP_COHVYHPY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603, { "603, Horizontal Acceleration Information", "asterix.015_603", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603_HA, { "HA, Horizontal Acceleration Vector", "asterix.015_603_HA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_603_HA_X, { "X, [m/s2]", "asterix.015_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_603_HA_Y, { "Y, [m/s2]", "asterix.015_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_603_HA_X, { "X, [m/s²]", "asterix.015_603_HA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_603_HA_Y, { "Y, [m/s²]", "asterix.015_603_HA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603_SDHA, { "SDHA, Horizontal Acceleration Precision", "asterix.015_603_SDHA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_603_SDHA_X, { "X, [m/s2]", "asterix.015_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_603_SDHA_Y, { "Y, [m/s2]", "asterix.015_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_603_SDHA_X, { "X, [m/s²]", "asterix.015_603_SDHA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_603_SDHA_Y, { "Y, [m/s²]", "asterix.015_603_SDHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603_SDHA_COHAXY, { "COHAXY", "asterix.015_603_SDHA_COHAXY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603_COHAHP, { "COHAHP, Correlation of Horizontal Acceleration and Horizontal Position", "asterix.015_603_COHAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_603_COHAHP_COHAXHPX, { "COHAXHPX", "asterix.015_603_COHAHP_COHAXHPX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58524,9 +58524,9 @@ void proto_register_asterix (void) { &hf_015_604_COVVHA_Y, { "Y", "asterix.015_604_COVVHA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605, { "605, Vertical Velocity Information", "asterix.015_605", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605_VA, { "VA, Vertical Acceleration", "asterix.015_605_VA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_605_VA_VALUE, { "Vertical Acceleration, [m/s2]", "asterix.015_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_605_VA_VALUE, { "Vertical Acceleration, [m/s²]", "asterix.015_605_VA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605_RSVA, { "RSVA, Vertical Acceleration Precision", "asterix.015_605_RSVA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_605_RSVA_SDVA, { "SDVA, [m/s2]", "asterix.015_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_605_RSVA_SDVA, { "SDVA, [m/s²]", "asterix.015_605_RSVA_SDVA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605_RSVA_COVAGH, { "COVAGH", "asterix.015_605_RSVA_COVAGH", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605_RSVA_COVAVV, { "COVAVV", "asterix.015_605_RSVA_COVAVV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_605_COVAHP, { "COVAHP, Correlation of Vertical Acceleration and Horizontal Position", "asterix.015_605_COVAHP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58553,9 +58553,9 @@ void proto_register_asterix (void) { &hf_015_625_SDRR_SDRR, { "SDRR, [m/s]", "asterix.015_625_SDRR_SDRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_625_SDRR_CORRR, { "CORRR", "asterix.015_625_SDRR_CORRR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_625_RA, { "RA, Range Acceleration", "asterix.015_625_RA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_625_RA_VALUE, { "Range Acceleration, [m/s2]", "asterix.015_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_625_RA_VALUE, { "Range Acceleration, [m/s²]", "asterix.015_625_RA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_625_SDRA, { "SDRA, Range Acceleration Precision", "asterix.015_625_SDRA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_625_SDRA_SDRA, { "SDRA, [m/s2]", "asterix.015_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_625_SDRA_SDRA, { "SDRA, [m/s²]", "asterix.015_625_SDRA_SDRA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_625_SDRA_CORAR, { "CORAR", "asterix.015_625_SDRA_CORAR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_625_SDRA_CORARR, { "CORARR", "asterix.015_625_SDRA_CORARR", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626, { "626, Doppler Information", "asterix.015_626", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -58564,9 +58564,9 @@ void proto_register_asterix (void) { &hf_015_626_SDDV, { "SDDV, Precision of Doppler Velocity", "asterix.015_626_SDDV", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_SDDV_VALUE, { "Precision of Doppler Velocity, [m/s]", "asterix.015_626_SDDV_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_DA, { "DA, Doppler Acceleration", "asterix.015_626_DA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_626_DA_VALUE, { "Doppler Acceleration, [m/s2]", "asterix.015_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_626_DA_VALUE, { "Doppler Acceleration, [m/s²]", "asterix.015_626_DA_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_SDDA, { "SDDA, Precision of Doppler Acceleration", "asterix.015_626_SDDA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_015_626_SDDA_SDDA, { "SDDA, [m/s2]", "asterix.015_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_015_626_SDDA_SDDA, { "SDDA, [m/s²]", "asterix.015_626_SDDA_SDDA", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_SDDA_CODADV, { "CODADV", "asterix.015_626_SDDA_CODADV", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_CODVR, { "CODVR, Correlation of Doppler Velocity and Range", "asterix.015_626_CODVR", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_015_626_CODVR_VALUE, { "Correlation of Doppler Velocity and Range", "asterix.015_626_CODVR_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -59160,8 +59160,8 @@ void proto_register_asterix (void) { &hf_020_V1_9_202_VX, { "VX, [m/s]", "asterix.020_V1_9_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_9_202_VY, { "VY, [m/s]", "asterix.020_V1_9_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_9_210, { "210, Calculated Acceleration", "asterix.020_V1_9_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_V1_9_210_AX, { "AX, [m/s2]", "asterix.020_V1_9_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_V1_9_210_AY, { "AY, [m/s2]", "asterix.020_V1_9_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_V1_9_210_AX, { "AX, [m/s²]", "asterix.020_V1_9_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_V1_9_210_AY, { "AY, [m/s²]", "asterix.020_V1_9_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_9_220, { "220, Target Address", "asterix.020_V1_9_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_9_220_VALUE, { "Target Address", "asterix.020_V1_9_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_9_230, { "230, Communications/ACAS Capability and Flight Status", "asterix.020_V1_9_230", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -59289,8 +59289,8 @@ void proto_register_asterix (void) { &hf_020_V1_10_202_VX, { "VX, [m/s]", "asterix.020_V1_10_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_10_202_VY, { "VY, [m/s]", "asterix.020_V1_10_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_10_210, { "210, Calculated Acceleration", "asterix.020_V1_10_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_V1_10_210_AX, { "AX, [m/s2]", "asterix.020_V1_10_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_V1_10_210_AY, { "AY, [m/s2]", "asterix.020_V1_10_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_V1_10_210_AX, { "AX, [m/s²]", "asterix.020_V1_10_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_V1_10_210_AY, { "AY, [m/s²]", "asterix.020_V1_10_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_10_220, { "220, Target Address", "asterix.020_V1_10_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_10_220_VALUE, { "Target Address", "asterix.020_V1_10_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_020_V1_10_230, { "230, Communications/ACAS Capability and Flight Status", "asterix.020_V1_10_230", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -59418,8 +59418,8 @@ void proto_register_asterix (void) { &hf_020_202_VX, { "VX, [m/s]", "asterix.020_202_VX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_202_VY, { "VY, [m/s]", "asterix.020_202_VY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_210, { "210, Calculated Acceleration", "asterix.020_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_210_AX, { "AX, [m/s2]", "asterix.020_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_020_210_AY, { "AY, [m/s2]", "asterix.020_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_210_AX, { "AX, [m/s²]", "asterix.020_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_020_210_AY, { "AY, [m/s²]", "asterix.020_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_220, { "220, Target Address", "asterix.020_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_020_220_VALUE, { "Target Address", "asterix.020_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_020_230, { "230, Communications/ACAS Capability and Flight Status", "asterix.020_230", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -62837,8 +62837,8 @@ void proto_register_asterix (void) { &hf_062_V1_17_200_VERT, { "VERT, Transversal Acceleration", "asterix.062_V1_17_200_VERT", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_17_200_VERT), 0x0c, NULL, HFILL } }, { &hf_062_V1_17_200_ADF, { "ADF, Altitude Discrepancy Flag", "asterix.062_V1_17_200_ADF", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_17_200_ADF), 0x02, NULL, HFILL } }, { &hf_062_V1_17_210, { "210, Calculated Acceleration (Cartesian)", "asterix.062_V1_17_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_17_210_AX, { "AX, [m/s2]", "asterix.062_V1_17_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_17_210_AY, { "AY, [m/s2]", "asterix.062_V1_17_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_17_210_AX, { "AX, [m/s²]", "asterix.062_V1_17_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_17_210_AY, { "AY, [m/s²]", "asterix.062_V1_17_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_220, { "220, Calculated Rate of Climb/Descent", "asterix.062_V1_17_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_220_VALUE, { "Calculated Rate of Climb/Descent, [ft/min]", "asterix.062_V1_17_220_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_245, { "245, Target Identification", "asterix.062_V1_17_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -63120,8 +63120,8 @@ void proto_register_asterix (void) { &hf_062_V1_17_500_ATV_X, { "X, ATV (X-Component), [m/s]", "asterix.062_V1_17_500_ATV_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_500_ATV_Y, { "Y, ATV (Y-Component), [m/s]", "asterix.062_V1_17_500_ATV_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_500_AA, { "AA, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.062_V1_17_500_AA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_17_500_AA_X, { "X, AA (X-Component), [m/s2]", "asterix.062_V1_17_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_17_500_AA_Y, { "Y, AA (Y-Component), [m/s2]", "asterix.062_V1_17_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_17_500_AA_X, { "X, AA (X-Component), [m/s²]", "asterix.062_V1_17_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_17_500_AA_Y, { "Y, AA (Y-Component), [m/s²]", "asterix.062_V1_17_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb/Descent", "asterix.062_V1_17_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb/Descent, [ft/min]", "asterix.062_V1_17_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_17_510, { "510, Composed Track Number", "asterix.062_V1_17_510", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -63234,8 +63234,8 @@ void proto_register_asterix (void) { &hf_062_V1_18_200_VERT, { "VERT, Transversal Acceleration", "asterix.062_V1_18_200_VERT", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_18_200_VERT), 0x0c, NULL, HFILL } }, { &hf_062_V1_18_200_ADF, { "ADF, Altitude Discrepancy Flag", "asterix.062_V1_18_200_ADF", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_18_200_ADF), 0x02, NULL, HFILL } }, { &hf_062_V1_18_210, { "210, Calculated Acceleration (Cartesian)", "asterix.062_V1_18_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_18_210_AX, { "AX, [m/s2]", "asterix.062_V1_18_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_18_210_AY, { "AY, [m/s2]", "asterix.062_V1_18_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_18_210_AX, { "AX, [m/s²]", "asterix.062_V1_18_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_18_210_AY, { "AY, [m/s²]", "asterix.062_V1_18_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_220, { "220, Calculated Rate of Climb/Descent", "asterix.062_V1_18_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_220_VALUE, { "Calculated Rate of Climb/Descent, [ft/min]", "asterix.062_V1_18_220_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_245, { "245, Target Identification", "asterix.062_V1_18_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -63517,8 +63517,8 @@ void proto_register_asterix (void) { &hf_062_V1_18_500_ATV_X, { "X, ATV (X-Component), [m/s]", "asterix.062_V1_18_500_ATV_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_500_ATV_Y, { "Y, ATV (Y-Component), [m/s]", "asterix.062_V1_18_500_ATV_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_500_AA, { "AA, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.062_V1_18_500_AA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_18_500_AA_X, { "X, AA (X-Component), [m/s2]", "asterix.062_V1_18_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_18_500_AA_Y, { "Y, AA (Y-Component), [m/s2]", "asterix.062_V1_18_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_18_500_AA_X, { "X, AA (X-Component), [m/s²]", "asterix.062_V1_18_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_18_500_AA_Y, { "Y, AA (Y-Component), [m/s²]", "asterix.062_V1_18_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb/Descent", "asterix.062_V1_18_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb/Descent, [ft/min]", "asterix.062_V1_18_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_18_510, { "510, Composed Track Number", "asterix.062_V1_18_510", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -63631,8 +63631,8 @@ void proto_register_asterix (void) { &hf_062_V1_19_200_VERT, { "VERT, Transversal Acceleration", "asterix.062_V1_19_200_VERT", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_19_200_VERT), 0x0c, NULL, HFILL } }, { &hf_062_V1_19_200_ADF, { "ADF, Altitude Discrepancy Flag", "asterix.062_V1_19_200_ADF", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_19_200_ADF), 0x02, NULL, HFILL } }, { &hf_062_V1_19_210, { "210, Calculated Acceleration (Cartesian)", "asterix.062_V1_19_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_19_210_AX, { "AX, [m/s2]", "asterix.062_V1_19_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_19_210_AY, { "AY, [m/s2]", "asterix.062_V1_19_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_19_210_AX, { "AX, [m/s²]", "asterix.062_V1_19_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_19_210_AY, { "AY, [m/s²]", "asterix.062_V1_19_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_220, { "220, Calculated Rate of Climb/Descent", "asterix.062_V1_19_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_220_VALUE, { "Calculated Rate of Climb/Descent, [ft/min]", "asterix.062_V1_19_220_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_245, { "245, Target Identification", "asterix.062_V1_19_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -63914,8 +63914,8 @@ void proto_register_asterix (void) { &hf_062_V1_19_500_ATV_X, { "X, ATV (X-Component), [m/s]", "asterix.062_V1_19_500_ATV_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_500_ATV_Y, { "Y, ATV (Y-Component), [m/s]", "asterix.062_V1_19_500_ATV_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_500_AA, { "AA, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.062_V1_19_500_AA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_19_500_AA_X, { "X, AA (X-Component), [m/s2]", "asterix.062_V1_19_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_19_500_AA_Y, { "Y, AA (Y-Component), [m/s2]", "asterix.062_V1_19_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_19_500_AA_X, { "X, AA (X-Component), [m/s²]", "asterix.062_V1_19_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_19_500_AA_Y, { "Y, AA (Y-Component), [m/s²]", "asterix.062_V1_19_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb/Descent", "asterix.062_V1_19_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb/Descent, [ft/min]", "asterix.062_V1_19_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_19_510, { "510, Composed Track Number", "asterix.062_V1_19_510", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -64029,8 +64029,8 @@ void proto_register_asterix (void) { &hf_062_V1_20_200_VERT, { "VERT, Transversal Acceleration", "asterix.062_V1_20_200_VERT", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_20_200_VERT), 0x0c, NULL, HFILL } }, { &hf_062_V1_20_200_ADF, { "ADF, Altitude Discrepancy Flag", "asterix.062_V1_20_200_ADF", FT_UINT8, BASE_DEC, VALS (valstr_062_V1_20_200_ADF), 0x02, NULL, HFILL } }, { &hf_062_V1_20_210, { "210, Calculated Acceleration (Cartesian)", "asterix.062_V1_20_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_20_210_AX, { "AX, [m/s2]", "asterix.062_V1_20_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_20_210_AY, { "AY, [m/s2]", "asterix.062_V1_20_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_20_210_AX, { "AX, [m/s²]", "asterix.062_V1_20_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_20_210_AY, { "AY, [m/s²]", "asterix.062_V1_20_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_220, { "220, Calculated Rate of Climb/Descent", "asterix.062_V1_20_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_220_VALUE, { "Calculated Rate of Climb/Descent, [ft/min]", "asterix.062_V1_20_220_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_245, { "245, Target Identification", "asterix.062_V1_20_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -64312,8 +64312,8 @@ void proto_register_asterix (void) { &hf_062_V1_20_500_ATV_X, { "X, ATV (X-Component), [m/s]", "asterix.062_V1_20_500_ATV_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_500_ATV_Y, { "Y, ATV (Y-Component), [m/s]", "asterix.062_V1_20_500_ATV_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_500_AA, { "AA, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.062_V1_20_500_AA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_20_500_AA_X, { "X, AA (X-Component), [m/s2]", "asterix.062_V1_20_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_V1_20_500_AA_Y, { "Y, AA (Y-Component), [m/s2]", "asterix.062_V1_20_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_20_500_AA_X, { "X, AA (X-Component), [m/s²]", "asterix.062_V1_20_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_V1_20_500_AA_Y, { "Y, AA (Y-Component), [m/s²]", "asterix.062_V1_20_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb/Descent", "asterix.062_V1_20_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb/Descent, [ft/min]", "asterix.062_V1_20_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_V1_20_510, { "510, Composed Track Number", "asterix.062_V1_20_510", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -64427,8 +64427,8 @@ void proto_register_asterix (void) { &hf_062_200_VERT, { "VERT, Transversal Acceleration", "asterix.062_200_VERT", FT_UINT8, BASE_DEC, VALS (valstr_062_200_VERT), 0x0c, NULL, HFILL } }, { &hf_062_200_ADF, { "ADF, Altitude Discrepancy Flag", "asterix.062_200_ADF", FT_UINT8, BASE_DEC, VALS (valstr_062_200_ADF), 0x02, NULL, HFILL } }, { &hf_062_210, { "210, Calculated Acceleration (Cartesian)", "asterix.062_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_210_AX, { "AX, [m/s2]", "asterix.062_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_210_AY, { "AY, [m/s2]", "asterix.062_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_210_AX, { "AX, [m/s²]", "asterix.062_210_AX", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_210_AY, { "AY, [m/s²]", "asterix.062_210_AY", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_220, { "220, Calculated Rate of Climb/Descent", "asterix.062_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_220_VALUE, { "Calculated Rate of Climb/Descent, [ft/min]", "asterix.062_220_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_245, { "245, Target Identification", "asterix.062_245", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -64710,8 +64710,8 @@ void proto_register_asterix (void) { &hf_062_500_ATV_X, { "X, ATV (X-Component), [m/s]", "asterix.062_500_ATV_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_500_ATV_Y, { "Y, ATV (Y-Component), [m/s]", "asterix.062_500_ATV_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_500_AA, { "AA, Estimated Accuracy Of Acceleration (Cartesian)", "asterix.062_500_AA", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_500_AA_X, { "X, AA (X-Component), [m/s2]", "asterix.062_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_062_500_AA_Y, { "Y, AA (Y-Component), [m/s2]", "asterix.062_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_500_AA_X, { "X, AA (X-Component), [m/s²]", "asterix.062_500_AA_X", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_062_500_AA_Y, { "Y, AA (Y-Component), [m/s²]", "asterix.062_500_AA_Y", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_500_ARC, { "ARC, Estimated Accuracy Of Rate Of Climb/Descent", "asterix.062_500_ARC", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_500_ARC_VALUE, { "Estimated Accuracy Of Rate Of Climb/Descent, [ft/min]", "asterix.062_500_ARC_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_062_510, { "510, Composed Track Number", "asterix.062_510", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, diff --git a/epan/enterprises.c b/epan/enterprises.c index d28c5b8f7b..198bcc5010 100644 --- a/epan/enterprises.c +++ b/epan/enterprises.c @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -/* (last updated 2024-02-17) */ +/* (last updated 2024-02-23) */ #include "config.h" @@ -19,12 +19,12 @@ typedef struct { uint32_t max_idx; - const char* values[61527]; + const char* values[61552]; } global_enterprises_table_t; static global_enterprises_table_t table = { - 61526, + 61551, { "Reserved", // 0 "NxNetworks", // 1 @@ -28000,7 +28000,7 @@ static global_enterprises_table_t table = "China Infosec Technologies Co.,Ltd.", // 27971 "Mac Papers, Inc.", // 27972 "Open Finance, LLC", // 27973 - "MCS GROUPE", // 27974 + "BRUNO PONTILLO", // 27974 "Centec Networks Inc.", // 27975 "GEO CONCEPT SA", // 27976 "Genex", // 27977 @@ -30522,7 +30522,7 @@ static global_enterprises_table_t table = "Digitek spa", // 30493 "Microlink Telecom", // 30494 "RoundTrip Systems", // 30495 - "E-Smart Systems d.o.o.", // 30496 + "E-Smart Systems d.o.o. Beograd", // 30496 "Beijing EaseSea Interman Technology Co.,", // 30497 "AeroScout", // 30498 "Design 2000 Pvt Ltd", // 30499 @@ -61552,7 +61552,32 @@ static global_enterprises_table_t table = "EQUIRON", // 61523 "Research and Production Association named after A.S. Popov", // 61524 "Darletto", // 61525 - "Dmitry Vorobiev" // 61526 + "Dmitry Vorobiev", // 61526 + "Alexander R Craven", // 61527 + "MOORNET SOLUTIONS LLC", // 61528 + "REC SYSTEM co.,ltd", // 61529 + "G & X Services", // 61530 + "Layer9.space", // 61531 + "ServerStep Technology", // 61532 + "ComroeStudios LLC", // 61533 + "Envirovision Solutions Systems", // 61534 + "Groupe Hospitalier Nord-Essonne", // 61535 + "Polyphony", // 61536 + "BAE Systems", // 61537 + "Brookhaven Surgical Services, PC D/B/A MY Health Long Island Frank Sconzo MD", // 61538 + "Bidwells LLP", // 61539 + "Flowbix", // 61540 + "Anton Luka Šijanec", // 61541 + "Danilo Klug", // 61542 + "Isfahan University", // 61543 + "Flick Gocke Schaumburg Partnerschaft mbB", // 61544 + "Shanghai Yunsilicon Technology Co.,Ltd.", // 61545 + "MATTR LIMITED", // 61546 + "INNIO Jenbacher GmbH & Co OG", // 61547 + "Schwarz Produktion Stiftung & Co. KG - SPW Papier", // 61548 + "Sierra Management Services", // 61549 + "Kyle Ellis", // 61550 + "Equinox Power Innovations Inc" // 61551 } }; diff --git a/epan/manuf-data.c b/epan/manuf-data.c index b0aa596f13..002489a571 100644 --- a/epan/manuf-data.c +++ b/epan/manuf-data.c @@ -123,6 +123,7 @@ static const manuf_registry_t ieee_registry_table[] = { { { 0x48, 0x0B, 0xB2 }, MA_M }, { { 0x48, 0x65, 0xEE }, MA_M }, { { 0x48, 0xDA, 0x35 }, MA_M }, + { { 0x48, 0xE6, 0x63 }, MA_M }, { { 0x4C, 0x4B, 0xF9 }, MA_M }, { { 0x4C, 0x65, 0xA8 }, MA_M }, { { 0x4C, 0x74, 0xA7 }, MA_M }, @@ -5501,7 +5502,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x00, 0x14, 0x35 }, "CityCom", "CityCom Corp." }, { { 0x00, 0x14, 0x36 }, "QwertyElektr", "Qwerty Elektronik AB" }, { { 0x00, 0x14, 0x37 }, "GSTeletech", "GSTeletech Co.,Ltd." }, - { { 0x00, 0x14, 0x38 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x00, 0x14, 0x38 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x00, 0x14, 0x39 }, "BlonderTongu", "Blonder Tongue Laboratories, Inc" }, { { 0x00, 0x14, 0x3A }, "RaytalkInter", "Raytalk International Srl" }, { { 0x00, 0x14, 0x3B }, "Sensovation", "Sensovation AG" }, @@ -10912,7 +10913,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x00, 0x4C, 0xE5 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0x00, 0x4D, 0x32 }, "AndonHealth", "Andon Health Co.,Ltd." }, { { 0x00, 0x4E, 0x01 }, "Dell", "Dell Inc." }, - { { 0x00, 0x4E, 0x35 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x00, 0x4E, 0x35 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x00, 0x4F, 0x1A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x00, 0x50, 0x00 }, "NexoCommunic", "Nexo Communications, Inc." }, { { 0x00, 0x50, 0x01 }, "Yamashita", "Yamashita Systems Corp." }, @@ -13311,7 +13312,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x00, 0xFC, 0x8D }, "HitronTechno", "Hitron Technologies. Inc" }, { { 0x00, 0xFC, 0xBA }, "Cisco", "Cisco Systems, Inc" }, { { 0x00, 0xFD, 0x22 }, "Cisco", "Cisco Systems, Inc" }, - { { 0x00, 0xFD, 0x45 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x00, 0xFD, 0x45 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x00, 0xFD, 0x4C }, "Nevatec", "Nevatec" }, { { 0x00, 0xFE, 0xC8 }, "Cisco", "Cisco Systems, Inc" }, { { 0x02, 0x07, 0x01 }, "RacalDatacom", "Racal-Datacom" }, @@ -13337,7 +13338,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x04, 0x04, 0xEA }, "ValensSemico", "Valens Semiconductor Ltd." }, { { 0x04, 0x05, 0xDD }, "CultraviewDi", "Shenzhen Cultraview Digital Technology Co., Ltd" }, { { 0x04, 0x07, 0x2E }, "VTechElectro", "VTech Electronics Ltd." }, - { { 0x04, 0x09, 0x73 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x04, 0x09, 0x73 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x04, 0x09, 0x86 }, "Arcadyan", "Arcadyan Corporation" }, { { 0x04, 0x09, 0xA5 }, "HFR", "HFR, Inc." }, { { 0x04, 0x0A, 0x83 }, "AlcatelLucen", "Alcatel-Lucent" }, @@ -14022,7 +14023,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x08, 0x95, 0x42 }, "Apple", "Apple, Inc." }, { { 0x08, 0x96, 0xAD }, "Cisco", "Cisco Systems, Inc" }, { { 0x08, 0x96, 0xD7 }, "AVM", "AVM GmbH" }, - { { 0x08, 0x97, 0x34 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x08, 0x97, 0x34 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x08, 0x97, 0x58 }, "StrongRising", "Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary" }, { { 0x08, 0x97, 0x98 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, { { 0x08, 0x99, 0xE8 }, "KEMAS", "KEMAS GmbH" }, @@ -14134,7 +14135,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x08, 0xF0, 0xB6 }, "EdifierInter", "Edifier International" }, { { 0x08, 0xF1, 0xB3 }, "CiscoMeraki", "Cisco Meraki" }, { { 0x08, 0xF1, 0xB7 }, "TowerstreamC", "Towerstream Corpration" }, - { { 0x08, 0xF1, 0xEA }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x08, 0xF1, 0xEA }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x08, 0xF2, 0xF4 }, "NetOnePartne", "Net One Partners Co.,Ltd." }, { { 0x08, 0xF3, 0xFB }, "Cisco", "Cisco Systems, Inc" }, { { 0x08, 0xF4, 0x58 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -14848,7 +14849,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x14, 0x00, 0xE9 }, "MitelNetwork", "Mitel Networks Corporation" }, { { 0x14, 0x01, 0x52 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x14, 0x01, 0x9C }, "Ubyon", "Ubyon Inc." }, - { { 0x14, 0x02, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x14, 0x02, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x14, 0x04, 0x67 }, "SNKTechnolog", "SNK Technologies Co.,Ltd." }, { { 0x14, 0x06, 0x4C }, "VoglElectron", "Vogl Electronic GmbH" }, { { 0x14, 0x07, 0x08 }, "CpPlus", "Cp Plus Gmbh & Co. Kg" }, @@ -15747,7 +15748,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x1C, 0x97, 0xC5 }, "Ynomia", "Ynomia Pty Ltd" }, { { 0x1C, 0x97, 0xFB }, "CoolBitX", "CoolBitX Ltd." }, { { 0x1C, 0x98, 0xC1 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, - { { 0x1C, 0x98, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x1C, 0x98, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x1C, 0x99, 0x4C }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x1C, 0x99, 0x57 }, "Intel", "Intel Corporate" }, { { 0x1C, 0x9C, 0x26 }, "ZoovelTechno", "Zoovel Technologies" }, @@ -15894,6 +15895,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x20, 0x17, 0x42 }, "LGElectronic", "LG Electronics" }, { { 0x20, 0x17, 0x46 }, "Paradromics", "Paradromics, Inc." }, { { 0x20, 0x18, 0x0E }, "SunchipTechn", "Shenzhen Sunchip Technology Co., Ltd" }, + { { 0x20, 0x18, 0x5B }, "JingxunTechn", "Shenzhen Jingxun Technology Co., Ltd." }, { { 0x20, 0x1A, 0x06 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, { { 0x20, 0x1A, 0x94 }, "Apple", "Apple, Inc." }, { { 0x20, 0x1B, 0x88 }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, @@ -16000,7 +16002,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x20, 0x65, 0x8E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x20, 0x66, 0xCF }, "FreeboxSas", "Freebox Sas" }, { { 0x20, 0x66, 0xFD }, "Constell8", "Constell8 Nv" }, - { { 0x20, 0x67, 0x7C }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x20, 0x67, 0x7C }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x20, 0x67, 0xB1 }, "Pluto", "Pluto inc." }, { { 0x20, 0x67, 0xE0 }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, { { 0x20, 0x68, 0x9D }, "LiteonTechno", "Liteon Technology Corporation" }, @@ -16076,7 +16078,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x20, 0xA5, 0xCB }, "Apple", "Apple, Inc." }, { { 0x20, 0xA6, 0x0C }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x20, 0xA6, 0x80 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x20, 0xA6, 0xCD }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x20, 0xA6, 0xCD }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x20, 0xA7, 0x66 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x20, 0xA7, 0x83 }, "miControl", "miControl GmbH" }, { { 0x20, 0xA7, 0x87 }, "BointecTaiwa", "Bointec Taiwan Corporation Limited" }, @@ -16504,7 +16506,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x24, 0xF0, 0xFF }, "GHT", "GHT Co., Ltd." }, { { 0x24, 0xF1, 0x28 }, "Telstra", "Telstra" }, { { 0x24, 0xF1, 0x50 }, "GuangzhouQia", "Guangzhou Qi'an Technology Co., Ltd." }, - { { 0x24, 0xF2, 0x7F }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x24, 0xF2, 0x7F }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x24, 0xF2, 0xDD }, "RadiantZemax", "Radiant Zemax LLC" }, { { 0x24, 0xF5, 0x7E }, "Hwh", "Hwh Co., Ltd." }, { { 0x24, 0xF5, 0xA2 }, "BelkinIntern", "Belkin International Inc." }, @@ -16552,6 +16554,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x28, 0x16, 0xA8 }, "Microsoft", "Microsoft Corporation" }, { { 0x28, 0x16, 0xAD }, "Intel", "Intel Corporate" }, { { 0x28, 0x17, 0x09 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x28, 0x17, 0xCB }, "SoftwareFree", "Software Freedom Conservancy" }, { { 0x28, 0x17, 0xCE }, "Omnisense", "Omnisense Ltd" }, { { 0x28, 0x18, 0x78 }, "Microsoft", "Microsoft Corporation" }, { { 0x28, 0x18, 0xFD }, "AdityaInfote", "Aditya Infotech Ltd." }, @@ -17290,7 +17293,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x30, 0x3E, 0xAD }, "SonavoxCanad", "Sonavox Canada Inc" }, { { 0x30, 0x3F, 0x5D }, "PtHanSungEle", "Pt Han Sung Electoronics Indonesia" }, { { 0x30, 0x3F, 0x7B }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, - { { 0x30, 0x3F, 0xBB }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x30, 0x3F, 0xBB }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x30, 0x40, 0x74 }, "zte", "zte corporation" }, { { 0x30, 0x41, 0x74 }, "AltecLansing", "Altec Lansing Llc" }, { { 0x30, 0x42, 0x25 }, "BurgWächter", "Burg-Wächter Kg" }, @@ -17456,6 +17459,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x30, 0xC3, 0xD9 }, "Alpsalpine", "Alpsalpine Co,.Ltd" }, { { 0x30, 0xC5, 0x07 }, "ECITelecom", "ECI Telecom Ltd." }, { { 0x30, 0xC5, 0x0F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x30, 0xC6, 0xAB }, "zte", "zte corporation" }, { { 0x30, 0xC6, 0xD7 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x30, 0xC6, 0xF7 }, "Espressif", "Espressif Inc." }, { { 0x30, 0xC7, 0x50 }, "MICTechnolog", "MIC Technology Group" }, @@ -17891,7 +17895,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x34, 0xFA, 0x9F }, "RuckusWirele", "Ruckus Wireless" }, { { 0x34, 0xFC, 0x6F }, "Alcea", "Alcea" }, { { 0x34, 0xFC, 0xA1 }, "Micronetunio", "Micronet union Technology(Chengdu)Co., Ltd." }, - { { 0x34, 0xFC, 0xB9 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x34, 0xFC, 0xB9 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x34, 0xFC, 0xEF }, "LGElectronic", "LG Electronics (Mobile Communications)" }, { { 0x34, 0xFD, 0x6A }, "Apple", "Apple, Inc." }, { { 0x34, 0xFE, 0x1C }, "ChoungHwaTec", "Choung Hwa Tech Co.,Ltd" }, @@ -17935,7 +17939,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x38, 0x16, 0xD1 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x38, 0x17, 0x30 }, "UlrichLipper", "Ulrich Lippert GmbH & Co KG" }, { { 0x38, 0x17, 0x66 }, "Promzakaz", "Promzakaz Ltd." }, - { { 0x38, 0x17, 0xC3 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x38, 0x17, 0xC3 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x38, 0x17, 0xE1 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x38, 0x18, 0x4C }, "SonyHomeEnte", "Sony Home Entertainment&Sound Products Inc" }, { { 0x38, 0x19, 0x2F }, "Nokia", "Nokia Corporation" }, @@ -18202,6 +18206,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x38, 0xF0, 0x98 }, "VaporStoneRa", "Vapor Stone Rail Systems" }, { { 0x38, 0xF0, 0xC8 }, "Logitech", "Logitech" }, { { 0x38, 0xF1, 0x35 }, "SensorTecCan", "SensorTec-Canada" }, + { { 0x38, 0xF1, 0x8F }, "TechnicolorT", "Technicolor (China) Technology Co., Ltd." }, { { 0x38, 0xF2, 0x3E }, "MicrosoftMob", "Microsoft Mobile Oy" }, { { 0x38, 0xF3, 0x2E }, "Skullcandy", "Skullcandy" }, { { 0x38, 0xF3, 0x3F }, "Tatsuno", "Tatsuno Corporation" }, @@ -18786,6 +18791,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x40, 0x98, 0xAD }, "Apple", "Apple, Inc." }, { { 0x40, 0x99, 0x22 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0x40, 0x99, 0xE3 }, "GuangzhouMud", "Guangzhou Mudi Information Technology Co., Ltd" }, + { { 0x40, 0x99, 0xF6 }, "TelinkSemico", "Telink Semiconductor(Shanghai) Co.,Ltd" }, { { 0x40, 0x9A, 0x30 }, "TecnoMobile", "Tecno Mobile Limited" }, { { 0x40, 0x9B, 0x0D }, "YourfKwanInd", "Shenzhen Yourf Kwan Industrial Co., Ltd" }, { { 0x40, 0x9B, 0x21 }, "Nokia", "Nokia" }, @@ -18841,7 +18847,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x40, 0xB8, 0x37 }, "Sony", "Sony Corporation" }, { { 0x40, 0xB8, 0x9A }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x40, 0xB8, 0xC2 }, "Osmozis", "Osmozis" }, - { { 0x40, 0xB9, 0x3C }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x40, 0xB9, 0x3C }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x40, 0xBA, 0x61 }, "ARIMACommuni", "ARIMA Communications Corp." }, { { 0x40, 0xBB, 0x56 }, "TeraNXTGloba", "TeraNXT Global India Pvt Ltd." }, { { 0x40, 0xBC, 0x60 }, "Apple", "Apple, Inc." }, @@ -19029,7 +19035,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x44, 0x47, 0xCC }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0x44, 0x48, 0x91 }, "HDMILicensin", "HDMI Licensing, LLC" }, { { 0x44, 0x48, 0xB9 }, "MitraStarTec", "MitraStar Technology Corp." }, - { { 0x44, 0x48, 0xC1 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x44, 0x48, 0xC1 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x44, 0x48, 0xFF }, "QingdaoHaier", "Qingdao Haier Technology Co.,Ltd" }, { { 0x44, 0x49, 0x63 }, "WovenByToyot", "Woven By Toyota U.S., Inc." }, { { 0x44, 0x49, 0x88 }, "Intel", "Intel Corporate" }, @@ -19093,6 +19099,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x44, 0x70, 0x0B }, "Iffu", "Iffu" }, { { 0x44, 0x70, 0x98 }, "MingHongTech", "Ming Hong Technology (Shen Zhen) Limited" }, { { 0x44, 0x71, 0x47 }, "XiaomiElectr", "Beijing Xiaomi Electronics Co.,Ltd" }, + { { 0x44, 0x71, 0xB3 }, "LogitechFarE", "Logitech Far East" }, { { 0x44, 0x73, 0xD6 }, "Logitech", "Logitech" }, { { 0x44, 0x74, 0x6C }, "Sony", "Sony Corporation" }, { { 0x44, 0x76, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -19368,7 +19375,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x48, 0x47, 0x4B }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x48, 0x49, 0xC7 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x48, 0x4A, 0x30 }, "GeorgeRoboti", "George Robotics Limited" }, - { { 0x48, 0x4A, 0xE9 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x48, 0x4A, 0xE9 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x48, 0x4B, 0xAA }, "Apple", "Apple, Inc." }, { { 0x48, 0x4B, 0xD4 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x48, 0x4C, 0x29 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -19492,7 +19499,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x48, 0x9D, 0xD1 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x48, 0x9E, 0x9D }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, { { 0x48, 0x9E, 0xBD }, "HP", "HP Inc." }, - { { 0x48, 0x9E, 0xCB }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x48, 0x9E, 0xCB }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x48, 0xA0, 0xF8 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x48, 0xA1, 0x95 }, "Apple", "Apple, Inc." }, { { 0x48, 0xA2, 0x2D }, "HuaxuchangTe", "Shenzhen Huaxuchang Telecom Technology Co.,Ltd" }, @@ -19578,7 +19585,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x48, 0xDD, 0x0C }, "eero", "eero inc." }, { { 0x48, 0xDD, 0x9D }, "ItelMobile", "Itel Mobile Limited" }, { { 0x48, 0xDF, 0x1C }, "NECFibreOpti", "Wuhan NEC Fibre Optic Communications industry Co. Ltd" }, - { { 0x48, 0xDF, 0x37 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x48, 0xDF, 0x37 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x48, 0xE1, 0x5C }, "Apple", "Apple, Inc." }, { { 0x48, 0xE1, 0xAF }, "Vity", "Vity" }, { { 0x48, 0xE1, 0xE9 }, "MerossTechno", "Chengdu Meross Technology Co., Ltd." }, @@ -19855,7 +19862,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x4C, 0xAE, 0x13 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x4C, 0xAE, 0x1C }, "SaiNXTTechno", "SaiNXT Technologies LLP" }, { { 0x4C, 0xAE, 0x31 }, "ShengHaiElec", "ShengHai Electronics (Shenzhen) Ltd" }, - { { 0x4C, 0xAE, 0xA3 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x4C, 0xAE, 0xA3 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x4C, 0xAE, 0xEC }, "Guangzhoulim", "Guangzhou limee technology co.,LTD" }, { { 0x4C, 0xB0, 0x08 }, "GwelltimesTe", "Shenzhen Gwelltimes Technology Co.,Ltd" }, { { 0x4C, 0xB0, 0x4A }, "Intel", "Intel Corporate" }, @@ -20487,7 +20494,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x54, 0x75, 0xD0 }, "Cisco", "Cisco Systems, Inc" }, { { 0x54, 0x76, 0xB2 }, "RaisecomTech", "Raisecom Technology CO., LTD" }, { { 0x54, 0x77, 0x87 }, "EardaTechnol", "Earda Technologies co Ltd" }, - { { 0x54, 0x77, 0x8A }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x54, 0x77, 0x8A }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x54, 0x78, 0x1A }, "Cisco", "Cisco Systems, Inc" }, { { 0x54, 0x78, 0x85 }, "GiecDigital", "Shenzhen Giec Digital Co.,Ltd" }, { { 0x54, 0x78, 0xC9 }, "AMPAKTechnol", "AMPAK Technology,Inc." }, @@ -20500,7 +20507,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x54, 0x7F, 0xA8 }, "TELCOsro", "TELCO systems, s.r.o." }, { { 0x54, 0x7F, 0xBC }, "iodyne", "iodyne" }, { { 0x54, 0x7F, 0xEE }, "Cisco", "Cisco Systems, Inc" }, - { { 0x54, 0x80, 0x28 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x54, 0x80, 0x28 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x54, 0x81, 0x2D }, "PAXComputerT", "PAX Computer Technology(Shenzhen) Ltd." }, { { 0x54, 0x81, 0xAD }, "EagleResearc", "Eagle Research Corporation" }, { { 0x54, 0x83, 0x3A }, "ZyxelCommuni", "Zyxel Communications Corporation" }, @@ -20799,6 +20806,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x58, 0x85, 0x6E }, "Qsc", "Qsc Ag" }, { { 0x58, 0x85, 0xA2 }, "RealmeChongq", "Realme Chongqing MobileTelecommunications Corp Ltd" }, { { 0x58, 0x85, 0xE9 }, "RealmeChongq", "Realme Chongqing MobileTelecommunications Corp Ltd" }, + { { 0x58, 0x86, 0x70 }, "JuniperNetwo", "Juniper Networks" }, { { 0x58, 0x86, 0x94 }, "EFMNetworks", "EFM Networks" }, { { 0x58, 0x87, 0x4C }, "LiteOnCleanE", "Lite-On Clean Energy Technology Corp." }, { { 0x58, 0x87, 0x9F }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -20951,6 +20959,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x58, 0xFD, 0x5D }, "Xinyuntechno", "Hangzhou Xinyun technology Co., Ltd." }, { { 0x58, 0xFD, 0xB1 }, "LGElectronic", "LG Electronics" }, { { 0x58, 0xFD, 0xBE }, "TaikaidaTech", "Shenzhen Taikaida Technology Co., Ltd" }, + { { 0x58, 0xFE, 0x7E }, "zte", "zte corporation" }, { { 0x58, 0xFF, 0xA1 }, "zte", "zte corporation" }, { { 0x5A, 0x03, 0xBA }, "WirelessBroa", "Wireless Broadband Alliance Ltd" }, { { 0x5A, 0x18, 0xFF }, "FiRaConsorti", "FiRa Consortium" }, @@ -21199,12 +21208,13 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x5C, 0xB6, 0xCC }, "NovaCommTech", "NovaComm Technologies Inc." }, { { 0x5C, 0xB8, 0xCB }, "AllisCommuni", "Allis Communications" }, { { 0x5C, 0xB9, 0x01 }, "HewlettPacka", "Hewlett Packard" }, - { { 0x5C, 0xBA, 0x2C }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x5C, 0xBA, 0x2C }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x5C, 0xBA, 0x37 }, "Microsoft", "Microsoft Corporation" }, { { 0x5C, 0xBA, 0xEF }, "ChongqingFug", "Chongqing Fugui Electronics Co.,Ltd." }, { { 0x5C, 0xBB, 0xEE }, "zte", "zte corporation" }, { { 0x5C, 0xBD, 0x9A }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x5C, 0xBD, 0x9E }, "HongkongMira", "Hongkong Miracle Eagle Technology(Group) Limited" }, + { { 0x5C, 0xBE, 0x05 }, "Ispec", "Ispec" }, { { 0x5C, 0xC0, 0xA0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x5C, 0xC1, 0xD7 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x5C, 0xC2, 0x13 }, "FrSauter", "Fr. Sauter AG" }, @@ -21273,7 +21283,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x5C, 0xEA, 0x1D }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x5C, 0xEB, 0x4E }, "RSTAHLHMI", "R. STAHL HMI Systems GmbH" }, { { 0x5C, 0xEB, 0x68 }, "CheerstarTec", "Cheerstar Technology Co., Ltd" }, - { { 0x5C, 0xED, 0x8C }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x5C, 0xED, 0x8C }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x5C, 0xED, 0xF4 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x5C, 0xEE, 0x79 }, "GlobalDigite", "Global Digitech Co LTD" }, { { 0x5C, 0xF2, 0x07 }, "SpecoTechnol", "Speco Technologies" }, @@ -21347,6 +21357,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x60, 0x1A, 0xC7 }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0x60, 0x1B, 0x52 }, "VodafoneItal", "Vodafone Italia S.p.A." }, { { 0x60, 0x1D, 0x0F }, "MidniteSolar", "Midnite Solar" }, + { { 0x60, 0x1D, 0x16 }, "MedEngHoldin", "Med-Eng Holdings ULC" }, { { 0x60, 0x1D, 0x56 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, { { 0x60, 0x1D, 0x91 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x60, 0x1D, 0x9D }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, @@ -22519,6 +22530,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x6C, 0x79, 0xB8 }, "TexasInstrum", "Texas Instruments" }, { { 0x6C, 0x7E, 0x67 }, "Apple", "Apple, Inc." }, { { 0x6C, 0x7F, 0x0C }, "CiscoMeraki", "Cisco Meraki" }, + { { 0x6C, 0x80, 0xAB }, "ifanr", "ifanr Inc" }, { { 0x6C, 0x81, 0xFE }, "Mitsuba", "Mitsuba Corporation" }, { { 0x6C, 0x83, 0x36 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x6C, 0x83, 0x38 }, "Ubihere", "Ubihere" }, @@ -22707,7 +22719,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x70, 0x0F, 0xC7 }, "IkinloopTech", "Shenzhen Ikinloop Technology Co.,Ltd." }, { { 0x70, 0x0F, 0xEC }, "Poindus", "Poindus Systems Corp." }, { { 0x70, 0x10, 0x5C }, "Cisco", "Cisco Systems, Inc" }, - { { 0x70, 0x10, 0x6F }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x70, 0x10, 0x6F }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x70, 0x11, 0x0E }, "zte", "zte corporation" }, { { 0x70, 0x11, 0x24 }, "Apple", "Apple, Inc." }, { { 0x70, 0x11, 0x35 }, "Livesecu", "Livesecu co., Ltd" }, @@ -23602,6 +23614,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x78, 0x7D, 0x48 }, "ItelMobile", "Itel Mobile Limited" }, { { 0x78, 0x7D, 0x53 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, { { 0x78, 0x7D, 0xF3 }, "SterliteTech", "Sterlite Technologies Limited" }, + { { 0x78, 0x7E, 0x42 }, "zte", "zte corporation" }, { { 0x78, 0x7E, 0x61 }, "Apple", "Apple, Inc." }, { { 0x78, 0x7F, 0x62 }, "GiKmbH", "GiK mbH" }, { { 0x78, 0x80, 0x38 }, "FunaiElectri", "Funai Electric Co., Ltd." }, @@ -24028,7 +24041,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x7C, 0xA2, 0x9B }, "DSignT", "D.SignT GmbH & Co. KG" }, { { 0x7C, 0xA4, 0x49 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x7C, 0xA6, 0x1D }, "Mhl", "Mhl, Llc" }, - { { 0x7C, 0xA6, 0x2A }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x7C, 0xA6, 0x2A }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x7C, 0xA7, 0xB0 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0x7C, 0xA9, 0x6B }, "SyrotechNetw", "Syrotech Networks. Ltd." }, { { 0x7C, 0xA9, 0x7D }, "Objenious", "Objenious" }, @@ -24227,7 +24240,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x80, 0x2F, 0xDE }, "ZurichInstru", "Zurich Instruments AG" }, { { 0x80, 0x30, 0x49 }, "LiteonTechno", "Liteon Technology Corporation" }, { { 0x80, 0x30, 0xDC }, "TexasInstrum", "Texas Instruments" }, - { { 0x80, 0x30, 0xE0 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x80, 0x30, 0xE0 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x80, 0x31, 0xF0 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x32, 0x53 }, "Intel", "Intel Corporate" }, { { 0x80, 0x34, 0x28 }, "MicrochipTec", "Microchip Technology Inc." }, @@ -24360,7 +24373,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x80, 0x8A, 0xF7 }, "Nanoleaf", "Nanoleaf" }, { { 0x80, 0x8B, 0x5C }, "RunhuichengT", "Shenzhen Runhuicheng Technology Co., Ltd" }, { { 0x80, 0x8C, 0x97 }, "KaonGroup", "Kaon Group Co., Ltd." }, - { { 0x80, 0x8D, 0xB7 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x80, 0x8D, 0xB7 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x80, 0x8F, 0x1D }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x80, 0x8F, 0xE8 }, "Intelbras", "Intelbras" }, { { 0x80, 0x91, 0x2A }, "LihRongelect", "Lih Rong electronic Enterprise Co., Ltd." }, @@ -25143,6 +25156,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x88, 0xD8, 0x2E }, "Intel", "Intel Corporate" }, { { 0x88, 0xD9, 0x62 }, "CanopusUS", "Canopus Systems US LLC" }, { { 0x88, 0xD9, 0x8F }, "JuniperNetwo", "Juniper Networks" }, + { { 0x88, 0xDA, 0x18 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0x88, 0xDA, 0x1A }, "RedpineSigna", "Redpine Signals, Inc." }, { { 0x88, 0xDA, 0x33 }, "XiaoyuerNetw", "Beijing Xiaoyuer Network Technology Co., Ltd" }, { { 0x88, 0xDC, 0x96 }, "EnGeniusTech", "EnGenius Technologies, Inc." }, @@ -25165,7 +25179,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x88, 0xE8, 0xF8 }, "YongTaiElect", "Yong Tai Electronic (Dongguan) Ltd." }, { { 0x88, 0xE9, 0x0F }, "innomdlelab", "innomdlelab" }, { { 0x88, 0xE9, 0x17 }, "Tamaggo", "Tamaggo" }, - { { 0x88, 0xE9, 0xA4 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x88, 0xE9, 0xA4 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x88, 0xE9, 0xFE }, "Apple", "Apple, Inc." }, { { 0x88, 0xED, 0x1C }, "CudoCommunic", "Cudo Communication Co., Ltd." }, { { 0x88, 0xEF, 0x16 }, "ARRISGroup", "ARRIS Group, Inc." }, @@ -25185,7 +25199,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x88, 0xFD, 0x15 }, "Lineeye", "Lineeye Co., Ltd" }, { { 0x88, 0xFE, 0xD6 }, "WangYongSoft", "ShangHai WangYong Software Co., Ltd." }, { { 0x8A, 0x00, 0xB0 }, "EoptolinkTec", "Eoptolink Technology Inc. Ltd," }, - { { 0x8A, 0x07, 0x75 }, "LyotechLabs", "Lyotech Labs Llc" }, + { { 0x8A, 0x07, 0x75 }, "HorysTechnol", "Horys Technologies Llc" }, { { 0x8A, 0x0A, 0xF7 }, "MontageTechn", "Montage Technology Co,.LTD" }, { { 0x8A, 0x34, 0xBC }, "FiberworksAS", "Fiberworks AS" }, { { 0x8A, 0x4F, 0x8B }, "Irdeto", "Irdeto" }, @@ -25644,7 +25658,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x90, 0x48, 0x9A }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x90, 0x49, 0x92 }, "YSTenTechnol", "YSTen Technology Co.,Ltd" }, { { 0x90, 0x49, 0xFA }, "Intel", "Intel Corporate" }, - { { 0x90, 0x4C, 0x81 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x90, 0x4C, 0x81 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x90, 0x4C, 0xE5 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x90, 0x4D, 0x4A }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x90, 0x4D, 0xC3 }, "Flonidan", "Flonidan A/S" }, @@ -25933,7 +25947,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x94, 0x16, 0x73 }, "PointCore", "Point Core SARL" }, { { 0x94, 0x17, 0x00 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x94, 0x18, 0x65 }, "Netgear", "Netgear" }, - { { 0x94, 0x18, 0x82 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x94, 0x18, 0x82 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x94, 0x19, 0x3A }, "Elvaco", "Elvaco AB" }, { { 0x94, 0x1C, 0x56 }, "ActiontecEle", "Actiontec Electronics, Inc" }, { { 0x94, 0x1D, 0x1C }, "TLabWest", "TLab West Systems AB" }, @@ -25982,10 +25996,10 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x94, 0x3E, 0xE4 }, "WiSATechnolo", "WiSA Technologies Inc" }, { { 0x94, 0x3F, 0x0C }, "Genexis", "Genexis B.V." }, { { 0x94, 0x3F, 0xBB }, "JSCRPCIstokn", "JSC RPC Istok named after Shokin" }, - { { 0x94, 0x3F, 0xC2 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x94, 0x3F, 0xC2 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x94, 0x3F, 0xD6 }, "Apple", "Apple, Inc." }, { { 0x94, 0x40, 0xA2 }, "AnywaveCommu", "Anywave Communication Technologies, Inc." }, - { { 0x94, 0x40, 0xC9 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x94, 0x40, 0xC9 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x94, 0x40, 0xF3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x94, 0x41, 0xC1 }, "MiniCam", "Mini-Cam Limited" }, { { 0x94, 0x43, 0x4D }, "Ciena", "Ciena Corporation" }, @@ -26223,7 +26237,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x94, 0xEB, 0xCD }, "BlackBerryRT", "BlackBerry RTS" }, { { 0x94, 0xEE, 0x9F }, "HMDGlobal", "HMD Global Oy" }, { { 0x94, 0xEF, 0x49 }, "BDRThermeaGr", "BDR Thermea Group B.V" }, - { { 0x94, 0xF1, 0x28 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x94, 0xF1, 0x28 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x94, 0xF1, 0x9E }, "HuizhouMaoro", "Huizhou Maorong Intelligent Technology Co.,Ltd" }, { { 0x94, 0xF2, 0x78 }, "ElmaElectron", "Elma Electronic" }, { { 0x94, 0xF2, 0xBB }, "ValeoVision", "Valeo Vision Systems" }, @@ -26489,6 +26503,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x98, 0xCA, 0x20 }, "SIMCOM", "Shanghai SIMCOM Ltd." }, { { 0x98, 0xCA, 0x33 }, "Apple", "Apple, Inc." }, { { 0x98, 0xCB, 0x27 }, "GaloreNetwor", "Galore Networks Pvt. Ltd." }, + { { 0x98, 0xCB, 0x38 }, "BoxinCommuni", "Boxin Communications Limited Liability Company" }, { { 0x98, 0xCB, 0xA4 }, "BenchmarkEle", "Benchmark Electronics" }, { { 0x98, 0xCC, 0x4D }, "mantunsci", "Shenzhen mantunsci co., LTD" }, { { 0x98, 0xCC, 0xD9 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, @@ -26543,7 +26558,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x98, 0xF1, 0x81 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x98, 0xF1, 0x99 }, "NECPlatforms", "NEC Platforms, Ltd." }, { { 0x98, 0xF2, 0x17 }, "CastlenetTec", "Castlenet Technology Inc." }, - { { 0x98, 0xF2, 0xB3 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x98, 0xF2, 0xB3 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x98, 0xF4, 0x28 }, "zte", "zte corporation" }, { { 0x98, 0xF4, 0x87 }, "TexasInstrum", "Texas Instruments" }, { { 0x98, 0xF4, 0xAB }, "Espressif", "Espressif Inc." }, @@ -26692,6 +26707,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x9C, 0x58, 0x3C }, "Apple", "Apple, Inc." }, { { 0x9C, 0x58, 0x84 }, "Apple", "Apple, Inc." }, { { 0x9C, 0x5A, 0x44 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, + { { 0x9C, 0x5A, 0x80 }, "JuniperNetwo", "Juniper Networks" }, { { 0x9C, 0x5A, 0x81 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x9C, 0x5B, 0x96 }, "NMR", "NMR Corporation" }, { { 0x9C, 0x5C, 0x8D }, "FiremaxIndús", "Firemax Indústria E Comércio De Produtos Eletrônicos Ltda" }, @@ -26762,7 +26778,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x9C, 0x8B, 0xA0 }, "Apple", "Apple, Inc." }, { { 0x9C, 0x8B, 0xF1 }, "Warehouse", "The Warehouse Limited" }, { { 0x9C, 0x8C, 0x6E }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, - { { 0x9C, 0x8C, 0xD8 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x9C, 0x8C, 0xD8 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x9C, 0x8D, 0x1A }, "INTEGprocess", "INTEG process group inc" }, { { 0x9C, 0x8D, 0x7C }, "Alpsalpine", "Alpsalpine Co,.Ltd" }, { { 0x9C, 0x8D, 0xD3 }, "LeontonTechn", "Leonton Technologies" }, @@ -26866,7 +26882,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0x9C, 0xDB, 0x07 }, "Yellowtec", "Yellowtec GmbH" }, { { 0x9C, 0xDB, 0xAF }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x9C, 0xDB, 0xCB }, "FunshionOnli", "Wuhan Funshion Online Technologies Co.,Ltd" }, - { { 0x9C, 0xDC, 0x71 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x9C, 0xDC, 0x71 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0x9C, 0xDD, 0x1F }, "IntelligentS", "Intelligent Steward Co.,Ltd" }, { { 0x9C, 0xDE, 0x4D }, "MLvision", "ML vision Co.,LTD" }, { { 0x9C, 0xDF, 0x03 }, "HarmanBecker", "Harman/Becker Automotive Systems GmbH" }, @@ -27611,6 +27627,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xA4, 0xFB, 0x8D }, "DunchongTech", "Hangzhou Dunchong Technology Co.Ltd" }, { { 0xA4, 0xFC, 0x14 }, "Apple", "Apple, Inc." }, { { 0xA4, 0xFC, 0x77 }, "MegaWell", "Mega Well Limited" }, + { { 0xA4, 0xFC, 0xA1 }, "NokiaSolutio", "Nokia Solutions and Networks GmbH & Co. KG" }, { { 0xA4, 0xFC, 0xCE }, "SecurityExpe", "Security Expert Ltd." }, { { 0xA4, 0xFF, 0x95 }, "Nokia", "Nokia" }, { { 0xA8, 0x00, 0xE3 }, "StarkeyLabs", "Starkey Labs Inc." }, @@ -27857,7 +27874,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xA8, 0xBB, 0xCF }, "Apple", "Apple, Inc." }, { { 0xA8, 0xBC, 0x9C }, "CloudLightTe", "Cloud Light Technology Limited" }, { { 0xA8, 0xBD, 0x1A }, "HoneyBee", "Honey Bee (Hong Kong) Limited" }, - { { 0xA8, 0xBD, 0x27 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xA8, 0xBD, 0x27 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xA8, 0xBD, 0x3A }, "UnionManTech", "Union Man Technology Co.,Ltd" }, { { 0xA8, 0xBE, 0x27 }, "Apple", "Apple, Inc." }, { { 0xA8, 0xBF, 0x3C }, "HDVPhoelectr", "HDV Phoelectron Technology Limited" }, @@ -28420,6 +28437,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB0, 0x57, 0x06 }, "Vallox", "Vallox Oy" }, { { 0xB0, 0x58, 0xC4 }, "BroadcastMic", "Broadcast Microwave Services, Inc" }, { { 0xB0, 0x59, 0x47 }, "QihuIntellig", "Shenzhen Qihu Intelligent Technology Company Limited" }, + { { 0xB0, 0x5A, 0x44 }, "FibocomWirel", "Fibocom Wireless Inc." }, { { 0xB0, 0x5A, 0xDA }, "HewlettPacka", "Hewlett Packard" }, { { 0xB0, 0x5B, 0x1F }, "ThermoFisher", "Thermo Fisher Scientific S.P.A." }, { { 0xB0, 0x5B, 0x67 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -28544,7 +28562,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB0, 0xB4, 0x48 }, "TexasInstrum", "Texas Instruments" }, { { 0xB0, 0xB5, 0xC3 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0xB0, 0xB5, 0xE8 }, "Ruroc", "Ruroc LTD" }, - { { 0xB0, 0xB8, 0x67 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xB0, 0xB8, 0x67 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xB0, 0xB8, 0xD5 }, "NanjingNengr", "Nanjing Nengrui Auto Equipment CO.,Ltd" }, { { 0xB0, 0xB9, 0x8A }, "Netgear", "Netgear" }, { { 0xB0, 0xBB, 0x8B }, "WavetelTechn", "Wavetel Technology Limited" }, @@ -28790,7 +28808,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB4, 0x79, 0x47 }, "Nutanix", "Nutanix" }, { { 0xB4, 0x79, 0xA7 }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, { { 0xB4, 0x79, 0xC8 }, "RuckusWirele", "Ruckus Wireless" }, - { { 0xB4, 0x7A, 0xF1 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xB4, 0x7A, 0xF1 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xB4, 0x7C, 0x29 }, "GuzidiTechno", "Shenzhen Guzidi Technology Co.,Ltd" }, { { 0xB4, 0x7C, 0x59 }, "JiangsuHengx", "Jiangsu Hengxin Technology Co.,Ltd." }, { { 0xB4, 0x7C, 0x9C }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -28813,6 +28831,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB4, 0x8A, 0x5F }, "JuniperNetwo", "Juniper Networks" }, { { 0xB4, 0x8B, 0x19 }, "Apple", "Apple, Inc." }, { { 0xB4, 0x8C, 0x9D }, "AzureWaveTec", "AzureWave Technology Inc." }, + { { 0xB4, 0x92, 0xFE }, "AristaNetwor", "Arista Network, Inc." }, { { 0xB4, 0x94, 0x4E }, "WeTelecom", "WeTelecom Co., Ltd." }, { { 0xB4, 0x96, 0x91 }, "Intel", "Intel Corporate" }, { { 0xB4, 0x98, 0x42 }, "zte", "zte corporation" }, @@ -29099,7 +29118,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB8, 0x6A, 0x97 }, "EdgecoreNetw", "Edgecore Networks Corporation" }, { { 0xB8, 0x6A, 0xF1 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xB8, 0x6B, 0x23 }, "Toshiba", "Toshiba" }, - { { 0xB8, 0x6C, 0xE0 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xB8, 0x6C, 0xE0 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xB8, 0x6C, 0xE8 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xB8, 0x70, 0xF4 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, { { 0xB8, 0x74, 0x24 }, "ViessmannEle", "Viessmann Elektronik GmbH" }, @@ -29124,7 +29143,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xB8, 0x80, 0x4F }, "TexasInstrum", "Texas Instruments" }, { { 0xB8, 0x81, 0x98 }, "Intel", "Intel Corporate" }, { { 0xB8, 0x81, 0xFA }, "Apple", "Apple, Inc." }, - { { 0xB8, 0x83, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xB8, 0x83, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xB8, 0x85, 0x7B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB8, 0x85, 0x84 }, "Dell", "Dell Inc." }, { { 0xB8, 0x86, 0x87 }, "LiteonTechno", "Liteon Technology Corporation" }, @@ -30560,7 +30579,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xC8, 0xB2, 0x9B }, "Intel", "Intel Corporate" }, { { 0xC8, 0xB3, 0x73 }, "CiscoLinksys", "Cisco-Linksys, LLC" }, { { 0xC8, 0xB4, 0x22 }, "AskeyCompute", "Askey Computer Corp" }, - { { 0xC8, 0xB5, 0xAD }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xC8, 0xB5, 0xAD }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xC8, 0xB5, 0xB7 }, "Apple", "Apple, Inc." }, { { 0xC8, 0xB6, 0xD3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC8, 0xB6, 0xFE }, "Fitbit", "Fitbit, Inc." }, @@ -31175,7 +31194,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xD0, 0x65, 0xCA }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD0, 0x66, 0x6D }, "BusLanTechno", "Shenzhen Bus-Lan Technology Co., Ltd." }, { { 0xD0, 0x66, 0x7B }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, - { { 0xD0, 0x67, 0x26 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xD0, 0x67, 0x26 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xD0, 0x67, 0xE5 }, "Dell", "Dell Inc." }, { { 0xD0, 0x69, 0x9E }, "LUMINEXLight", "LUMINEX Lighting Control Equipment" }, { { 0xD0, 0x69, 0xD0 }, "VertoMedical", "Verto Medical Solutions, LLC" }, @@ -31711,7 +31730,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xD4, 0xF5, 0x13 }, "TexasInstrum", "Texas Instruments" }, { { 0xD4, 0xF5, 0x27 }, "Siemens", "Siemens Ag" }, { { 0xD4, 0xF5, 0x47 }, "Google", "Google, Inc." }, - { { 0xD4, 0xF5, 0xEF }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xD4, 0xF5, 0xEF }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xD4, 0xF6, 0x3F }, "Iea", "Iea S.R.L." }, { { 0xD4, 0xF7, 0x56 }, "zte", "zte corporation" }, { { 0xD4, 0xF7, 0x86 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -31925,7 +31944,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xD8, 0x91, 0x2A }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0xD8, 0x91, 0x36 }, "DoverFueling", "Dover Fueling Solutions" }, { { 0xD8, 0x93, 0x41 }, "GeneralElect", "General Electric Global Research" }, - { { 0xD8, 0x94, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xD8, 0x94, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xD8, 0x95, 0x2F }, "TexasInstrum", "Texas Instruments" }, { { 0xD8, 0x95, 0x63 }, "TaiwanDigita", "Taiwan Digital Streaming Co." }, { { 0xD8, 0x96, 0x85 }, "GoPro", "GoPro" }, @@ -32228,7 +32247,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xDC, 0x66, 0x3A }, "ApacerTechno", "Apacer Technology Inc." }, { { 0xDC, 0x66, 0x72 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xDC, 0x67, 0x23 }, "baroxKommuni", "barox Kommunikation GmbH" }, - { { 0xDC, 0x68, 0x0C }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xDC, 0x68, 0x0C }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xDC, 0x68, 0x80 }, "zte", "zte corporation" }, { { 0xDC, 0x68, 0xEB }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0xDC, 0x69, 0xE2 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -32407,7 +32426,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xDC, 0xEB, 0x69 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0xDC, 0xEB, 0x94 }, "Cisco", "Cisco Systems, Inc" }, { { 0xDC, 0xEC, 0x06 }, "HeimiNetwork", "Heimi Network Technology Co., Ltd." }, - { { 0xDC, 0xEC, 0xE3 }, "LyotechLabs", "Lyotech Labs Llc" }, + { { 0xDC, 0xEC, 0xE3 }, "HorysTechnol", "Horys Technologies Llc" }, { { 0xDC, 0xED, 0x83 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0xDC, 0xED, 0x84 }, "Haverford", "Haverford Systems Inc" }, { { 0xDC, 0xEE, 0x06 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -32445,7 +32464,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xE0, 0x05, 0xC5 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0xE0, 0x06, 0x30 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE0, 0x06, 0xE6 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, - { { 0xE0, 0x07, 0x1B }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xE0, 0x07, 0x1B }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xE0, 0x07, 0xC2 }, "FujianStarNe", "Fujian Star-Net Communication Co.,Ltd" }, { { 0xE0, 0x08, 0x55 }, "AVMAudiovisu", "AVM Audiovisuelles Marketing und Computersysteme GmbH" }, { { 0xE0, 0x08, 0x71 }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, @@ -33434,7 +33453,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xE8, 0xF3, 0x75 }, "Nokia", "Nokia" }, { { 0xE8, 0xF4, 0x08 }, "Intel", "Intel Corporate" }, { { 0xE8, 0xF6, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0xE8, 0xF7, 0x24 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xE8, 0xF7, 0x24 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xE8, 0xF7, 0x2F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE8, 0xF7, 0x91 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xE8, 0xF8, 0xD0 }, "NokiaShangha", "Nokia Shanghai Bell Co., Ltd." }, @@ -33661,7 +33680,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xEC, 0x9A, 0x74 }, "HewlettPacka", "Hewlett Packard" }, { { 0xEC, 0x9B, 0x2D }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xEC, 0x9B, 0x5B }, "Nokia", "Nokia Corporation" }, - { { 0xEC, 0x9B, 0x8B }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xEC, 0x9B, 0x8B }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xEC, 0x9B, 0xF3 }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, { { 0xEC, 0x9C, 0x32 }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0xEC, 0x9E, 0xCD }, "ArtesynEmbed", "Artesyn Embedded Technologies" }, @@ -33756,7 +33775,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xEC, 0xE9, 0x15 }, "STI", "STI Ltd" }, { { 0xEC, 0xE9, 0xF8 }, "GuangZhouTRI", "Guang Zhou TRI-SUN Electronics Technology Co., Ltd" }, { { 0xEC, 0xEA, 0x03 }, "DarfonLighti", "Darfon Lighting Corp" }, - { { 0xEC, 0xEB, 0xB8 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xEC, 0xEB, 0xB8 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xEC, 0xED, 0x73 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xEC, 0xEE, 0xD8 }, "ZTLXNetworkT", "ZTLX Network Technology Co.,Ltd" }, { { 0xEC, 0xEF, 0x17 }, "SunplusTechn", "Sunplus Technology Co., Ltd." }, @@ -34124,7 +34143,7 @@ static const manuf_oui24_t global_manuf_oui24_table[] = { { { 0xF4, 0x03, 0x21 }, "BeNeXt", "BeNeXt B.V." }, { { 0xF4, 0x03, 0x2A }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xF4, 0x03, 0x2F }, "Reduxio", "Reduxio Systems" }, - { { 0xF4, 0x03, 0x43 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xF4, 0x03, 0x43 }, "HewlettPacka", "Hewlett Packard Enterprise – WW Corporate Headquarters" }, { { 0xF4, 0x04, 0x4C }, "ValenceTech", "ValenceTech Limited" }, { { 0xF4, 0x05, 0x95 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xF4, 0x06, 0x16 }, "Apple", "Apple, Inc." }, @@ -35346,12 +35365,20 @@ static const manuf_oui28_t global_manuf_oui28_table[] = { { { 0x08, 0x26, 0xAE, 0xD0 }, "VethPropulsi", "Veth Propulsion bv" }, { { 0x08, 0x26, 0xAE, 0xE0 }, "MassElectron", "Mass Electronics Pty Ltd" }, { { 0x08, 0x63, 0x32, 0x00 }, "Eaton", "Eaton" }, + { { 0x08, 0x63, 0x32, 0x10 }, "eCloudTechno", "Shanghai eCloud Technologies Co.,ltd" }, { { 0x08, 0x63, 0x32, 0x20 }, "innovativesp", "innovative specialized security solutions" }, { { 0x08, 0x63, 0x32, 0x30 }, "UmanoMedical", "Umano Medical Inc." }, + { { 0x08, 0x63, 0x32, 0x40 }, "KELIBANGInfo", "Beijing KELIBANG Information technology Co.,LTD" }, { { 0x08, 0x63, 0x32, 0x50 }, "APaulSoftwar", "A Paul Software Systems Pvt. Ltd." }, { { 0x08, 0x63, 0x32, 0x60 }, "OVTIndia", "OVT India pvt Ltd" }, + { { 0x08, 0x63, 0x32, 0x70 }, "SoftwareAuto", "Software-Automation-Control Joint Stock Company (Cadpro., Jsc)" }, + { { 0x08, 0x63, 0x32, 0x80 }, "inhub", "in.hub GmbH" }, + { { 0x08, 0x63, 0x32, 0x90 }, "TZMedical", "TZMedical Inc." }, { { 0x08, 0x63, 0x32, 0xA0 }, "DynacomCommu", "Dynacom Communication" }, + { { 0x08, 0x63, 0x32, 0xB0 }, "YuanXiangDig", "ShenZhen YuanXiang Digital Technology Co., Ltd" }, + { { 0x08, 0x63, 0x32, 0xC0 }, "Swiftronix", "Swiftronix AB" }, { { 0x08, 0x63, 0x32, 0xD0 }, "akYtec", "akYtec GmbH" }, + { { 0x08, 0x63, 0x32, 0xE0 }, "CVueAudioTec", "C-Vue (Shanghai) Audio Technology Co.,Ltd" }, { { 0x08, 0xED, 0x02, 0x00 }, "D2SLink", "D2SLink Systems" }, { { 0x08, 0xED, 0x02, 0x10 }, "Imperx", "Imperx, Inc" }, { { 0x08, 0xED, 0x02, 0x20 }, "TESTouchEmbe", "TES Touch Embedded Solutions Inc." }, @@ -36769,6 +36796,10 @@ static const manuf_oui28_t global_manuf_oui28_table[] = { { { 0x48, 0xDA, 0x35, 0xC0 }, "GuangzhouXin", "Guangzhou Xinhong Communication Technology Co.,Ltd" }, { { 0x48, 0xDA, 0x35, 0xD0 }, "Nacon", "Nacon Limited (Hk) Ltd" }, { { 0x48, 0xDA, 0x35, 0xE0 }, "NepsTechnolo", "Neps Technologies Private Limited" }, + { { 0x48, 0xE6, 0x63, 0x00 }, "HuaqianBeiji", "Huaqian Beijing Technology Co., Ltd" }, + { { 0x48, 0xE6, 0x63, 0x40 }, "SmileSecurit", "Smile Security and Survillence Private Limited" }, + { { 0x48, 0xE6, 0x63, 0x70 }, "EarweissTech", "Earweiss Technology (Shenzhen) Co,. Ltd" }, + { { 0x48, 0xE6, 0x63, 0xB0 }, "NakamuraTome", "Nakamura-Tome Precision Industry Co.,Ltd." }, { { 0x4C, 0x4B, 0xF9, 0x00 }, "MultitekElek", "Multitek Elektronik Sanayi ve Ticaret A.S." }, { { 0x4C, 0x4B, 0xF9, 0x10 }, "Jiangsuacrel", "Jiangsu acrel Co., Ltd." }, { { 0x4C, 0x4B, 0xF9, 0x20 }, "HommProTechn", "Shenzhen HommPro Technology Co.,Ltd" }, @@ -49379,6 +49410,7 @@ static const manuf_oui36_t global_manuf_oui36_table[] = { { { 0x8C, 0x1F, 0x64, 0x26, 0x80 }, "AstroMachine", "Astro Machine Corporation" }, { { 0x8C, 0x1F, 0x64, 0x26, 0xE0 }, "KoizumiLight", "Koizumi Lighting Technology Corp." }, { { 0x8C, 0x1F, 0x64, 0x27, 0x00 }, "Xi‘anHanggua", "Xi‘an Hangguang Satellite and Control Technology Co.,Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x27, 0x30 }, "Distran", "Distran AG" }, { { 0x8C, 0x1F, 0x64, 0x27, 0x40 }, "InvixiumAcce", "Invixium Access Inc" }, { { 0x8C, 0x1F, 0x64, 0x27, 0xB0 }, "Oriux", "Oriux" }, { { 0x8C, 0x1F, 0x64, 0x28, 0x00 }, "Heitec", "Heitec Ag" }, @@ -50325,6 +50357,7 @@ static const manuf_oui36_t global_manuf_oui36_table[] = { { { 0x8C, 0x1F, 0x64, 0xBF, 0x80 }, "Cdsi", "Cdsi" }, { { 0x8C, 0x1F, 0x64, 0xBF, 0xB0 }, "TechArgos", "TechArgos" }, { { 0x8C, 0x1F, 0x64, 0xBF, 0xC0 }, "ASiSTechnolo", "ASiS Technologies Pte Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xBF, 0xE0 }, "PuSund", "PuS GmbH und Co. KG" }, { { 0x8C, 0x1F, 0x64, 0xC0, 0x10 }, "HoribaAbxSas", "Horiba Abx Sas" }, { { 0x8C, 0x1F, 0x64, 0xC0, 0x30 }, "AbimanEngine", "Abiman Engineering" }, { { 0x8C, 0x1F, 0x64, 0xC0, 0x40 }, "Sanwa", "Sanwa Corporation" }, @@ -50458,6 +50491,7 @@ static const manuf_oui36_t global_manuf_oui36_table[] = { { { 0x8C, 0x1F, 0x64, 0xD4, 0x40 }, "MonarchInstr", "Monarch Instrument" }, { { 0x8C, 0x1F, 0x64, 0xD4, 0x60 }, "End2EndTechn", "End 2 End Technologies" }, { { 0x8C, 0x1F, 0x64, 0xD4, 0xA0 }, "Caproc", "Caproc Oy" }, + { { 0x8C, 0x1F, 0x64, 0xD4, 0xF0 }, "HenanCreatbo", "Henan Creatbot Technology Limited" }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x10 }, "ZIGENLightin", "ZIGEN Lighting Solution co., ltd." }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x20 }, "CriticalSoft", "Critical Software SA" }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x30 }, "Gridnt", "Gridnt" }, @@ -50526,9 +50560,11 @@ static const manuf_oui36_t global_manuf_oui36_table[] = { { { 0x8C, 0x1F, 0x64, 0xE0, 0x00 }, "DvbTech", "Dvb-Tech S.R.L." }, { { 0x8C, 0x1F, 0x64, 0xE0, 0x20 }, "ITSTeknik", "ITS Teknik A/S" }, { { 0x8C, 0x1F, 0x64, 0xE0, 0x90 }, "EnlessWirele", "Enless Wireless" }, + { { 0x8C, 0x1F, 0x64, 0xE0, 0xB0 }, "LaurelElectr", "Laurel Electronics LLC" }, { { 0x8C, 0x1F, 0x64, 0xE0, 0xE0 }, "Nokeval", "Nokeval Oy" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0x00 }, "ScenarioAuto", "Scenario Automation" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0x20 }, "PixusTechnol", "Pixus Technologies Inc." }, + { { 0x8C, 0x1F, 0x64, 0xE1, 0x40 }, "Proserv", "Proserv" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0xA0 }, "DAccessSecur", "DAccess Security Systems P Ltd" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0xE0 }, "FlextronicsI", "Flextronics International Kft" }, { { 0x8C, 0x1F, 0x64, 0xE2, 0x10 }, "LGLHTAircraf", "LG-LHT Aircraft Solutions GmbH" }, diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index ebfc20dc7c..3c0adee2ed 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -2159,6 +2159,14 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Copy packet bytes as Go literal. Paketbytes als Go Literal kopieren + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream ...als Hex Stream @@ -2999,7 +3007,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Save - Speichern + Speichern Default diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 20320ea740..a60cafb060 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -2154,6 +2154,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream @@ -2990,10 +2998,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Start - - Save - - Default diff --git a/ui/qt/wireshark_es.ts b/ui/qt/wireshark_es.ts index 5c42a404e3..084d98b05b 100644 --- a/ui/qt/wireshark_es.ts +++ b/ui/qt/wireshark_es.ts @@ -2132,6 +2132,14 @@ Por ejemplo, use 1 hora para tener creado un nuevo archivo cada hora en punto.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream @@ -2970,10 +2978,6 @@ Por ejemplo, use 1 hora para tener creado un nuevo archivo cada hora en punto.Start - - Save - - Default Predeterminado diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 590a680625..2cbb500e13 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -2157,6 +2157,14 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream …sous forme de flux Hex @@ -2995,7 +3003,7 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h Save - Sauvegarder + Sauvegarder Default diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 564516bfa8..aed31f1dd9 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -2159,6 +2159,14 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.Copy packet bytes as Go literal. Copia i byte del pacchetto come Go letterale. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream ...come un flusso esadecimale @@ -2999,7 +3007,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. Save - Salva + Salva Default diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 9c6ea54100..ac5d5f7ae4 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -2151,6 +2151,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. Go言語のリテラルとしてパケットバイト列をコピーします。 + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream 16進数ストリームとして… @@ -2991,7 +2999,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Save - 保存 + 保存 Default diff --git a/ui/qt/wireshark_ko.ts b/ui/qt/wireshark_ko.ts index 27719aa0b1..80c84795e3 100644 --- a/ui/qt/wireshark_ko.ts +++ b/ui/qt/wireshark_ko.ts @@ -2150,6 +2150,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. Go 리터럴 형식으로 패킷 바이트를 복사합니다. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream 16진수 스트림으로 복사 @@ -2990,7 +2998,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Save - 저장 + 저장 Default diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 75d5e26c58..5cf6a405dd 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -2161,6 +2161,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream @@ -2999,10 +3007,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Start Start - - Save - - Default Domyślnie diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts index 2c99ae36b5..cc905375ad 100644 --- a/ui/qt/wireshark_ru.ts +++ b/ui/qt/wireshark_ru.ts @@ -2164,6 +2164,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream …в виде шестнадцатеричного потока @@ -3004,7 +3012,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Save - Сохранить + Сохранить Default diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts index 16cab823ab..1001979b00 100644 --- a/ui/qt/wireshark_sv.ts +++ b/ui/qt/wireshark_sv.ts @@ -2157,6 +2157,14 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream … som en hex-ström @@ -2997,7 +3005,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Save - Spara + Spara Default diff --git a/ui/qt/wireshark_tr_TR.ts b/ui/qt/wireshark_tr_TR.ts index b177936306..e4e48248e5 100644 --- a/ui/qt/wireshark_tr_TR.ts +++ b/ui/qt/wireshark_tr_TR.ts @@ -81,11 +81,11 @@ About Logray - + Logray Hakkında Logray - + Logray The directory does not exist @@ -738,11 +738,11 @@ …as decimal - + …ondalık sayı olarak …as octal - + …sekizli olarak …as bits @@ -765,22 +765,22 @@ CaptureCommentDialog Edit Capture Comments - + Yakalama Yorumlarını Düzenle Add Comment - + Yorum Ekle Section %1 - Bölüm %1 + Bölüm %1 CaptureCommentTabWidget Comment %1 - + Yorum %1 @@ -972,7 +972,7 @@ Edit Comments - + Yorumları Düzenle Refresh @@ -1092,23 +1092,23 @@ Comments - Yorumlar + Yorumlar Comment %1: - + Yorum %1: Decryption Secrets - + Şifre Çözme Sırları Type - Biçim + Tür Size - Boyut + Boyut Statistics @@ -1178,7 +1178,9 @@ Created by Logray %1 - + Logray %1 tarafından oluşturuldu + + @@ -1408,11 +1410,11 @@ For example, use 1 hour to have a new file created every hour on the hour. <html><head/><body><p>Usually a wireless network card will only capture the traffic sent to and from its own network address, and only captures <em>user data</em> traffic with &quot;fake&quot; Ethernet headers. If you want to capture all traffic that wireless network cards can &quot;see&quot;, or are interested in 802.11 management or control packets, or radio-layer information, mark this option. Monitor mode availability depends on the wireless card and driver. See the Wiki for some more details of capturing packets on WLAN networks.</p></body></html> - + </html><head/></body></p>Genellikle bir kablosuz ağ kartı, yalnızca kendi ağ adresine gönderilen ve ondan gelen trafiği yakalar ve yalnızca "sahte" Ethernet başlıklarıyla <em>kullanıcı verisi</em> trafiğini yakalar. Kablosuz ağ kartlarının "görebildiği" tüm trafiği yakalamak istiyorsanız veya 802.11 yönetim veya kontrol paketleri veya radyo katmanı bilgileriyle ilgileniyorsanız, bu seçeneği işaretleyin. Monitor modu, kablosuz kart ve sürücüye bağlıdır. WLAN ağlarında paket yakalama hakkında daha fazla ayrıntı için Wiki'ye bakın.</p></body></html> Enable monitor mode on all 802.11 interfaces - + Tüm 802.11 arayüzlerinde monitör modunu etkinleştirin compression @@ -1428,11 +1430,11 @@ For example, use 1 hour to have a new file created every hour on the hour. File infix pattern - + Dosya ek deseni <html><head/><body><p>In multiple file mode, the date and time and file index number are inserted between filename template and any suffix. Select their order.</p></body></html> - + <html><head/><body><p>Çoklu dosya modunda, tarih ve saat ile dosya dizin numarası, dosya adı şablonu ve herhangi bir ek arasına yerleştirilir. Sıralamayı seçin.</p></body></html> YYYYmmDDHHMMSS_NNNNN @@ -1440,7 +1442,7 @@ For example, use 1 hour to have a new file created every hour on the hour. <html><head/><body><p>Date and time before the file index number. This causes files to sort in creation time order, and keeps files from the same batch closely ordered.</p></body></html> - + <html><head/><body><p>Tarih ve saat, dosya dizin numarasından önce gelir. Bu, dosyaların oluşturma zamanına göre sıralanmasına ve aynı grup dosyaların yakın bir şekilde sıralanmasına neden olur.</p></body></html> NNNNN_YYYYmmDDHHMMSS @@ -1448,7 +1450,7 @@ For example, use 1 hour to have a new file created every hour on the hour. <html><head/><body><p>File index number before the date and time. This is the historic Wireshark ordering.</p></body></html> - + <html><head/><body><p>Dosya dizin numarası tarih ve saat öncesinde. Bu, tarihsel Wireshark sıralamasıdır.</p></body></html> <html><head/><body><p>After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.</p></body></html> @@ -1631,11 +1633,11 @@ For example, use 1 hour to have a new file created every hour on the hour. <html><head/><body><p>Usually a wireless network card will only capture the traffic sent to and from its own network address, and only captures <em>user data</em> traffic with &quot;fake&quot; Ethernet headers. If you want to capture all traffic that wireless network cards can &quot;see&quot;, or are interested in 802.11 management or control packets, or radio-layer information, mark this option. Monitor mode availability depends on the wireless card and driver. See the Wiki for more details of capturing packets on WLAN networks.</p></body></html> - + <html><head/><body><p>Genellikle bir kablosuz ağ kartı, yalnızca kendi ağ adresine gönderilen ve ondan gelen trafiği yakalar ve yalnızca "sahte" Ethernet başlıklarıyla <em>kullanıcı verisi</em> trafiğini yakalar. Kablosuz ağ kartlarının "görebildiği" tüm trafiği yakalamak istiyorsanız veya 802.11 yönetim veya kontrol paketleri veya radyo katmanı bilgileriyle ilgileniyorsanız, bu seçeneği işaretleyin. Monitor modu, kablosuz kart ve sürücüye bağlıdır. WLAN ağlarında paket yakalama hakkında daha fazla ayrıntı için Wiki'ye bakın.</p></body></html> Capture packets in monitor mode on 802.11 devices - + 802.11 cihazlarda monitör modunda paketleri yakalayın. <html><head/><body><p>Capture packets in the next-generation capture file format.</p></body></html> @@ -1655,15 +1657,15 @@ For example, use 1 hour to have a new file created every hour on the hour. Interval between updates (ms) - + Güncellemeler arasındaki süre (ms) <html><head/><body><p>How often the capture notifies the GUI of new packets. Affects how often the GUI updates and the granularity of timers.</p></body></html> - + <html><head/><body><p>Yakalamanın Arayüz`e yeni paketler hakkında ne sıklıkta bildirimde bulunduğu. Arayüz`ün ne sıklıkta güncellendiğini ve zamanlayıcıların ayrıntı düzeyini etkiler.</p></body></html> <html><head/><body><p>The interval between new packet updates. Affects how often the GUI updates and the granularity of timers.</p></body></html> - + <html><head/><body><p>Yeni paket güncellemeleri arasındaki süre. Arayüz'ün ne sıklıkla güncellendiğini ve zamanlayıcıların ayrıntısını etkiler.</p></body></html> Don't load interfaces on startup @@ -1866,11 +1868,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Width - + Genişlik Alignment - + Hizalama <html>Show human-readable strings instead of raw values for fields. Only applicable to custom columns with fields that have value strings.</html> @@ -1908,23 +1910,23 @@ For example, use 1 hour to have a new file created every hour on the hour.ColumnTypeDelegate Default - Ön tanımlı + Öntanımlı Left - Sol + Sol Center - + Merkez Right - Sağa + Sağ Unknown - Bilinmiyor + Bilinmiyor @@ -2124,30 +2126,38 @@ For example, use 1 hour to have a new file created every hour on the hour. …as Printable Text - + …Yazdırılabilir Metin Olarak Copy only the printable text in the packet. - + Yalnızca paketteki yazdırılabilir metni kopyalayın. …as MIME Data - + …MIME Verisi …as C String - + …C Dizesi olarak Copy packet bytes as printable ASCII characters and escape sequences. - + Paket baytlarını yazdırılabilir ASCII karakterleri ve kaçış dizilerini kopyala. …as Go literal - + …Go literali olarak Copy packet bytes as Go literal. + Paket baytlarını Go literali olarak kopyala. + + + …as C Array + + + + Copy packet bytes as C Array. @@ -2434,11 +2444,11 @@ For example, use 1 hour to have a new file created every hour on the hour.DissectorSyntaxLineEdit Dissector entry - + Dissektör girişi Enter a dissector %1 - + Bir dissector %1 girin. @@ -2990,7 +3000,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Save - Kaydet + Kaydet Default @@ -3134,11 +3144,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Display Filter Macros - + Filtre Makrolarını Görüntüle New macro - + Yeni makro Open @@ -3225,7 +3235,7 @@ For example, use 1 hour to have a new file created every hour on the hour.FilterListModel Macro Name - + Macro Adı Filter Name @@ -3233,7 +3243,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Macro Expression - + Makro İfade Filter Expression @@ -3445,7 +3455,7 @@ For example, use 1 hour to have a new file created every hour on the hour.FollowStreamAction %1 Stream - + %1 Akış @@ -3531,18 +3541,18 @@ For example, use 1 hour to have a new file created every hour on the hour. Event %1. - + Etkinlik %1. %Ln <span style="color: %1; background-color:%2">reads</span>, - - + + %Ln <span style="color: %1; background-color:%2">okur</span>, %Ln <span style="color: %1; background-color:%2">writes</span>, - - + + %Ln <span style="color: %1; background-color:%2">yazar</span>, @@ -3579,15 +3589,15 @@ For example, use 1 hour to have a new file created every hour on the hour. Read activity(%6) - + Etkinliği oku(%6) Write activity(%6) - + Etkinlik yaz (%6) Entire I/O activity (%1) - + Tüm G/Ç etkinliği (%1) Entire conversation (%1) @@ -3631,19 +3641,19 @@ For example, use 1 hour to have a new file created every hour on the hour. Show as - Olarak göstermek + Olarak göster No delta times - + Delta zamanları yok Turn delta times - + Delta zamanlarını çevirin All delta times - + Tüm delta süreleri Stream @@ -3666,7 +3676,7 @@ For example, use 1 hour to have a new file created every hour on the hour.FollowStreamText [Stream output truncated] - + [Akış çıkışı kesildi] @@ -3891,23 +3901,23 @@ For example, use 1 hour to have a new file created every hour on the hour.IOConsoleDialog Dialog - + İletişim Enter code - + Kod girin Evaluate - + Değerlendir Clear - Temiz + Temizle Use %1 to evaluate. - + %1 'i değerlendirmek için kullanın. @@ -6943,7 +6953,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Clear - Temiz + diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts index 6f3ed13672..a89648aec9 100644 --- a/ui/qt/wireshark_uk.ts +++ b/ui/qt/wireshark_uk.ts @@ -2137,6 +2137,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream @@ -2973,10 +2981,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Start - - Save - - Default diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 14882193ae..36ee4cb411 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -2148,6 +2148,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Copy packet bytes as Go literal. + + …as C Array + + + + Copy packet bytes as C Array. + + …as a Hex Stream @@ -2984,10 +2992,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Start 开始 - - Save - - Default 默认