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

NGAP: upgrade dissector to v15.5.0 

Change-Id: I788bfa056f42fe7311bb0d9b054d27d08b54def2
Reviewed-on: https://code.wireshark.org/review/34707
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Pascal Quantin 2019-10-04 09:19:59 +02:00 committed by Alexis La Goutte
parent c3afba7f28
commit eccca820bb
9 changed files with 430 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.6 Common Definitions
-- **************************************************************
--

7
epan/dissectors/asn1/ngap/NGAP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -320,6 +320,11 @@ maxProtocolIEs INTEGER ::= 65535
id-ULForwardingUP-TNLInformation ProtocolIE-ID ::= 164
id-CNAssistedRANTuning ProtocolIE-ID ::= 165
id-CommonNetworkInstance ProtocolIE-ID ::= 166
id-NGRAN-TNLAssociationToRemoveList ProtocolIE-ID ::= 167
id-TNLAssociationTransportLayerAddressNGRAN ProtocolIE-ID ::= 168
id-EndpointIPAddressAndPort ProtocolIE-ID ::= 169
id-LocationReportingAdditionalInfo ProtocolIE-ID ::= 170
id-SourceToTarget-AMFInformationReroute ProtocolIE-ID ::= 171
END

2
epan/dissectors/asn1/ngap/NGAP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.8 Container Definitions
-- **************************************************************
--

57
epan/dissectors/asn1/ngap/NGAP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -27,7 +27,9 @@ IMPORTS
id-CommonNetworkInstance,
id-DataForwardingNotPossible,
id-DL-NGU-UP-TNLInformation,
id-EndpointIPAddressAndPort,
id-LastEUTRAN-PLMNIdentity,
id-LocationReportingAdditionalInfo,
id-MaximumIntegrityProtectedDataRate-DL,
id-NetworkInstance,
id-OldAssociatedQosFlowList-ULendmarkerexpected,
@ -43,6 +45,7 @@ IMPORTS
id-SecurityIndication,
id-SecurityResult,
id-S-NSSAI,
id-TNLAssociationTransportLayerAddressNGRAN,
id-UL-NGU-UP-TNLInformation,
id-UL-NGU-UP-TNLModifyList,
id-ULForwarding,
@ -205,6 +208,7 @@ AMF-TNLAssociationToRemoveItem ::= SEQUENCE {
}
AMF-TNLAssociationToRemoveItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
{ID id-TNLAssociationTransportLayerAddressNGRAN CRITICALITY reject EXTENSION CPTransportLayerInformation PRESENCE optional},
...
}
@ -736,6 +740,7 @@ CPTransportLayerInformation ::= CHOICE {
}
CPTransportLayerInformation-ExtIEs NGAP-PROTOCOL-IES ::= {
{ ID id-EndpointIPAddressAndPort CRITICALITY reject TYPE EndpointIPAddressAndPort PRESENCE mandatory},
...
}
@ -1009,6 +1014,16 @@ EmergencyServiceTargetCN ::= ENUMERATED {
EN-DCSONConfigurationTransfer ::= OCTET STRING
EndpointIPAddressAndPort ::=SEQUENCE {
endpointIPAddress TransportLayerAddress,
portNumber PortNumber,
iE-Extensions ProtocolExtensionContainer { { EndpointIPAddressAndPort-ExtIEs} } OPTIONAL
}
EndpointIPAddressAndPort-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
EquivalentPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNIdentity
EPS-TAC ::= OCTET STRING (SIZE(2))
@ -1414,6 +1429,11 @@ LastVisitedNGRANCellInformation-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
LastVisitedUTRANCellInformation ::= OCTET STRING
LocationReportingAdditionalInfo ::= ENUMERATED {
includePSCell,
...
}
LocationReportingReferenceID ::= INTEGER (1..64, ...)
LocationReportingRequestType ::= SEQUENCE {
@ -1427,6 +1447,7 @@ LocationReportingRequestType ::= SEQUENCE {
}
LocationReportingRequestType-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
{ ID id-LocationReportingAdditionalInfo CRITICALITY ignore EXTENSION LocationReportingAdditionalInfo PRESENCE optional },
...
}
@ -1518,6 +1539,18 @@ NGRAN-CGI-ExtIEs NGAP-PROTOCOL-IES ::= {
...
}
NGRAN-TNLAssociationToRemoveList ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF NGRAN-TNLAssociationToRemoveItem
NGRAN-TNLAssociationToRemoveItem::= SEQUENCE {
tNLAssociationTransportLayerAddress CPTransportLayerInformation,
tNLAssociationTransportLayerAddressAMF CPTransportLayerInformation OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { NGRAN-TNLAssociationToRemoveItem-ExtIEs} } OPTIONAL
}
NGRAN-TNLAssociationToRemoveItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
NGRANTraceID ::= OCTET STRING (SIZE(8))
NonDynamic5QIDescriptor ::= SEQUENCE {
@ -2932,6 +2965,28 @@ SourceToTarget-TransparentContainer ::= OCTET STRING
-- This IE includes a transparent container from the source RAN node to the target RAN node.
-- The octets of the OCTET STRING are encoded according to the specifications of the target system.
SourceToTarget-AMFInformationReroute ::= SEQUENCE {
configuredNSSAI ConfiguredNSSAI OPTIONAL,
rejectedNSSAIinPLMN RejectedNSSAIinPLMN OPTIONAL,
rejectedNSSAIinTA RejectedNSSAIinTA OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {SourceToTarget-AMFInformationReroute-ExtIEs} } OPTIONAL,
...
}
SourceToTarget-AMFInformationReroute-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
-- This IE includes information from the source Core node to the target Core node for reroute information provide by NSSF.
-- The octets of the OCTET STRING are encoded according to the specifications of the Core network.
ConfiguredNSSAI ::= OCTET STRING (SIZE(128))
RejectedNSSAIinPLMN ::= OCTET STRING (SIZE(32))
RejectedNSSAIinTA ::= OCTET STRING (SIZE(32))
SST ::= OCTET STRING (SIZE(1))
SupportedTAList ::= SEQUENCE (SIZE(1..maxnoofTACs)) OF SupportedTAItem

