osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

LTE RRC: upgrade dissector to v15.9.0 

Change-Id: I214a985e5d421070d931eb90d5f0848998dfdca2
Reviewed-on: https://code.wireshark.org/review/36697
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 2020-04-04 18:18:50 +02:00
parent 7fb4ae4c34
commit 64daf0136c
10 changed files with 1010 additions and 848 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 V15.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -770,6 +770,11 @@ MeasReportAppLayer-r15 ::= SEQUENCE {
MeasReportAppLayer-r15-IEs ::= SEQUENCE {
measReportAppLayerContainer-r15 OCTET STRING (SIZE(1..8000)) OPTIONAL,
serviceType-r15 ENUMERATED {qoe, qoemtsi, spare6, spare5, spare4, spare3, spare2, spare1} OPTIONAL,
nonCriticalExtension MeasReportAppLayer-v1590-IEs OPTIONAL
}
MeasReportAppLayer-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -2136,7 +2141,12 @@ RRCEarlyDataComplete-r15-IEs ::= SEQUENCE {
idleModeMobilityControlInfo-r15 IdleModeMobilityControlInfo OPTIONAL, -- Need OP
idleModeMobilityControlInfoExt-r15 IdleModeMobilityControlInfo-v9e0 OPTIONAL, -- Cond IdleInfoEUTRA
redirectedCarrierInfo-r15 RedirectedCarrierInfo-r15-IEs OPTIONAL, -- Need ON
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension RRCEarlyDataComplete-v1590-IEs OPTIONAL
}
RRCEarlyDataComplete-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
RedirectedCarrierInfo-r15-IEs ::= CHOICE {
@ -2160,7 +2170,12 @@ RRCEarlyDataRequest-r15-IEs ::= SEQUENCE {
s-TMSI-r15 S-TMSI,
establishmentCause-r15 ENUMERATED {mo-Data, delayTolerantAccess},
dedicatedInfoNAS-r15 DedicatedInfoNAS,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension RRCEarlyDataRequest-v1590-IEs OPTIONAL
}
RRCEarlyDataRequest-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -2218,8 +2233,13 @@ SCGFailureInformationNR-r15 ::= SEQUENCE {
}
SCGFailureInformationNR-r15-IEs ::= SEQUENCE {
failureReportSCG-NR-r15 FailureReportSCG-NR-r15 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
failureReportSCG-NR-r15 FailureReportSCG-NR-r15 OPTIONAL,
nonCriticalExtension SCGFailureInformationNR-v1590-IEs OPTIONAL
}
SCGFailureInformationNR-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
FailureReportSCG-NR-r15 ::= SEQUENCE {
@ -5628,7 +5648,7 @@ LogicalChannelConfig ::= SEQUENCE {
release NULL,
setup ENUMERATED {spucch, pucch}
} OPTIONAL, -- Need ON
channellAccessPriority-r15 CHOICE {
channelAccessPriority-r15 CHOICE {
release NULL,
setup INTEGER (1..4)
} OPTIONAL, -- Need ON

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
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.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
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.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -646,7 +646,12 @@ RRCEarlyDataComplete-NB-r15-IEs ::= SEQUENCE {
extendedWaitTime-r15 INTEGER (1..1800) OPTIONAL, -- Need ON
redirectedCarrierInfo-r15 RedirectedCarrierInfo-NB-r13 OPTIONAL, -- Need ON
redirectedCarrierInfoExt-r15 RedirectedCarrierInfo-NB-v1430 OPTIONAL, -- Cond Redirection
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension RRCEarlyDataComplete-NB-v1590-IEs OPTIONAL
}
RRCEarlyDataComplete-NB-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -660,9 +665,14 @@ RRCEarlyDataRequest-NB-r15 ::= SEQUENCE {
RRCEarlyDataRequest-NB-r15-IEs ::= SEQUENCE {
s-TMSI-r15 S-TMSI,
establishmentCause-r15 ENUMERATED {mo-Data, mo-ExceptionData, delayTolerantAccess, spare1},
cqi-NPDCCH-r15 CQI-NPDCCH-NB-r14 OPTIONAL,
cqi-NPDCCH-r15 CQI-NPDCCH-NB-r14 OPTIONAL,
dedicatedInfoNAS-r15 DedicatedInfoNAS,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension RRCEarlyDataRequest-NB-v1590-IEs OPTIONAL
}
RRCEarlyDataRequest-NB-v1590-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V15.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
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.8.0 (2019-12)
-- 3GPP TS 36.331 V15.9.0 (2020-03)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

2
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.8.0 Release 15) packet dissection
* (3GPP TS 36.331 V15.9.0 Release 15) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2020, Pascal Quantin
*

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

File diff suppressed because it is too large Load Diff