osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

LTE RRC: upgrade dissector to v17.7.0

This commit is contained in:
Pascal Quantin 2024-01-16 14:55:07 +01:00
parent 87dfdbb915
commit feff9a8b80
11 changed files with 409 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

28
epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -723,7 +723,7 @@ MasterInformationBlock ::= SEQUENCE {
systemFrameNumber BIT STRING (SIZE (8)),
schedulingInfoSIB1-BR-r13 INTEGER (0..31),
systemInfoUnchanged-BR-r15 BOOLEAN,
partEARFCN-17 CHOICE {
partEARFCN-r17 CHOICE {
spare BIT STRING (SIZE (2)),
earfcn-LSB BIT STRING (SIZE (2))
},
@ -2872,6 +2872,11 @@ PosSystemInformation-r15-IEs ::= SEQUENCE {
[[
posSib1-9-v1700 SystemInformationBlockPos-r15,
posSib1-10-v1700 SystemInformationBlockPos-r15
]],
[[
posSib2-17a-v1770 SystemInformationBlockPos-r15,
posSib2-18a-v1770 SystemInformationBlockPos-r15,
posSib2-20a-v1770 SystemInformationBlockPos-r15
]]
},
lateNonCriticalExtension OCTET STRING OPTIONAL,
@ -3261,7 +3266,11 @@ PosSIB-Type-r15 ::= SEQUENCE {
posSibType4-1-v1610,
posSibType5-1-v1610,
posSibType1-9-v1700,
posSibType1-10-v1700
posSibType1-10-v1700,
posSibType2-17a-v1770,
posSibType2-18a-v1770,
posSibType2-20a-v1770
},
...
}
@ -5471,7 +5480,7 @@ ServingSatelliteInfo-r17 ::= SEQUENCE {
stateVectors EphemerisStateVectors-r17,
orbitalParameters EphemerisOrbitalParameters-r17
},
nta-CommonParameters-17 SEQUENCE {
nta-CommonParameters-r17 SEQUENCE {
nta-Common-r17 INTEGER (0..8316827) OPTIONAL, -- Need OP
nta-CommonDrift-r17 INTEGER (-261935..261935) OPTIONAL, -- Need OP
nta-CommonDriftVariation-r17 INTEGER (0..29479) OPTIONAL -- Need OP
@ -13257,7 +13266,12 @@ UE-EUTRA-Capability-v1720-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v1730-IEs ::= SEQUENCE {
phyLayerParameters-v1730 PhyLayerParameters-v1730,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UE-EUTRA-Capability-v1770-IEs OPTIONAL
}
UE-EUTRA-Capability-v1770-IEs ::= SEQUENCE {
measParameters-v1770 MeasParameters-v1770,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-r9 ::= SEQUENCE {
@ -14661,6 +14675,10 @@ MeasParameters-v1700 ::= SEQUENCE {
sharedSpectrumMeasNR-SA-r17 SEQUENCE (SIZE (1..maxBandsNR-r15)) OF SharedSpectrumMeasNR-r17 OPTIONAL
}
MeasParameters-v1770 ::= SEQUENCE {
gaplessMeas-FR2-maxCC-r17 INTEGER (1..32) OPTIONAL
}
SharedSpectrumMeasNR-r17 ::= SEQUENCE {
nr-RSSI-ChannelOccupancyReporting-r17 BOOLEAN
}

2
epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

4
epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -243,7 +243,7 @@ MasterInformationBlock-NB ::= SEQUENCE {
},
additionalTransmissionSIB1-r15 BOOLEAN,
ab-Enabled-5GC-r16 BOOLEAN,
partEARFCN-17 CHOICE {
partEARFCN-r17 CHOICE {
spare BIT STRING (SIZE (2)),
earfcn-LSB BIT STRING (SIZE (2))
},

2
epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V17.6.0 (2023-09)
-- 3GPP TS 36.331 V17.7.0 (2023-12)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

11
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -1,6 +1,6 @@
# lte-rrc.cnf
# lte-rrc conformation file
# Copyright 2008 Vincent Helfre, 2009-2023 Pascal Quantin
# Copyright 2008 Vincent Helfre, 2009-2024 Pascal Quantin
#.OPT
PER
@ -3658,6 +3658,15 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.FN_HDR PosSystemInformation-r15-IEs/posSIB-TypeAndInfo-r15/_item/posSib1-10-v1700
private_data_set_pos_sib_type(actx, LPP_POS_SIB_TYPE_1_10);
#.FN_HDR PosSystemInformation-r15-IEs/posSIB-TypeAndInfo-r15/_item/posSib2-17a-v1770
private_data_set_pos_sib_type(actx, LPP_POS_SIB_TYPE_2_17a);
#.FN_HDR PosSystemInformation-r15-IEs/posSIB-TypeAndInfo-r15/_item/posSib2-18a-v1770
private_data_set_pos_sib_type(actx, LPP_POS_SIB_TYPE_2_18a);
#.FN_HDR PosSystemInformation-r15-IEs/posSIB-TypeAndInfo-r15/_item/posSib2-20a-v1770
private_data_set_pos_sib_type(actx, LPP_POS_SIB_TYPE_2_20a);
#.FN_BODY SystemInformationBlockPos-r15/assistanceDataSIB-Element-r15 VAL_PTR = &assist_data_sib_elem_tvb
tvbuff_t *assist_data_sib_elem_tvb = NULL;

4
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -1,9 +1,9 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V17.6.0 Release 17) packet dissection
* (3GPP TS 36.331 V17.7.0 Release 17) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2023, Pascal Quantin
* Copyright 2009-2024, Pascal Quantin
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>

627
epan/dissectors/packet-lte-rrc.c
View File

File diff suppressed because it is too large Load Diff