48
epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -63,6 +63,7 @@ IMPORTS
NASSecurityParametersFromNGRAN,
NewSecurityContextInd,
NGRAN-CGI,
NGRAN-TNLAssociationToRemoveList,
NGRANTraceID,
NR-CGI,
NRPPa-PDU,
@ -126,6 +127,7 @@ IMPORTS
S-NSSAI,
SONConfigurationTransfer,
SourceToTarget-TransparentContainer,
SourceToTarget-AMFInformationReroute,
SupportedTAList,
TAIListForPaging,
TAIListForRestart,
@ -217,6 +219,7 @@ FROM NGAP-Containers
id-NewSecurityContextInd,
id-NGAP-Message,
id-NGRAN-CGI,
id-NGRAN-TNLAssociationToRemoveList,
id-NGRANTraceID,
id-NR-CGI,
id-NRPPa-PDU,
@ -280,6 +283,7 @@ FROM NGAP-Containers
id-SONConfigurationTransferUL,
id-SourceAMF-UE-NGAP-ID,
id-SourceToTarget-TransparentContainer,
id-SourceToTarget-AMFInformationReroute,
id-SupportedTAList,
id-TAIListForPaging,
id-TAIListForRestart,
@ -1173,14 +1177,15 @@ InitialUEMessage ::= SEQUENCE {
}
InitialUEMessage-IEs NGAP-PROTOCOL-IES ::= {
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory }|
{ ID id-UserLocationInformation CRITICALITY reject TYPE UserLocationInformation PRESENCE mandatory }|
{ ID id-RRCEstablishmentCause CRITICALITY ignore TYPE RRCEstablishmentCause PRESENCE mandatory }|
{ ID id-FiveG-S-TMSI CRITICALITY reject TYPE FiveG-S-TMSI PRESENCE optional }|
{ ID id-AMFSetID CRITICALITY ignore TYPE AMFSetID PRESENCE optional }|
{ ID id-UEContextRequest CRITICALITY ignore TYPE UEContextRequest PRESENCE optional }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE optional },
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory }|
{ ID id-UserLocationInformation CRITICALITY reject TYPE UserLocationInformation PRESENCE mandatory }|
{ ID id-RRCEstablishmentCause CRITICALITY ignore TYPE RRCEstablishmentCause PRESENCE mandatory }|
{ ID id-FiveG-S-TMSI CRITICALITY reject TYPE FiveG-S-TMSI PRESENCE optional }|
{ ID id-AMFSetID CRITICALITY ignore TYPE AMFSetID PRESENCE optional }|
{ ID id-UEContextRequest CRITICALITY ignore TYPE UEContextRequest PRESENCE optional }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE optional }|
{ ID id-SourceToTarget-AMFInformationReroute CRITICALITY ignore TYPE SourceToTarget-AMFInformationReroute PRESENCE optional },
...
}
@ -1261,13 +1266,14 @@ RerouteNASRequest ::= SEQUENCE {
NGAP-Message ::= OCTET STRING
RerouteNASRequest-IEs NGAP-PROTOCOL-IES ::= {
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-AMF-UE-NGAP-ID CRITICALITY ignore TYPE AMF-UE-NGAP-ID PRESENCE optional }|
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-AMF-UE-NGAP-ID CRITICALITY ignore TYPE AMF-UE-NGAP-ID PRESENCE optional }|
-- WS modification, add a definition for NGAP Message
-- { ID id-NGAP-Message CRITICALITY reject TYPE OCTET STRING PRESENCE mandatory }|
{ ID id-NGAP-Message CRITICALITY reject TYPE NGAP-Message PRESENCE mandatory }|
{ ID id-AMFSetID CRITICALITY reject TYPE AMFSetID PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE optional },
-- { ID id-NGAP-Message CRITICALITY reject TYPE OCTET STRING PRESENCE mandatory }|
{ ID id-NGAP-Message CRITICALITY reject TYPE NGAP-Message PRESENCE mandatory }|
{ ID id-AMFSetID CRITICALITY reject TYPE AMFSetID PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE optional }|
{ ID id-SourceToTarget-AMFInformationReroute CRITICALITY ignore TYPE SourceToTarget-AMFInformationReroute PRESENCE optional },
...
}
@ -1360,10 +1366,11 @@ RANConfigurationUpdate ::= SEQUENCE {
}
RANConfigurationUpdateIEs NGAP-PROTOCOL-IES ::= {
{ ID id-RANNodeName CRITICALITY ignore TYPE RANNodeName PRESENCE optional }|
{ ID id-SupportedTAList CRITICALITY reject TYPE SupportedTAList PRESENCE optional }|
{ ID id-DefaultPagingDRX CRITICALITY ignore TYPE PagingDRX PRESENCE optional }|
{ ID id-GlobalRANNodeID CRITICALITY ignore TYPE GlobalRANNodeID PRESENCE optional },
{ ID id-RANNodeName CRITICALITY ignore TYPE RANNodeName PRESENCE optional }|
{ ID id-SupportedTAList CRITICALITY reject TYPE SupportedTAList PRESENCE optional }|
{ ID id-DefaultPagingDRX CRITICALITY ignore TYPE PagingDRX PRESENCE optional }|
{ ID id-GlobalRANNodeID CRITICALITY ignore TYPE GlobalRANNodeID PRESENCE optional }|
{ ID id-NGRAN-TNLAssociationToRemoveList CRITICALITY reject TYPE NGRAN-TNLAssociationToRemoveList PRESENCE optional },
...
}
@ -2129,7 +2136,8 @@ SecondaryRATDataUsageReportIEs NGAP-PROTOCOL-IES ::= {
{ ID id-AMF-UE-NGAP-ID CRITICALITY ignore TYPE AMF-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-RAN-UE-NGAP-ID CRITICALITY ignore TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-PDUSessionResourceSecondaryRATUsageList CRITICALITY ignore TYPE PDUSessionResourceSecondaryRATUsageList PRESENCE mandatory }|
{ ID id-HandoverFlag CRITICALITY ignore TYPE HandoverFlag PRESENCE optional },
{ ID id-HandoverFlag CRITICALITY ignore TYPE HandoverFlag PRESENCE optional }|
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}

