diff --git a/AUTHORS b/AUTHORS index 3f477e8475..c4a1367eb0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4197,6 +4197,7 @@ Camille Guerin Car Benjamin Carl Hörberg Carlo Carraro +Carlos Pignataro Carlos Velasco Cathy Yang Cedric Izoard diff --git a/NEWS b/NEWS index d20bb5b957..8eade7fc81 100644 --- a/NEWS +++ b/NEWS @@ -104,6 +104,10 @@ Wireshark 4.3.0 Release Notes • The personal binary plugins folder now has higher priority than the global folder. + • The binary plugins folder path no longer uses an X.Y version + component. Plugins are required to add the ABI version to the + file name. + New Protocol Support EGNOS Message Server (EMS) file format, MAC NR Framed diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index f1a636c88d..4924b4a906 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: 6c6a8186e2c1f12a57976cf15f23522d8b20cfb0 +git revision: a7c135fb67b833be03bfa08c200d1b847450567b */ @@ -15209,6 +15209,526 @@ static const AsterixField **I016[] = { }; DIAG_ON_PEDANTIC +/* Category 017, edition 1.3 */ +static int hf_017_V1_3_000; +static int hf_017_V1_3_000_VALUE; +static const value_string valstr_017_V1_3_000_VALUE[] = { + { 0, "Network information" }, + { 10, "Track data" }, + { 20, "Track data request" }, + { 21, "Track data stop" }, + { 22, "Cancel track data request" }, + { 23, "Track data stop acknowledgement" }, + { 30, "New Node / Change-over Initial or intermediate message segment" }, + { 31, "New Node / Change-over Final or only message segment" }, + { 32, "New Node / Change-over Initial or intermediate message segment reply" }, + { 33, "New Node / Change-over Final or only message segment reply" }, + { 110, "Move node to new cluster state;" }, + { 111, "Move node to new cluster state acknowledgement" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_000_VALUE = { 8, 1.0, FIELD_PART_UINT, &hf_017_V1_3_000_VALUE, NULL }; +static const FieldPart *I017_V1_3_000_PARTS[] = { + &I017_V1_3_000_VALUE, + NULL +}; +static const AsterixField I017_V1_3_000 = { FIXED, 1, 0, 0, &hf_017_V1_3_000, I017_V1_3_000_PARTS, { NULL } }; +static int hf_017_V1_3_010; +static int hf_017_V1_3_010_SAC; +static const FieldPart I017_V1_3_010_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_010_SAC, NULL }; +static int hf_017_V1_3_010_SIC; +static const FieldPart I017_V1_3_010_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_010_SIC, NULL }; +static const FieldPart *I017_V1_3_010_PARTS[] = { + &I017_V1_3_010_SAC, + &I017_V1_3_010_SIC, + NULL +}; +static const AsterixField I017_V1_3_010 = { FIXED, 2, 0, 0, &hf_017_V1_3_010, I017_V1_3_010_PARTS, { NULL } }; +static int hf_017_V1_3_012; +static int hf_017_V1_3_012_SAC; +static const FieldPart I017_V1_3_012_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_012_SAC, NULL }; +static int hf_017_V1_3_012_SIC; +static const FieldPart I017_V1_3_012_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_012_SIC, NULL }; +static const FieldPart *I017_V1_3_012_PARTS[] = { + &I017_V1_3_012_SAC, + &I017_V1_3_012_SIC, + NULL +}; +static const AsterixField I017_V1_3_012 = { FIXED, 2, 0, 0, &hf_017_V1_3_012, I017_V1_3_012_PARTS, { NULL } }; +static int hf_017_V1_3_045; +static int hf_017_V1_3_045_LAT; +static const FieldPart I017_V1_3_045_LAT = { 24, 0.00000536441802978515625, FIELD_PART_FLOAT, &hf_017_V1_3_045_LAT, NULL }; +static int hf_017_V1_3_045_LON; +static const FieldPart I017_V1_3_045_LON = { 24, 0.00000536441802978515625, FIELD_PART_FLOAT, &hf_017_V1_3_045_LON, NULL }; +static const FieldPart *I017_V1_3_045_PARTS[] = { + &I017_V1_3_045_LAT, + &I017_V1_3_045_LON, + NULL +}; +static const AsterixField I017_V1_3_045 = { FIXED, 6, 0, 0, &hf_017_V1_3_045, I017_V1_3_045_PARTS, { NULL } }; +static int hf_017_V1_3_050; +static int hf_017_V1_3_050_V; +static const value_string valstr_017_V1_3_050_V[] = { + { 0, "Code validated" }, + { 1, "Code not validated" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_050_V = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_050_V, NULL }; +static int hf_017_V1_3_050_G; +static const value_string valstr_017_V1_3_050_G[] = { + { 0, "Default" }, + { 1, "Garbled code / Error correction applied" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_050_G = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_050_G, NULL }; +static int hf_017_V1_3_050_ALT; +static const FieldPart I017_V1_3_050_ALT = { 14, 0.25, FIELD_PART_UFLOAT, &hf_017_V1_3_050_ALT, NULL }; +static const FieldPart *I017_V1_3_050_PARTS[] = { + &I017_V1_3_050_V, + &I017_V1_3_050_G, + &I017_V1_3_050_ALT, + NULL +}; +static const AsterixField I017_V1_3_050 = { FIXED, 2, 0, 0, &hf_017_V1_3_050, I017_V1_3_050_PARTS, { NULL } }; +static int hf_017_V1_3_070; +static int hf_017_V1_3_070_V; +static const value_string valstr_017_V1_3_070_V[] = { + { 0, "Code validated" }, + { 1, "Code not validated" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_070_V = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_070_V, NULL }; +static int hf_017_V1_3_070_G; +static const value_string valstr_017_V1_3_070_G[] = { + { 0, "Default" }, + { 1, "Garbled code" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_070_G = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_070_G, NULL }; +static int hf_017_V1_3_070_L; +static const value_string valstr_017_V1_3_070_L[] = { + { 0, "Mode-3/A code derived from the reply of the transponder" }, + { 1, "Smoothed Mode-3/A code not extracted during the last scan" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_070_L = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_070_L, NULL }; +static int hf_017_V1_3_070_MODE3A; +static const FieldPart I017_V1_3_070_MODE3A = { 12, 1.0, FIELD_PART_SQUAWK, &hf_017_V1_3_070_MODE3A, NULL }; +static const FieldPart *I017_V1_3_070_PARTS[] = { + &I017_V1_3_070_V, + &I017_V1_3_070_G, + &I017_V1_3_070_L, + &IXXX_1bit_spare, + &I017_V1_3_070_MODE3A, + NULL +}; +static const AsterixField I017_V1_3_070 = { FIXED, 2, 0, 0, &hf_017_V1_3_070, I017_V1_3_070_PARTS, { NULL } }; +static int hf_017_V1_3_140; +static int hf_017_V1_3_140_VALUE; +static const FieldPart I017_V1_3_140_VALUE = { 24, 0.0078125, FIELD_PART_UFLOAT, &hf_017_V1_3_140_VALUE, NULL }; +static const FieldPart *I017_V1_3_140_PARTS[] = { + &I017_V1_3_140_VALUE, + NULL +}; +static const AsterixField I017_V1_3_140 = { FIXED, 3, 0, 0, &hf_017_V1_3_140, I017_V1_3_140_PARTS, { NULL } }; +static int hf_017_V1_3_200; +static int hf_017_V1_3_200_GSP; +static const FieldPart I017_V1_3_200_GSP = { 16, 0.00006103515625, FIELD_PART_UFLOAT, &hf_017_V1_3_200_GSP, NULL }; +static int hf_017_V1_3_200_HDG; +static const FieldPart I017_V1_3_200_HDG = { 16, 0.0054931640625, FIELD_PART_UFLOAT, &hf_017_V1_3_200_HDG, NULL }; +static const FieldPart *I017_V1_3_200_PARTS[] = { + &I017_V1_3_200_GSP, + &I017_V1_3_200_HDG, + NULL +}; +static const AsterixField I017_V1_3_200 = { FIXED, 4, 0, 0, &hf_017_V1_3_200, I017_V1_3_200_PARTS, { NULL } }; +static int hf_017_V1_3_210; +static int hf_017_V1_3_210_VALUE; +static const FieldPart I017_V1_3_210_VALUE = { 24, 1.0, FIELD_PART_HEX, &hf_017_V1_3_210_VALUE, NULL }; +static const FieldPart *I017_V1_3_210_PARTS[] = { + &I017_V1_3_210_VALUE, + NULL +}; +static const AsterixField I017_V1_3_210 = { REPETITIVE, 3, 1, 0, &hf_017_V1_3_210, I017_V1_3_210_PARTS, { NULL } }; +static int hf_017_V1_3_220; +static int hf_017_V1_3_220_VALUE; +static const FieldPart I017_V1_3_220_VALUE = { 24, 1.0, FIELD_PART_HEX, &hf_017_V1_3_220_VALUE, NULL }; +static const FieldPart *I017_V1_3_220_PARTS[] = { + &I017_V1_3_220_VALUE, + NULL +}; +static const AsterixField I017_V1_3_220 = { FIXED, 3, 0, 0, &hf_017_V1_3_220, I017_V1_3_220_PARTS, { NULL } }; +static int hf_017_V1_3_221; +static int hf_017_V1_3_221_VALUE; +static const FieldPart I017_V1_3_221_VALUE = { 16, 1.0, FIELD_PART_HEX, &hf_017_V1_3_221_VALUE, NULL }; +static const FieldPart *I017_V1_3_221_PARTS[] = { + &I017_V1_3_221_VALUE, + NULL +}; +static const AsterixField I017_V1_3_221 = { FIXED, 2, 0, 0, &hf_017_V1_3_221, I017_V1_3_221_PARTS, { NULL } }; +static int hf_017_V1_3_230; +static int hf_017_V1_3_230_CA; +static const value_string valstr_017_V1_3_230_CA[] = { + { 0, "No communications capability (surveillance only), no ability to set CA code 7 either airborne or on the ground" }, + { 1, "Reserved" }, + { 2, "Reserved" }, + { 3, "Reserved" }, + { 4, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and on the ground" }, + { 5, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and airborne" }, + { 6, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and either airborne or on the ground" }, + { 7, "Signifies the DR field is not equal to 0 or the FS field equals 2, 3, 4 or 5 and either airborne or on the ground SI/II-capabilities of the Transponder" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_230_CA = { 3, 1.0, FIELD_PART_UINT, &hf_017_V1_3_230_CA, NULL }; +static int hf_017_V1_3_230_SI; +static const value_string valstr_017_V1_3_230_SI[] = { + { 0, "Transponder SI capable" }, + { 1, "Transponder not SI capable" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_230_SI = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_230_SI, NULL }; +static const FieldPart *I017_V1_3_230_PARTS[] = { + &I017_V1_3_230_CA, + &I017_V1_3_230_SI, + &IXXX_4bit_spare, + NULL +}; +static const AsterixField I017_V1_3_230 = { FIXED, 1, 0, 0, &hf_017_V1_3_230, I017_V1_3_230_PARTS, { NULL } }; +static int hf_017_V1_3_240; +static int hf_017_V1_3_240_CST; +static const value_string valstr_017_V1_3_240_CST[] = { + { 0, "Measured position" }, + { 1, "No measured position (coasted)" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_240_CST = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_240_CST, NULL }; +static int hf_017_V1_3_240_FLT; +static const value_string valstr_017_V1_3_240_FLT[] = { + { 0, "Last Measured Flight Level" }, + { 1, "Predicted Flight Level" }, + { 0, NULL } +}; +static const FieldPart I017_V1_3_240_FLT = { 1, 1.0, FIELD_PART_UINT, &hf_017_V1_3_240_FLT, NULL }; +static const FieldPart *I017_V1_3_240_PARTS[] = { + &I017_V1_3_240_CST, + &I017_V1_3_240_FLT, + &IXXX_6bit_spare, + NULL +}; +static const AsterixField I017_V1_3_240 = { FIXED, 1, 0, 0, &hf_017_V1_3_240, I017_V1_3_240_PARTS, { NULL } }; +static int hf_017_V1_3_350; +static int hf_017_V1_3_350_SAC; +static const FieldPart I017_V1_3_350_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_350_SAC, NULL }; +static int hf_017_V1_3_350_SIC; +static const FieldPart I017_V1_3_350_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_350_SIC, NULL }; +static const FieldPart *I017_V1_3_350_PARTS[] = { + &I017_V1_3_350_SAC, + &I017_V1_3_350_SIC, + NULL +}; +static const AsterixField I017_V1_3_350 = { REPETITIVE, 2, 1, 0, &hf_017_V1_3_350, I017_V1_3_350_PARTS, { NULL } }; +static int hf_017_V1_3_360; +static int hf_017_V1_3_360_VALUE; +static const FieldPart I017_V1_3_360_VALUE = { 8, 1.0, FIELD_PART_HEX, &hf_017_V1_3_360_VALUE, NULL }; +static const FieldPart *I017_V1_3_360_PARTS[] = { + &I017_V1_3_360_VALUE, + NULL +}; +static const AsterixField I017_V1_3_360 = { FIXED, 1, 0, 0, &hf_017_V1_3_360, I017_V1_3_360_PARTS, { NULL } }; +static int hf_017_V1_3_SP; +static const AsterixField I017_V1_3_SP = { EXP, 0, 0, 1, &hf_017_V1_3_SP, NULL, { NULL } }; + +/* Category 017, edition 1.3 (latest) */ +static int hf_017_000; +static int hf_017_000_VALUE; +static const value_string valstr_017_000_VALUE[] = { + { 0, "Network information" }, + { 10, "Track data" }, + { 20, "Track data request" }, + { 21, "Track data stop" }, + { 22, "Cancel track data request" }, + { 23, "Track data stop acknowledgement" }, + { 30, "New Node / Change-over Initial or intermediate message segment" }, + { 31, "New Node / Change-over Final or only message segment" }, + { 32, "New Node / Change-over Initial or intermediate message segment reply" }, + { 33, "New Node / Change-over Final or only message segment reply" }, + { 110, "Move node to new cluster state;" }, + { 111, "Move node to new cluster state acknowledgement" }, + { 0, NULL } +}; +static const FieldPart I017_000_VALUE = { 8, 1.0, FIELD_PART_UINT, &hf_017_000_VALUE, NULL }; +static const FieldPart *I017_000_PARTS[] = { + &I017_000_VALUE, + NULL +}; +static const AsterixField I017_000 = { FIXED, 1, 0, 0, &hf_017_000, I017_000_PARTS, { NULL } }; +static int hf_017_010; +static int hf_017_010_SAC; +static const FieldPart I017_010_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_010_SAC, NULL }; +static int hf_017_010_SIC; +static const FieldPart I017_010_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_010_SIC, NULL }; +static const FieldPart *I017_010_PARTS[] = { + &I017_010_SAC, + &I017_010_SIC, + NULL +}; +static const AsterixField I017_010 = { FIXED, 2, 0, 0, &hf_017_010, I017_010_PARTS, { NULL } }; +static int hf_017_012; +static int hf_017_012_SAC; +static const FieldPart I017_012_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_012_SAC, NULL }; +static int hf_017_012_SIC; +static const FieldPart I017_012_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_012_SIC, NULL }; +static const FieldPart *I017_012_PARTS[] = { + &I017_012_SAC, + &I017_012_SIC, + NULL +}; +static const AsterixField I017_012 = { FIXED, 2, 0, 0, &hf_017_012, I017_012_PARTS, { NULL } }; +static int hf_017_045; +static int hf_017_045_LAT; +static const FieldPart I017_045_LAT = { 24, 0.00000536441802978515625, FIELD_PART_FLOAT, &hf_017_045_LAT, NULL }; +static int hf_017_045_LON; +static const FieldPart I017_045_LON = { 24, 0.00000536441802978515625, FIELD_PART_FLOAT, &hf_017_045_LON, NULL }; +static const FieldPart *I017_045_PARTS[] = { + &I017_045_LAT, + &I017_045_LON, + NULL +}; +static const AsterixField I017_045 = { FIXED, 6, 0, 0, &hf_017_045, I017_045_PARTS, { NULL } }; +static int hf_017_050; +static int hf_017_050_V; +static const value_string valstr_017_050_V[] = { + { 0, "Code validated" }, + { 1, "Code not validated" }, + { 0, NULL } +}; +static const FieldPart I017_050_V = { 1, 1.0, FIELD_PART_UINT, &hf_017_050_V, NULL }; +static int hf_017_050_G; +static const value_string valstr_017_050_G[] = { + { 0, "Default" }, + { 1, "Garbled code / Error correction applied" }, + { 0, NULL } +}; +static const FieldPart I017_050_G = { 1, 1.0, FIELD_PART_UINT, &hf_017_050_G, NULL }; +static int hf_017_050_ALT; +static const FieldPart I017_050_ALT = { 14, 0.25, FIELD_PART_UFLOAT, &hf_017_050_ALT, NULL }; +static const FieldPart *I017_050_PARTS[] = { + &I017_050_V, + &I017_050_G, + &I017_050_ALT, + NULL +}; +static const AsterixField I017_050 = { FIXED, 2, 0, 0, &hf_017_050, I017_050_PARTS, { NULL } }; +static int hf_017_070; +static int hf_017_070_V; +static const value_string valstr_017_070_V[] = { + { 0, "Code validated" }, + { 1, "Code not validated" }, + { 0, NULL } +}; +static const FieldPart I017_070_V = { 1, 1.0, FIELD_PART_UINT, &hf_017_070_V, NULL }; +static int hf_017_070_G; +static const value_string valstr_017_070_G[] = { + { 0, "Default" }, + { 1, "Garbled code" }, + { 0, NULL } +}; +static const FieldPart I017_070_G = { 1, 1.0, FIELD_PART_UINT, &hf_017_070_G, NULL }; +static int hf_017_070_L; +static const value_string valstr_017_070_L[] = { + { 0, "Mode-3/A code derived from the reply of the transponder" }, + { 1, "Smoothed Mode-3/A code not extracted during the last scan" }, + { 0, NULL } +}; +static const FieldPart I017_070_L = { 1, 1.0, FIELD_PART_UINT, &hf_017_070_L, NULL }; +static int hf_017_070_MODE3A; +static const FieldPart I017_070_MODE3A = { 12, 1.0, FIELD_PART_SQUAWK, &hf_017_070_MODE3A, NULL }; +static const FieldPart *I017_070_PARTS[] = { + &I017_070_V, + &I017_070_G, + &I017_070_L, + &IXXX_1bit_spare, + &I017_070_MODE3A, + NULL +}; +static const AsterixField I017_070 = { FIXED, 2, 0, 0, &hf_017_070, I017_070_PARTS, { NULL } }; +static int hf_017_140; +static int hf_017_140_VALUE; +static const FieldPart I017_140_VALUE = { 24, 0.0078125, FIELD_PART_UFLOAT, &hf_017_140_VALUE, NULL }; +static const FieldPart *I017_140_PARTS[] = { + &I017_140_VALUE, + NULL +}; +static const AsterixField I017_140 = { FIXED, 3, 0, 0, &hf_017_140, I017_140_PARTS, { NULL } }; +static int hf_017_200; +static int hf_017_200_GSP; +static const FieldPart I017_200_GSP = { 16, 0.00006103515625, FIELD_PART_UFLOAT, &hf_017_200_GSP, NULL }; +static int hf_017_200_HDG; +static const FieldPart I017_200_HDG = { 16, 0.0054931640625, FIELD_PART_UFLOAT, &hf_017_200_HDG, NULL }; +static const FieldPart *I017_200_PARTS[] = { + &I017_200_GSP, + &I017_200_HDG, + NULL +}; +static const AsterixField I017_200 = { FIXED, 4, 0, 0, &hf_017_200, I017_200_PARTS, { NULL } }; +static int hf_017_210; +static int hf_017_210_VALUE; +static const FieldPart I017_210_VALUE = { 24, 1.0, FIELD_PART_HEX, &hf_017_210_VALUE, NULL }; +static const FieldPart *I017_210_PARTS[] = { + &I017_210_VALUE, + NULL +}; +static const AsterixField I017_210 = { REPETITIVE, 3, 1, 0, &hf_017_210, I017_210_PARTS, { NULL } }; +static int hf_017_220; +static int hf_017_220_VALUE; +static const FieldPart I017_220_VALUE = { 24, 1.0, FIELD_PART_HEX, &hf_017_220_VALUE, NULL }; +static const FieldPart *I017_220_PARTS[] = { + &I017_220_VALUE, + NULL +}; +static const AsterixField I017_220 = { FIXED, 3, 0, 0, &hf_017_220, I017_220_PARTS, { NULL } }; +static int hf_017_221; +static int hf_017_221_VALUE; +static const FieldPart I017_221_VALUE = { 16, 1.0, FIELD_PART_HEX, &hf_017_221_VALUE, NULL }; +static const FieldPart *I017_221_PARTS[] = { + &I017_221_VALUE, + NULL +}; +static const AsterixField I017_221 = { FIXED, 2, 0, 0, &hf_017_221, I017_221_PARTS, { NULL } }; +static int hf_017_230; +static int hf_017_230_CA; +static const value_string valstr_017_230_CA[] = { + { 0, "No communications capability (surveillance only), no ability to set CA code 7 either airborne or on the ground" }, + { 1, "Reserved" }, + { 2, "Reserved" }, + { 3, "Reserved" }, + { 4, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and on the ground" }, + { 5, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and airborne" }, + { 6, "At Least Comm. A and Comm. B capability and the ability to set CA code 7 and either airborne or on the ground" }, + { 7, "Signifies the DR field is not equal to 0 or the FS field equals 2, 3, 4 or 5 and either airborne or on the ground SI/II-capabilities of the Transponder" }, + { 0, NULL } +}; +static const FieldPart I017_230_CA = { 3, 1.0, FIELD_PART_UINT, &hf_017_230_CA, NULL }; +static int hf_017_230_SI; +static const value_string valstr_017_230_SI[] = { + { 0, "Transponder SI capable" }, + { 1, "Transponder not SI capable" }, + { 0, NULL } +}; +static const FieldPart I017_230_SI = { 1, 1.0, FIELD_PART_UINT, &hf_017_230_SI, NULL }; +static const FieldPart *I017_230_PARTS[] = { + &I017_230_CA, + &I017_230_SI, + &IXXX_4bit_spare, + NULL +}; +static const AsterixField I017_230 = { FIXED, 1, 0, 0, &hf_017_230, I017_230_PARTS, { NULL } }; +static int hf_017_240; +static int hf_017_240_CST; +static const value_string valstr_017_240_CST[] = { + { 0, "Measured position" }, + { 1, "No measured position (coasted)" }, + { 0, NULL } +}; +static const FieldPart I017_240_CST = { 1, 1.0, FIELD_PART_UINT, &hf_017_240_CST, NULL }; +static int hf_017_240_FLT; +static const value_string valstr_017_240_FLT[] = { + { 0, "Last Measured Flight Level" }, + { 1, "Predicted Flight Level" }, + { 0, NULL } +}; +static const FieldPart I017_240_FLT = { 1, 1.0, FIELD_PART_UINT, &hf_017_240_FLT, NULL }; +static const FieldPart *I017_240_PARTS[] = { + &I017_240_CST, + &I017_240_FLT, + &IXXX_6bit_spare, + NULL +}; +static const AsterixField I017_240 = { FIXED, 1, 0, 0, &hf_017_240, I017_240_PARTS, { NULL } }; +static int hf_017_350; +static int hf_017_350_SAC; +static const FieldPart I017_350_SAC = { 8, 1.0, FIELD_PART_HEX, &hf_017_350_SAC, NULL }; +static int hf_017_350_SIC; +static const FieldPart I017_350_SIC = { 8, 1.0, FIELD_PART_HEX, &hf_017_350_SIC, NULL }; +static const FieldPart *I017_350_PARTS[] = { + &I017_350_SAC, + &I017_350_SIC, + NULL +}; +static const AsterixField I017_350 = { REPETITIVE, 2, 1, 0, &hf_017_350, I017_350_PARTS, { NULL } }; +static int hf_017_360; +static int hf_017_360_VALUE; +static const FieldPart I017_360_VALUE = { 8, 1.0, FIELD_PART_HEX, &hf_017_360_VALUE, NULL }; +static const FieldPart *I017_360_PARTS[] = { + &I017_360_VALUE, + NULL +}; +static const AsterixField I017_360 = { FIXED, 1, 0, 0, &hf_017_360, I017_360_PARTS, { NULL } }; +static int hf_017_SP; +static const AsterixField I017_SP = { EXP, 0, 0, 1, &hf_017_SP, NULL, { NULL } }; + +DIAG_OFF_PEDANTIC +static const AsterixField *I017_V1_3_uap[] = { + &I017_V1_3_010, + &I017_V1_3_012, + &I017_V1_3_000, + &I017_V1_3_350, + &I017_V1_3_220, + &I017_V1_3_221, + &I017_V1_3_140, + &I017_V1_3_045, + &I017_V1_3_070, + &I017_V1_3_050, + &I017_V1_3_200, + &I017_V1_3_230, + &I017_V1_3_240, + &I017_V1_3_210, + &I017_V1_3_360, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &I017_V1_3_SP, + NULL +}; +static const AsterixField **I017_V1_3[] = { + I017_V1_3_uap, + NULL +}; +DIAG_ON_PEDANTIC + +DIAG_OFF_PEDANTIC +static const AsterixField *I017_uap[] = { + &I017_010, + &I017_012, + &I017_000, + &I017_350, + &I017_220, + &I017_221, + &I017_140, + &I017_045, + &I017_070, + &I017_050, + &I017_200, + &I017_230, + &I017_240, + &I017_210, + &I017_360, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &IX_SPARE, + &I017_SP, + NULL +}; +static const AsterixField **I017[] = { + I017_uap, + NULL +}; +DIAG_ON_PEDANTIC + /* Category 018, edition 1.7 */ static int hf_018_V1_7_000; static int hf_018_V1_7_000_VALUE; @@ -54420,6 +54940,16 @@ static const enum_val_t I016_versions[] = { { NULL, NULL, 0 } }; +DIAG_OFF_PEDANTIC +static const AsterixField ***I017all[] = { I017, I017_V1_3 }; +DIAG_ON_PEDANTIC + +static const enum_val_t I017_versions[] = { + { "I017", "Version 1.3 (latest)", 0 }, + { "I017_v1_3", "Version 1.3", 1 }, + { NULL, NULL, 0 } +}; + DIAG_OFF_PEDANTIC static const AsterixField ***I018all[] = { I018, I018_V1_7 }; DIAG_ON_PEDANTIC @@ -54610,7 +55140,7 @@ static const AsterixField ****categories[] = { NULL, /* 014 */ I015all, /* 015 */ I016all, /* 016 */ - NULL, /* 017 */ + I017all, /* 017 */ I018all, /* 018 */ I019all, /* 019 */ I020all, /* 020 */ @@ -58163,6 +58693,92 @@ void proto_register_asterix (void) { &hf_016_420_LON, { "LON, Longitude, [°]", "asterix.016_420_LON", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_016_420_ALT, { "ALT, Altitude, [m]", "asterix.016_420_ALT", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_016_SP, { "SP, Special Purpose Field", "asterix.016_SP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_000, { "000, Message Type", "asterix.017_V1_3_000", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_000_VALUE, { "Message Type", "asterix.017_V1_3_000_VALUE", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_000_VALUE), 0x00, NULL, HFILL } }, + { &hf_017_V1_3_010, { "010, Data Source Identifier", "asterix.017_V1_3_010", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_010_SAC, { "SAC, System Area Code", "asterix.017_V1_3_010_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_010_SIC, { "SIC, System Identification Code", "asterix.017_V1_3_010_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_012, { "012, Data Destination Identifier", "asterix.017_V1_3_012", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_012_SAC, { "SAC, System Area Code", "asterix.017_V1_3_012_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_012_SIC, { "SIC, System Identification Code", "asterix.017_V1_3_012_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_045, { "045, Calculated Position in WGS-84 Coordinates", "asterix.017_V1_3_045", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_045_LAT, { "LAT, Latitude, [°]", "asterix.017_V1_3_045_LAT", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_045_LON, { "LON, Longitude, [°]", "asterix.017_V1_3_045_LON", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_050, { "050, Flight Level in Binary Representation", "asterix.017_V1_3_050", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_050_V, { "V", "asterix.017_V1_3_050_V", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_050_V), 0x80, NULL, HFILL } }, + { &hf_017_V1_3_050_G, { "G", "asterix.017_V1_3_050_G", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_050_G), 0x40, NULL, HFILL } }, + { &hf_017_V1_3_050_ALT, { "ALT, Altitude, [FL]", "asterix.017_V1_3_050_ALT", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_070, { "070, Mode 3/A Code in Octal Representation", "asterix.017_V1_3_070", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_070_V, { "V", "asterix.017_V1_3_070_V", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_070_V), 0x80, NULL, HFILL } }, + { &hf_017_V1_3_070_G, { "G", "asterix.017_V1_3_070_G", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_070_G), 0x40, NULL, HFILL } }, + { &hf_017_V1_3_070_L, { "L", "asterix.017_V1_3_070_L", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_070_L), 0x20, NULL, HFILL } }, + { &hf_017_V1_3_070_MODE3A, { "MODE3A, Mode 3/A Reply in Octal Representation", "asterix.017_V1_3_070_MODE3A", FT_UINT16, BASE_OCT, NULL, 0x0fff, NULL, HFILL } }, + { &hf_017_V1_3_140, { "140, Time of Day", "asterix.017_V1_3_140", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_140_VALUE, { "Time of Day, [s]", "asterix.017_V1_3_140_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_200, { "200, Track Velocity in Polar Co-ordinates", "asterix.017_V1_3_200", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_200_GSP, { "GSP, Calculated Groundspeed, [NM/s]", "asterix.017_V1_3_200_GSP", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_200_HDG, { "HDG, Calculated Heading, [°]", "asterix.017_V1_3_200_HDG", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_210, { "210, Mode S Address List", "asterix.017_V1_3_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_210_VALUE, { "Mode S Address List", "asterix.017_V1_3_210_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_220, { "220, Aircraft Address", "asterix.017_V1_3_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_220_VALUE, { "Aircraft Address", "asterix.017_V1_3_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_221, { "221, Duplicate Address Reference Number (DRN)", "asterix.017_V1_3_221", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_221_VALUE, { "Duplicate Address Reference Number (DRN)", "asterix.017_V1_3_221_VALUE", FT_UINT16, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_230, { "230, Transponder Capability", "asterix.017_V1_3_230", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_230_CA, { "CA, Communications Capability of the Transponder", "asterix.017_V1_3_230_CA", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_230_CA), 0xe0, NULL, HFILL } }, + { &hf_017_V1_3_230_SI, { "SI, SI/II-capabilities of the Transponder", "asterix.017_V1_3_230_SI", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_230_SI), 0x10, NULL, HFILL } }, + { &hf_017_V1_3_240, { "240, Track Status", "asterix.017_V1_3_240", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_240_CST, { "CST, Track Coasted", "asterix.017_V1_3_240_CST", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_240_CST), 0x80, NULL, HFILL } }, + { &hf_017_V1_3_240_FLT, { "FLT, Flight Level Tracking", "asterix.017_V1_3_240_FLT", FT_UINT8, BASE_DEC, VALS (valstr_017_V1_3_240_FLT), 0x40, NULL, HFILL } }, + { &hf_017_V1_3_350, { "350, Cluster Station/Node List", "asterix.017_V1_3_350", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_350_SAC, { "SAC, System Area Code", "asterix.017_V1_3_350_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_350_SIC, { "SIC, System Identification Code", "asterix.017_V1_3_350_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_360, { "360, Cluster Controller Command State", "asterix.017_V1_3_360", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_360_VALUE, { "Cluster Controller Command State", "asterix.017_V1_3_360_VALUE", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_V1_3_SP, { "SP, Special Purpose Field", "asterix.017_V1_3_SP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_000, { "000, Message Type", "asterix.017_000", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_000_VALUE, { "Message Type", "asterix.017_000_VALUE", FT_UINT8, BASE_DEC, VALS (valstr_017_000_VALUE), 0x00, NULL, HFILL } }, + { &hf_017_010, { "010, Data Source Identifier", "asterix.017_010", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_010_SAC, { "SAC, System Area Code", "asterix.017_010_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_010_SIC, { "SIC, System Identification Code", "asterix.017_010_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_012, { "012, Data Destination Identifier", "asterix.017_012", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_012_SAC, { "SAC, System Area Code", "asterix.017_012_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_012_SIC, { "SIC, System Identification Code", "asterix.017_012_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_045, { "045, Calculated Position in WGS-84 Coordinates", "asterix.017_045", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_045_LAT, { "LAT, Latitude, [°]", "asterix.017_045_LAT", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_045_LON, { "LON, Longitude, [°]", "asterix.017_045_LON", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_050, { "050, Flight Level in Binary Representation", "asterix.017_050", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_050_V, { "V", "asterix.017_050_V", FT_UINT8, BASE_DEC, VALS (valstr_017_050_V), 0x80, NULL, HFILL } }, + { &hf_017_050_G, { "G", "asterix.017_050_G", FT_UINT8, BASE_DEC, VALS (valstr_017_050_G), 0x40, NULL, HFILL } }, + { &hf_017_050_ALT, { "ALT, Altitude, [FL]", "asterix.017_050_ALT", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_070, { "070, Mode 3/A Code in Octal Representation", "asterix.017_070", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_070_V, { "V", "asterix.017_070_V", FT_UINT8, BASE_DEC, VALS (valstr_017_070_V), 0x80, NULL, HFILL } }, + { &hf_017_070_G, { "G", "asterix.017_070_G", FT_UINT8, BASE_DEC, VALS (valstr_017_070_G), 0x40, NULL, HFILL } }, + { &hf_017_070_L, { "L", "asterix.017_070_L", FT_UINT8, BASE_DEC, VALS (valstr_017_070_L), 0x20, NULL, HFILL } }, + { &hf_017_070_MODE3A, { "MODE3A, Mode 3/A Reply in Octal Representation", "asterix.017_070_MODE3A", FT_UINT16, BASE_OCT, NULL, 0x0fff, NULL, HFILL } }, + { &hf_017_140, { "140, Time of Day", "asterix.017_140", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_140_VALUE, { "Time of Day, [s]", "asterix.017_140_VALUE", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_200, { "200, Track Velocity in Polar Co-ordinates", "asterix.017_200", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_200_GSP, { "GSP, Calculated Groundspeed, [NM/s]", "asterix.017_200_GSP", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_200_HDG, { "HDG, Calculated Heading, [°]", "asterix.017_200_HDG", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_210, { "210, Mode S Address List", "asterix.017_210", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_210_VALUE, { "Mode S Address List", "asterix.017_210_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_220, { "220, Aircraft Address", "asterix.017_220", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_220_VALUE, { "Aircraft Address", "asterix.017_220_VALUE", FT_UINT24, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_221, { "221, Duplicate Address Reference Number (DRN)", "asterix.017_221", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_221_VALUE, { "Duplicate Address Reference Number (DRN)", "asterix.017_221_VALUE", FT_UINT16, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_230, { "230, Transponder Capability", "asterix.017_230", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_230_CA, { "CA, Communications Capability of the Transponder", "asterix.017_230_CA", FT_UINT8, BASE_DEC, VALS (valstr_017_230_CA), 0xe0, NULL, HFILL } }, + { &hf_017_230_SI, { "SI, SI/II-capabilities of the Transponder", "asterix.017_230_SI", FT_UINT8, BASE_DEC, VALS (valstr_017_230_SI), 0x10, NULL, HFILL } }, + { &hf_017_240, { "240, Track Status", "asterix.017_240", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_240_CST, { "CST, Track Coasted", "asterix.017_240_CST", FT_UINT8, BASE_DEC, VALS (valstr_017_240_CST), 0x80, NULL, HFILL } }, + { &hf_017_240_FLT, { "FLT, Flight Level Tracking", "asterix.017_240_FLT", FT_UINT8, BASE_DEC, VALS (valstr_017_240_FLT), 0x40, NULL, HFILL } }, + { &hf_017_350, { "350, Cluster Station/Node List", "asterix.017_350", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_350_SAC, { "SAC, System Area Code", "asterix.017_350_SAC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_350_SIC, { "SIC, System Identification Code", "asterix.017_350_SIC", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_360, { "360, Cluster Controller Command State", "asterix.017_360", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_017_360_VALUE, { "Cluster Controller Command State", "asterix.017_360_VALUE", FT_UINT8, BASE_HEX_DEC, NULL, 0x00, NULL, HFILL } }, + { &hf_017_SP, { "SP, Special Purpose Field", "asterix.017_SP", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_018_V1_7_000, { "000, Message Type", "asterix.018_V1_7_000", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_018_V1_7_000_VALUE, { "Message Type", "asterix.018_V1_7_000_VALUE", FT_UINT8, BASE_DEC, VALS (valstr_018_V1_7_000_VALUE), 0x00, NULL, HFILL } }, { &hf_018_V1_7_001, { "001, Result", "asterix.018_V1_7_001", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -64509,6 +65125,7 @@ void proto_register_asterix (void) prefs_register_enum_preference (asterix_prefs_module, "i011_version", "I011 version", "Select the CAT011 version", &global_categories_version[11], I011_versions, false); prefs_register_enum_preference (asterix_prefs_module, "i015_version", "I015 version", "Select the CAT015 version", &global_categories_version[15], I015_versions, false); prefs_register_enum_preference (asterix_prefs_module, "i016_version", "I016 version", "Select the CAT016 version", &global_categories_version[16], I016_versions, false); + prefs_register_enum_preference (asterix_prefs_module, "i017_version", "I017 version", "Select the CAT017 version", &global_categories_version[17], I017_versions, false); prefs_register_enum_preference (asterix_prefs_module, "i018_version", "I018 version", "Select the CAT018 version", &global_categories_version[18], I018_versions, false); prefs_register_enum_preference (asterix_prefs_module, "i019_version", "I019 version", "Select the CAT019 version", &global_categories_version[19], I019_versions, false); prefs_register_enum_preference (asterix_prefs_module, "i020_version", "I020 version", "Select the CAT020 version", &global_categories_version[20], I020_versions, false); diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 9bbfa799d8..0c2283f418 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -10727,6 +10727,8 @@ static const value_string usb_products_vals[] = { { 0x054c0d01, "Sony NW-ZX500" }, { 0x054c0d0f, "Sony Alpha-A6600" }, { 0x054c0d10, "Sony Alpha-A6600" }, + { 0x054c0d13, "Sony Alpha-A6100" }, + { 0x054c0d14, "Sony Alpha-A6100" }, { 0x054c0d17, "Sony DSC-A7S III" }, { 0x054c0d18, "Sony DSC-A7S III" }, { 0x054c0d1c, "Sony ILCE-1" }, diff --git a/epan/enterprises.c b/epan/enterprises.c index 3a4057c07c..7993b35425 100644 --- a/epan/enterprises.c +++ b/epan/enterprises.c @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -/* (last updated 2023-12-08) */ +/* (last updated 2023-12-16) */ #include "config.h" @@ -19,12 +19,12 @@ typedef struct { uint32_t max_idx; - const char* values[61267]; + const char* values[61296]; } global_enterprises_table_t; static global_enterprises_table_t table = { - 61266, + 61295, { "Reserved", // 0 "NxNetworks", // 1 @@ -33728,7 +33728,7 @@ static global_enterprises_table_t table = "TAG Video Systems", // 33699 "Saginaw Valley State University", // 33700 "Cathay Pacific Airways Ltd.", // 33701 - "Technalogix Ltd.", // 33702 + "Technalogix", // 33702 "ziggurat29", // 33703 "Middle Office Solutions, LLC", // 33704 "Global 360 Inc", // 33705 @@ -44029,7 +44029,7 @@ static global_enterprises_table_t table = "PointSecure Technologies Inc", // 44000 "Shenzhen Envicool Technology Co., Ltd.", // 44001 "Gridwiz, Inc.", // 44002 - "AutoGrid Systems", // 44003 + "AutoGrid Systems, Inc.", // 44003 "BYKING INC.", // 44004 "Wadi Chadli", // 44005 "Xunlei Networking Technologies,Ltd.", // 44006 @@ -53455,7 +53455,7 @@ static global_enterprises_table_t table = "Vacus Tech Pvt Ltd", // 53426 "GB Logging AB", // 53427 "Invigo Offshore SAL", // 53428 - "Digital 14 L.L.C", // 53429 + "Digital 14 Oy", // 53429 "AUTAJON Group", // 53430 "Lookman Electroplast Industries Limited", // 53431 "Fondation des Apprentis d'Auteuil", // 53432 @@ -61292,7 +61292,36 @@ static global_enterprises_table_t table = "Stonefield Systems (Europe) Ltd", // 61263 "Police nationale", // 61264 "Prime Alliance Aisbl", // 61265 - "Byron Center Public Schools" // 61266 + "Byron Center Public Schools", // 61266 + "Layer18.com, Inc", // 61267 + "NajamTech", // 61268 + "RELIANOID", // 61269 + "Hoehn Motors", // 61270 + "Irdeto USA, Inc.", // 61271 + "Ringer Mobile", // 61272 + "tablezip", // 61273 + "CominTech, LLC", // 61274 + "CoreTech", // 61275 + "Cordes & Graefe KG", // 61276 + "RazorSecure", // 61277 + "Fresenius Medical Care AG", // 61278 + "Cinring Networks", // 61279 + "BEIJING SIFANG AUTOMATION CO.,LTD", // 61280 + "Shenzhen Cyclone Technology Co., Ltd.", // 61281 + "ILYA BELOSTOTSKIY", // 61282 + "ZINWELL CORPORATION", // 61283 + "Whitewater Express", // 61284 + "ShenzhenTuSan technology Co., LTD", // 61285 + "New Look Retailers Ltd", // 61286 + "Satya aditya Varma", // 61287 + "Shuangyili (Ningbo) Battery Co., Ltd", // 61288 + "Beijing Cybercore Technology Co.,Ltd.", // 61289 + "DYNADVANCE S.R.L.", // 61290 + "Ministery Of Defense Saudi Arabia", // 61291 + "CES Corporation", // 61292 + "Mario Vernon", // 61293 + "Azbil Corporation", // 61294 + "Submer Technologies SL." // 61295 } }; diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 93723efade..20890d51ce 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -6029,10 +6029,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe LteMacStatisticsDialog - - LTE Mac Statistics - LTE Mac Statistiken - LTE/NR Mac Statistics @@ -6338,10 +6334,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Sequence Number Sequenznummer - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLC Graph (UE=%1 Kanal=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6401,10 +6393,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC Statistiken - LTE/NR RLC Statistics @@ -8599,13 +8587,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Öffnen… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14473,10 +14454,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14782,7 +14759,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14795,16 +14776,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index b0c89aab15..6de837b059 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -14588,7 +14588,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14601,18 +14605,10 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - Error removing the old plugin file from the personal plugin folder. - - Failed to copy the file to the destination: %1 diff --git a/ui/qt/wireshark_es.ts b/ui/qt/wireshark_es.ts index 4f6e606617..3e6701cdaa 100644 --- a/ui/qt/wireshark_es.ts +++ b/ui/qt/wireshark_es.ts @@ -8514,13 +8514,6 @@ Por ejemplo, use 1 hora para tener creado un nuevo archivo cada hora en punto.Explorar… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14322,10 +14315,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14631,7 +14620,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14644,16 +14637,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 6d171307b3..570e2bfa44 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -6029,10 +6029,6 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h LteMacStatisticsDialog - - LTE Mac Statistics - Statistiques LTE Mac - LTE/NR Mac Statistics @@ -6337,10 +6333,6 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h Sequence Number Numéro de Séquence - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - Graphique LTE RLC (UE=%1 chan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6400,10 +6392,6 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h LteRlcStatisticsDialog - - LTE RLC Statistics - Statistiques LTE RLC - LTE/NR RLC Statistics @@ -8598,13 +8586,6 @@ Pas exemple, inquiquez 1 heure pour avoir un nouveau fichier créé toutes les h Parcourir… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14429,10 +14410,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14738,7 +14715,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14751,16 +14732,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index af23863bad..204e884b0c 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -6029,13 +6029,9 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. LteMacStatisticsDialog - - LTE Mac Statistics - Statistiche Mac LTE - LTE/NR Mac Statistics - + Statistiche Mac LTE/NR Include SR frames in filter @@ -6338,13 +6334,9 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.Sequence Number Numero di sequenza - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - Grafico RLC LTE (UE=%1 can=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) - + Grafico RLC %1 (UE=%2 can=%3%4 %5 - %6) LTE RLC Graph - no channel selected @@ -6401,13 +6393,9 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. LteRlcStatisticsDialog - - LTE RLC Statistics - Statistiche RLC LTE - LTE/NR RLC Statistics - + Statistiche RLC LTE/NR Include SR frames in filter @@ -7433,15 +7421,15 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. Scope - + Ambito Description - Descrizione + Descrizione Homepage - + Pagina principale @@ -8344,11 +8332,11 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. LTE - + LTE NR - + NR C-RNTI @@ -8372,7 +8360,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. RAT - + RAT UL Frames @@ -8599,18 +8587,11 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.Sfoglia... - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject CCCH - CCCH + CCCH @@ -14008,7 +13989,7 @@ a:hover { &3GPP Uu - + &3GPP Uu &Wireless @@ -14468,10 +14449,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14774,41 +14751,48 @@ a:hover { Install plugin + Installa plugin + + + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". Binary plugin (*%1) - + Plugin binario (*%1) Plugins can execute arbitrary code as the current user. Make sure you trust it before installing. Continue installing the file "%1" to the personal plugin folder? - + I plugin possono eseguire codice arbitrario come l'utente corrente. Assicurati che sia affidabile prima di installarlo. + +Vuoi continuare l'installazione del file "%1" nella cartella dei plugin personali? Failed to create the directory: %1 - - - - The plugin already exists in the personal plugin folder. - + Impossibile creare la cartella: %1 The file already exists. Do you want to overwrite it? - + The plugin already exists in the personal plugin folder. + Il plugin esiste già nella cartella dei plugin personali. Error removing the old plugin file from the personal plugin folder. - + Errore durante la rimozione del vecchio file del plugin dalla cartella dei plugin personali. Failed to copy the file to the destination: %1 - + Copia del file non riuscita nella destinazione: %1 Plugin '%1' installed successfully. You must restart the program to be able to use it. - + Plugin '%1' installato correttamente. È necessario riavviare il programma per poterlo utilizzare. Show or hide the toolbar @@ -15019,7 +15003,7 @@ Continue installing the file "%1" to the personal plugin folder? Install Plugin - + Installa plugin Wiki Page for %1 diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 1255f5754f..a353f2502b 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -6011,10 +6011,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - LTE MAC統計 - LTE/NR Mac Statistics @@ -6324,10 +6320,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number シーケンス番号 - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLCグラフ (UE=%1 chan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6387,10 +6379,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC統計 - LTE/NR RLC Statistics @@ -8575,13 +8563,6 @@ For example, use 1 hour to have a new file created every hour on the hour.参照… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14444,10 +14425,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14753,7 +14730,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14766,16 +14747,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_ko.ts b/ui/qt/wireshark_ko.ts index 2aeecdcbc0..c90ab67724 100644 --- a/ui/qt/wireshark_ko.ts +++ b/ui/qt/wireshark_ko.ts @@ -6012,10 +6012,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - LTE MAC 통계 - LTE/NR Mac Statistics @@ -6321,10 +6317,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number 시퀀스 번호 - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLC 그래프(UE=%1 chan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6384,10 +6376,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC 통계 - LTE/NR RLC Statistics @@ -8572,13 +8560,6 @@ For example, use 1 hour to have a new file created every hour on the hour.찾아보기... - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14441,10 +14422,6 @@ a:hover { &GSM GSM(&G) - - &LTE - LTE(&L) - &MTP3 MTP3(&M) @@ -14750,7 +14727,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14763,16 +14744,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index f35ab911c2..9d0cae98de 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -6036,10 +6036,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - Statystyki LTE Mac - LTE/NR Mac Statistics @@ -6345,10 +6341,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number Numer sekwencyjny - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - Wykres LTE RLC (UE=%1 kanał=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6408,10 +6400,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - Statystyki LTE RLC - LTE/NR RLC Statistics @@ -8599,13 +8587,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Przeglądaj… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14736,7 +14717,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14749,16 +14734,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts index 2e3db57b92..e444904cbe 100644 --- a/ui/qt/wireshark_ru.ts +++ b/ui/qt/wireshark_ru.ts @@ -6046,10 +6046,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - Статистика LTE Mac - LTE/NR Mac Statistics @@ -6355,10 +6351,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number Номер последовательности - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - График LTE RLC (UE=%1 канал=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6418,10 +6410,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - Статистика LTE RLC - LTE/NR RLC Statistics @@ -8626,13 +8614,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Обзор… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14505,10 +14486,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14814,7 +14791,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14827,16 +14808,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts index ff1e063674..cf70e1f521 100644 --- a/ui/qt/wireshark_sv.ts +++ b/ui/qt/wireshark_sv.ts @@ -6029,10 +6029,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he LteMacStatisticsDialog - - LTE Mac Statistics - LTE Mac-statistik - LTE/NR Mac Statistics @@ -6338,10 +6334,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Sequence Number Sekvensnummer - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLC-graf (UE=%1 kan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6401,10 +6393,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC-statistik - LTE/NR RLC Statistics @@ -8599,13 +8587,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Bläddra… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14473,10 +14454,6 @@ a:hover { &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14782,7 +14759,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14795,16 +14776,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_tr_TR.ts b/ui/qt/wireshark_tr_TR.ts index 02f1160f56..fe1b5fc444 100644 --- a/ui/qt/wireshark_tr_TR.ts +++ b/ui/qt/wireshark_tr_TR.ts @@ -6012,10 +6012,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - LTE Mac İstatistikleri - LTE/NR Mac Statistics @@ -6321,10 +6317,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number Sıra Numarası - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLC Grafiği (UE=%1 chan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6384,10 +6376,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC İstatistikleri - LTE/NR RLC Statistics @@ -8572,13 +8560,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Gözat… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14441,10 +14422,6 @@ a:üzerine gelin{ &GSM &GSM - - &LTE - &LTE - &MTP3 &MTP3 @@ -14750,7 +14727,11 @@ a:üzerine gelin{ - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14763,16 +14744,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts index 790b2a57b9..6be560d734 100644 --- a/ui/qt/wireshark_uk.ts +++ b/ui/qt/wireshark_uk.ts @@ -14580,7 +14580,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14593,16 +14597,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder. diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 2a115ba51d..aad9adf8d0 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -6008,10 +6008,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteMacStatisticsDialog - - LTE Mac Statistics - LTE MAC 统计 - LTE/NR Mac Statistics @@ -6317,10 +6313,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Sequence Number 序列号 - - LTE RLC Graph (UE=%1 chan=%2%3 %4 - %5) - LTE RLC 图表 (UE=%1 chan=%2%3 %4 - %5) - %1 RLC Graph (UE=%2 chan=%3%4 %5 - %6) @@ -6380,10 +6372,6 @@ For example, use 1 hour to have a new file created every hour on the hour. LteRlcStatisticsDialog - - LTE RLC Statistics - LTE RLC 统计 - LTE/NR RLC Statistics @@ -8555,13 +8543,6 @@ For example, use 1 hour to have a new file created every hour on the hour.浏览… - - QObject::QObject - - CCCH - CCCH - - QObject::QObject::QObject @@ -14683,7 +14664,11 @@ a:hover { - Binary plugin (*%1) + Binary plugin (*%1 *%1.[0-9]*) + + + + Error removing the old plugin from the personal plugin folder. You may need to close Wireshark first and then manually remove the file "%1". @@ -14696,16 +14681,9 @@ Continue installing the file "%1" to the personal plugin folder?Failed to create the directory: %1 - - The plugin already exists in the personal plugin folder. - - The file already exists. Do you want to overwrite it? - - - - Error removing the old plugin file from the personal plugin folder. + The plugin already exists in the personal plugin folder.