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

LTE RRC: upgrade dissector to v15.7.0 

Change-Id: Icf3df4f82f43df51b6ce416f3a159229cbe80351
Reviewed-on: https://code.wireshark.org/review/34656
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-09-30 14:35:35 +02:00
parent 459b9ad293
commit 770db76439
11 changed files with 1694 additions and 1474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -210,23 +210,22 @@ SCG-Config-r12 ::= SEQUENCE {
SCG-Config-r12-IEs ::= SEQUENCE {
scg-RadioConfig-r12 SCG-ConfigPartSCG-r12 OPTIONAL,
nonCriticalExtension SCG-Config-v12x0-IEs OPTIONAL
nonCriticalExtension SCG-Config-v12i0a-IEs OPTIONAL
}
SCG-Config-v12x0-IEs ::= SEQUENCE {
SCG-Config-v12i0a-IEs ::= SEQUENCE {
-- Following field is only for late non-critical extensions from REL-12
lateNonCriticalExtension OCTET STRING (CONTAINING SCG-Config-v12i0-IEs) OPTIONAL,
lateNonCriticalExtension OCTET STRING (CONTAINING SCG-Config-v12i0b-IEs) OPTIONAL,
nonCriticalExtension SCG-Config-v13c0-IEs OPTIONAL
}
SCG-Config-v12i0-IEs ::= SEQUENCE {
SCG-Config-v12i0b-IEs ::= SEQUENCE {
scg-RadioConfig-v12i0 SCG-ConfigPartSCG-v12f0 OPTIONAL, -- Need ON
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SCG-Config-v13c0-IEs ::= SEQUENCE {
scg-RadioConfig-v13c0 SCG-ConfigPartSCG-v13c0 OPTIONAL,
-- Following field is only for late non-critical extensions from REL-13 onwards
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -439,6 +438,8 @@ AS-Config ::= SEQUENCE {
[[ as-ConfigNR-r15 AS-ConfigNR-r15 OPTIONAL
]],
[[ as-Config-v1550 AS-Config-v1550 OPTIONAL
]],
[[ as-ConfigNR-v1570 AS-ConfigNR-v1570 OPTIONAL
]]
}
@ -480,6 +481,10 @@ AS-ConfigNR-r15 ::= SEQUENCE {
sourceOtherConfigSN-NR-r15 OCTET STRING OPTIONAL
}
AS-ConfigNR-v1570 ::= SEQUENCE {
sourceSCG-ConfiguredNR-r15 ENUMERATED {true}
}
AS-Config-v1550 ::= SEQUENCE {
tdm-PatternConfig-r15 SEQUENCE {
subframeAssignment-r15 SubframeAssignment-r15,

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -365,8 +365,8 @@ DLInformationTransfer-r15-IEs ::= SEQUENCE {
FailureInformation-r15 ::= SEQUENCE {
failedLogicalChannelInfo-r15 FailedLogicalChannelInfo-r15 OPTIONAL,
nonCriticalExtension SEQUENCE {}
failedLogicalChannelInfo-r15 FailedLogicalChannelInfo-r15 OPTIONAL
-- nonCriticalExtension is removed in this version as OPTIONAL was missing
}
FailedLogicalChannelInfo-r15 ::= SEQUENCE {
@ -1336,7 +1336,9 @@ SCG-ConfigPartSCG-r12 ::= SEQUENCE {
[[ -- NE-DC addition for setup/ modification and release SN configured measurements
measConfigSN-r15 MeasConfig OPTIONAL, -- Need ON
-- NE-DC additions concerning DRBs/ SRBs are within RadioResourceConfigDedicatedSCG
tdm-PatternConfigNE-DC-r15 TDM-PatternConfig-r15 OPTIONAL -- Need ON
tdm-PatternConfigNE-DC-r15 TDM-PatternConfig-r15 OPTIONAL -- Cond FDD-PSCell
]],
[[ p-MaxEUTRA-r15 P-Max OPTIONAL -- Need ON
]]
}
@ -1368,7 +1370,7 @@ SecurityConfigHO ::= SEQUENCE {
SecurityConfigHO-v1530 ::= SEQUENCE {
handoverType-v1530 CHOICE {
intra5GC-r15 SEQUENCE {
securityAlgorithmConfig-r15 SecurityAlgorithmConfig OPTIONAL, -- Cond fullConfig
securityAlgorithmConfig-r15 SecurityAlgorithmConfig OPTIONAL, -- Cond HO-toEUTRA
keyChangeIndicator-r15 BOOLEAN,
nextHopChainingCount-r15 NextHopChainingCount,
nas-Container-r15 OCTET STRING OPTIONAL -- Need ON
@ -2174,16 +2176,16 @@ SCGFailureInformation-r12 ::= SEQUENCE {
SCGFailureInformation-r12-IEs ::= SEQUENCE {
failureReportSCG-r12 FailureReportSCG-r12 OPTIONAL,
nonCriticalExtension SCGFailureInformation-v1310-IEs OPTIONAL
nonCriticalExtension SCGFailureInformation-v12d0a-IEs OPTIONAL
}
SCGFailureInformation-v1310-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING (CONTAINING SCGFailureInformation-v12d0-IEs) OPTIONAL,
SCGFailureInformation-v12d0a-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING (CONTAINING SCGFailureInformation-v12d0b-IEs) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- Late non-critical extensions:
SCGFailureInformation-v12d0-IEs ::= SEQUENCE {
SCGFailureInformation-v12d0b-IEs ::= SEQUENCE {
failureReportSCG-v12d0 FailureReportSCG-v12d0 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -11138,15 +11140,15 @@ UE-EUTRA-Capability-v1380-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v1390-IEs ::= SEQUENCE {
rf-Parameters-v1390 RF-Parameters-v1390 OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v13x0-IEs OPTIONAL
nonCriticalExtension UE-EUTRA-Capability-v13e0a-IEs OPTIONAL
}
UE-EUTRA-Capability-v13x0-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING (CONTAINING UE-EUTRA-Capability-v13e0-IEs) OPTIONAL,
UE-EUTRA-Capability-v13e0a-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING (CONTAINING UE-EUTRA-Capability-v13e0b-IEs) OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v1470-IEs OPTIONAL
}
UE-EUTRA-Capability-v13e0-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v13e0b-IEs ::= SEQUENCE {
phyLayerParameters-v13e0 PhyLayerParameters-v13e0,
-- Following field is only to be used for late REL-13 extensions
nonCriticalExtension SEQUENCE {} OPTIONAL
@ -11439,7 +11441,13 @@ UE-EUTRA-Capability-v1560-IEs ::= SEQUENCE {
appliedCapabilityFilterCommon-r15 OCTET STRING OPTIONAL,
fdd-Add-UE-EUTRA-Capabilities-v1560 UE-EUTRA-CapabilityAddXDD-Mode-v1560,
tdd-Add-UE-EUTRA-Capabilities-v1560 UE-EUTRA-CapabilityAddXDD-Mode-v1560,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UE-EUTRA-Capability-v1570-IEs OPTIONAL
}
UE-EUTRA-Capability-v1570-IEs ::= SEQUENCE {
rf-Parameters-v1570 RF-Parameters-v1570 OPTIONAL,
irat-ParametersNR-v1570 IRAT-ParametersNR-v1570 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-r9 ::= SEQUENCE {
@ -12127,6 +12135,11 @@ RF-Parameters-v1530 ::= SEQUENCE {
powerClass-14dBm-r15 ENUMERATED {supported} OPTIONAL
}
RF-Parameters-v1570 ::= SEQUENCE {
dl-1024QAM-ScalingFactor-r15 ENUMERATED {v1, v1dot2, v1dot25},
dl-1024QAM-TotalWeightedLayers-r15 INTEGER (0..10)
}
SkipSubframeProcessing-r15 ::= SEQUENCE {
skipProcessingDL-Slot-r15 INTEGER (0..3) OPTIONAL,
skipProcessingDL-SubSlot-r15 INTEGER (0..3) OPTIONAL,
@ -12691,6 +12704,11 @@ IRAT-ParametersNR-v1560 ::= SEQUENCE {
ng-EN-DC-r15 ENUMERATED {supported} OPTIONAL
}
IRAT-ParametersNR-v1570 ::= SEQUENCE {
ss-SINR-Meas-NR-FR1-r15 ENUMERATED {supported} OPTIONAL,
ss-SINR-Meas-NR-FR2-r15 ENUMERATED {supported} OPTIONAL
}
EUTRA-5GC-Parameters-r15 ::= SEQUENCE {
eutra-5GC-r15 ENUMERATED {supported} OPTIONAL,
eutra-EPC-HO-EUTRA-5GC-r15 ENUMERATED {supported} OPTIONAL,

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
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 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
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 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -1117,8 +1117,8 @@ SystemInformationBlockType22-NB-r14 ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
...,
[[ mixedOperationModeConfig-r15 SEQUENCE {
dl-ConfigListMixed-r15 DL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
ul-ConfigListMixed-r15 UL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
dl-ConfigListMixed-r15 DL-ConfigCommonList-NB-r14 OPTIONAL, -- Cond dl-ConfigList
ul-ConfigListMixed-r15 UL-ConfigCommonList-NB-r14 OPTIONAL, -- Cond ul-ConfigList
pagingDistribution-r15 ENUMERATED {true} OPTIONAL, -- Need OR
nprach-Distribution-r15 ENUMERATED {true} OPTIONAL -- Need OR
} OPTIONAL, -- Need OR

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
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 V15.6.0 (2019-06)
-- 3GPP TS 36.331 V15.7.0 (2019-09)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -466,6 +466,9 @@ if(ue_cap_tvb){
proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31, modifiedMPR_Behavior_r10_tvb, 31, 1, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
RF-Parameters-v1570/dl-1024QAM-TotalWeightedLayers-r15 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_dl_1024QAM_TotalWeightedLayers_r15_fmt)
#.TYPE_RENAME
IRAT-ParametersWLAN-r13/supportedBandListWLAN-r13 SupportedBandListWLAN_r13

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

@ -1,7 +1,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V15.6.0 Release 15) packet dissection
* (3GPP TS 36.331 V15.7.0 Release 15) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2019, Pascal Quantin
*
@ -2642,6 +2642,12 @@ lte_rrc_mbms_MaxBW_r14_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%u MHz (%u)", 40*v, v);
}
static void
lte_rrc_dl_1024QAM_TotalWeightedLayers_r15_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%u (%u)", 10+(2*v), v);
}
static void
lte_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{

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

File diff suppressed because it is too large Load Diff