2
epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.4.0 (2019-07)
-- 3GPP TS 38.413 V15.5.0 (2019-09)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--

10
epan/dissectors/asn1/ngap/ngap.cnf
View File

@ -960,6 +960,11 @@ id-ULForwarding ProtocolIE-ID
id-ULForwardingUP-TNLInformation ProtocolIE-ID
id-CNAssistedRANTuning ProtocolIE-ID
id-CommonNetworkInstance ProtocolIE-ID
id-NGRAN-TNLAssociationToRemoveList ProtocolIE-ID
id-TNLAssociationTransportLayerAddressNGRAN ProtocolIE-ID
id-EndpointIPAddressAndPort ProtocolIE-ID
id-LocationReportingAdditionalInfo ProtocolIE-ID
id-SourceToTarget-AMFInformationReroute ProtocolIE-ID
#.END
@ -1117,6 +1122,9 @@ EN-DCSONConfigurationTransfer N ngap.ies id-ENDC-SONConfigurationT
GUAMI N ngap.ies id-NewGUAMI
CNAssistedRANTuning N ngap.ies id-CNAssistedRANTuning
CommonNetworkInstance N ngap.ies id-CommonNetworkInstance
NGRAN-TNLAssociationToRemoveList N ngap.ies id-NGRAN-TNLAssociationToRemoveList
EndpointIPAddressAndPort N ngap.ies id-EndpointIPAddressAndPort
SourceToTarget-AMFInformationReroute N ngap.ies id-SourceToTarget-AMFInformationReroute
#NGAP-PROTOCOL-EXTENSION
@ -1135,6 +1143,8 @@ CNTypeRestrictionsForEquivalent N ngap.extension id-CNTyp
CNTypeRestrictionsForServing N ngap.extension id-CNTypeRestrictionsForServing
ULForwarding N ngap.extension id-ULForwarding
UPTransportLayerInformation N ngap.extension id-ULForwardingUP-TNLInformation
CPTransportLayerInformation N ngap.extension id-TNLAssociationTransportLayerAddressNGRAN
LocationReportingAdditionalInfo N ngap.extension id-LocationReportingAdditionalInfo
#NGAP-ELEMENTARY-PROCEDURE

2
epan/dissectors/asn1/ngap/packet-ngap-template.c
View File

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.413 v15.4.0 (2019-07)
* References: 3GPP TS 38.413 v15.5.0 (2019-09)
*/
#include "config.h"

426
epan/dissectors/packet-ngap.c
View File

File diff suppressed because it is too large Load Diff