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

NGAP: upgrade dissector to v15.2.0 

Change-Id: Id050878d8d18fda321304ce5dd2d7842e66cfa93
Reviewed-on: https://code.wireshark.org/review/31463
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2019-01-09 12:40:01 +01:00
parent ab5bbbb2ba
commit c9f7cbdc35
9 changed files with 1715 additions and 451 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.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.6 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -121,7 +121,7 @@ maxProtocolIEs INTEGER ::= 65535
maxnoofE-RABs INTEGER ::= 256
maxnoofErrors INTEGER ::= 256
maxnoofForbTACs INTEGER ::= 4096
maxnoofMultiConnectivities INTEGER ::= 8
maxnoofMultiConnectivities INTEGER ::= 4
maxnoofNGConnectionsToReset INTEGER ::= 65536
maxnoofPDUSessions INTEGER ::= 256
maxnoofPLMNs INTEGER ::= 12
@ -262,7 +262,8 @@ maxProtocolIEs INTEGER ::= 65535
id-UEAggregateMaximumBitRate ProtocolIE-ID ::= 110
id-UE-associatedLogicalNG-connectionList ProtocolIE-ID ::= 111
id-UEContextRequest ProtocolIE-ID ::= 112
id-UEIdentityIndexValue ProtocolIE-ID ::= 113
--WS extension
id-Unknown-113 ProtocolIE-ID ::= 113
id-UE-NGAP-IDs ProtocolIE-ID ::= 114
id-UEPagingIdentity ProtocolIE-ID ::= 115
id-UEPresenceInAreaOfInterestList ProtocolIE-ID ::= 116
@ -275,5 +276,21 @@ maxProtocolIEs INTEGER ::= 65535
id-WarningMessageContents ProtocolIE-ID ::= 123
id-WarningSecurityInfo ProtocolIE-ID ::= 124
id-WarningType ProtocolIE-ID ::= 125
id-AdditionalUL-NGU-UP-TNLInformation ProtocolIE-ID ::= 126
id-DataForwardingNotPossible ProtocolIE-ID ::= 127
id-DL-NGU-UP-TNLInformation ProtocolIE-ID ::= 128
id-NetworkInstance ProtocolIE-ID ::= 129
id-PDUSessionAggregateMaximumBitRate ProtocolIE-ID ::= 130
id-PDUSessionResourceFailedToModifyListModCfm ProtocolIE-ID ::= 131
id-PDUSessionResourceFailedToSetupListCxtFail ProtocolIE-ID ::= 132
id-PDUSessionResourceListCxtRelReq ProtocolIE-ID ::= 133
id-PDUSessionType ProtocolIE-ID ::= 134
id-QosFlowAddOrModifyRequestList ProtocolIE-ID ::= 135
id-QosFlowSetupRequestList ProtocolIE-ID ::= 136
id-QosFlowToReleaseList ProtocolIE-ID ::= 137
id-SecurityIndication ProtocolIE-ID ::= 138
id-UL-NGU-UP-TNLInformation ProtocolIE-ID ::= 139
id-UL-NGU-UP-TNLModifyList ProtocolIE-ID ::= 140
id-WarningAreaCoordinates ProtocolIE-ID ::= 141
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.8 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -16,6 +16,20 @@ BEGIN
IMPORTS
id-AdditionalUL-NGU-UP-TNLInformation,
id-Cause,
id-DataForwardingNotPossible,
id-DL-NGU-UP-TNLInformation,
id-NetworkInstance,
id-PDUSessionAggregateMaximumBitRate,
id-PDUSessionResourceFailedToSetupListCxtFail,
id-PDUSessionType,
id-QosFlowAddOrModifyRequestList,
id-QosFlowSetupRequestList,
id-QosFlowToReleaseList,
id-SecurityIndication,
id-UL-NGU-UP-TNLInformation,
id-UL-NGU-UP-TNLModifyList,
maxnoofAllowedAreas,
maxnoofAllowedS-NSSAIs,
maxnoofBPLMNs,
@ -65,6 +79,7 @@ FROM NGAP-Constants
FROM NGAP-CommonDataTypes
ProtocolExtensionContainer{},
ProtocolIE-Container{},
NGAP-PROTOCOL-EXTENSION,
ProtocolIE-SingleContainer{},
NGAP-PROTOCOL-IES
@ -173,7 +188,7 @@ AMF-TNLAssociationToUpdateItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
AMF-UE-NGAP-ID ::= INTEGER (0..4294967295)
AMF-UE-NGAP-ID ::= INTEGER (0..1099511627775)
AreaOfInterest ::= SEQUENCE {
areaOfInterestTAIList AreaOfInterestTAIList OPTIONAL,
@ -260,8 +275,9 @@ AssistanceDataForRecommendedCells-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
AssociatedQosFlowList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF AssociatedQosFlowItem
AssociatedQosFlowItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
iE-Extensions ProtocolExtensionContainer { {AssociatedQosFlowItem-ExtIEs} } OPTIONAL,
qosFlowIdentifier QosFlowIdentifier,
qosFlowMappingIndication ENUMERATED {ul, dl, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {AssociatedQosFlowItem-ExtIEs} } OPTIONAL,
...
}
@ -440,7 +456,6 @@ CauseRadioNetwork ::= ENUMERATED {
reduce-load-in-serving-cell,
user-inactivity,
radio-connection-with-ue-lost,
load-balancing-tau-required,
radio-resources-not-available,
invalid-qos-combination,
failure-in-radio-interface-procedure,
@ -627,6 +642,28 @@ CoreNetworkAssistanceInformation-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
COUNTValueForPDCP-SN12 ::= SEQUENCE {
pDCP-SN12 INTEGER (0..4095),
hFN-PDCP-SN12 INTEGER (0..1048575),
iE-Extensions ProtocolExtensionContainer { {COUNTValueForPDCP-SN12-ExtIEs} } OPTIONAL,
...
}
COUNTValueForPDCP-SN12-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
COUNTValueForPDCP-SN18 ::= SEQUENCE {
pDCP-SN18 INTEGER (0..262143),
hFN-PDCP-SN18 INTEGER (0..16383),
iE-Extensions ProtocolExtensionContainer { {COUNTValueForPDCP-SN18-ExtIEs} } OPTIONAL,
...
}
COUNTValueForPDCP-SN18-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
CPTransportLayerInformation ::= CHOICE {
endpointIPAddress TransportLayerAddress,
choice-Extensions ProtocolIE-SingleContainer { {CPTransportLayerInformation-ExtIEs} }
@ -702,6 +739,11 @@ DLForwarding ::= ENUMERATED {
...
}
DL-NGU-TNLInformationReused ::= ENUMERATED {
true,
...
}
DirectForwardingPathAvailability ::= ENUMERATED {
direct-path-available,
...
@ -709,6 +751,82 @@ DirectForwardingPathAvailability ::= ENUMERATED {
DRB-ID ::= INTEGER (1..32, ...)
DRBsSubjectToStatusTransferList ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF DRBsSubjectToStatusTransferItem
DRBsSubjectToStatusTransferItem ::= SEQUENCE {
dRB-ID DRB-ID,
dRBStatusUL DRBStatusUL,
dRBStatusDL DRBStatusDL,
iE-Extension ProtocolExtensionContainer { {DRBsSubjectToStatusTransferItem-ExtIEs} } OPTIONAL,
...
}
DRBsSubjectToStatusTransferItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
DRBStatusDL ::= CHOICE {
dRBStatusDL12 DRBStatusDL12,
dRBStatusDL18 DRBStatusDL18,
choice-Extensions ProtocolIE-SingleContainer { {DRBStatusDL-ExtIEs} }
}
DRBStatusDL-ExtIEs NGAP-PROTOCOL-IES ::= {
...
}
DRBStatusDL12 ::= SEQUENCE {
dL-COUNTValue COUNTValueForPDCP-SN12,
iE-Extension ProtocolExtensionContainer { {DRBStatusDL12-ExtIEs} } OPTIONAL,
...
}
DRBStatusDL12-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
DRBStatusDL18 ::= SEQUENCE {
dL-COUNTValue COUNTValueForPDCP-SN18,
iE-Extension ProtocolExtensionContainer { {DRBStatusDL18-ExtIEs} } OPTIONAL,
...
}
DRBStatusDL18-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
DRBStatusUL ::= CHOICE {
dRBStatusUL12 DRBStatusUL12,
dRBStatusUL18 DRBStatusUL18,
choice-Extensions ProtocolIE-SingleContainer { {DRBStatusUL-ExtIEs} }
}
DRBStatusUL-ExtIEs NGAP-PROTOCOL-IES ::= {
...
}
DRBStatusUL12 ::= SEQUENCE {
uL-COUNTValue COUNTValueForPDCP-SN12,
receiveStatusOfUL-PDCP-SDUs BIT STRING (SIZE(1..2048)) OPTIONAL,
iE-Extension ProtocolExtensionContainer { {DRBStatusUL12-ExtIEs} } OPTIONAL,
...
}
DRBStatusUL12-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
DRBStatusUL18 ::= SEQUENCE {
uL-COUNTValue COUNTValueForPDCP-SN18,
receiveStatusOfUL-PDCP-SDUs BIT STRING (SIZE(1..131072)) OPTIONAL,
iE-Extension ProtocolExtensionContainer { {DRBStatusUL18-ExtIEs} } OPTIONAL,
...
}
DRBStatusUL18-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
DRBsToQosFlowsMappingList ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF DRBsToQosFlowsMappingItem
DRBsToQosFlowsMappingItem ::= SEQUENCE {
@ -1114,7 +1232,8 @@ HandoverRequiredTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
}
HandoverResourceAllocationUnsuccessfulTransfer ::= SEQUENCE {
cause Cause,
cause Cause,
criticalityDiagnostics CriticalityDiagnostics OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {HandoverResourceAllocationUnsuccessfulTransfer-ExtIEs} } OPTIONAL,
...
}
@ -1286,7 +1405,9 @@ N3IWF-ID-ExtIEs NGAP-PROTOCOL-IES ::= {
NAS-PDU ::= OCTET STRING
NASSecurityParametersFromNGRAN ::= OCTET STRING -- This IE may need to be refined
NASSecurityParametersFromNGRAN ::= OCTET STRING
NetworkInstance ::= INTEGER (1..256, ...)
NewSecurityContextInd ::= ENUMERATED {
true,
@ -1346,7 +1467,7 @@ NotificationCause ::= ENUMERATED {
}
NotificationControl ::= ENUMERATED {
notification-enabled,
notification-requested,
...
}
@ -1489,6 +1610,7 @@ PathSwitchRequestSetupFailedTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
PathSwitchRequestTransfer ::= SEQUENCE {
dL-NGU-UP-TNLInformation UPTransportLayerInformation,
dL-NGU-TNLInformationReused DL-NGU-TNLInformationReused OPTIONAL,
userPlaneSecurityInformation UserPlaneSecurityInformation OPTIONAL,
qosFlowAcceptedList QosFlowAcceptedList,
iE-Extensions ProtocolExtensionContainer { {PathSwitchRequestTransfer-ExtIEs} } OPTIONAL,
@ -1535,6 +1657,19 @@ PDUSessionResourceAdmittedItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceFailedToModifyListModCfm ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceFailedToModifyItemModCfm
PDUSessionResourceFailedToModifyItemModCfm ::= SEQUENCE {
pDUSessionID PDUSessionID,
pDUSessionResourceModifyIndicationUnsuccessfulTransfer OCTET STRING (CONTAINING PDUSessionResourceModifyIndicationUnsuccessfulTransfer),
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceFailedToModifyItemModCfm-ExtIEs} } OPTIONAL,
...
}
PDUSessionResourceFailedToModifyItemModCfm-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceFailedToModifyListModRes ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceFailedToModifyItemModRes
PDUSessionResourceFailedToModifyItemModRes ::= SEQUENCE {
@ -1548,6 +1683,19 @@ PDUSessionResourceFailedToModifyItemModRes-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceFailedToSetupListCxtFail ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceFailedToSetupItemCxtFail
PDUSessionResourceFailedToSetupItemCxtFail ::= SEQUENCE {
pDUSessionID PDUSessionID,
pDUSessionResourceSetupUnsuccessfulTransfer OCTET STRING (CONTAINING PDUSessionResourceSetupUnsuccessfulTransfer),
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceFailedToSetupItemCxtFail-ExtIEs} } OPTIONAL,
...
}
PDUSessionResourceFailedToSetupItemCxtFail-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceFailedToSetupListCxtRes ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceFailedToSetupItemCxtRes
PDUSessionResourceFailedToSetupItemCxtRes ::= SEQUENCE {
@ -1639,6 +1787,18 @@ PDUSessionResourceItemCxtRelCpl-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceListCxtRelReq ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceItemCxtRelReq
PDUSessionResourceItemCxtRelReq ::= SEQUENCE {
pDUSessionID PDUSessionID,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceItemCxtRelReq-ExtIEs} } OPTIONAL,
...
}
PDUSessionResourceItemCxtRelReq-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceListHORqd ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionResourceItemHORqd
PDUSessionResourceItemHORqd ::= SEQUENCE {
@ -1654,6 +1814,7 @@ PDUSessionResourceItemHORqd-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
PDUSessionResourceModifyConfirmTransfer ::= SEQUENCE {
qosFlowModifyConfirmList QosFlowModifyConfirmList,
tNLMappingList TNLMappingList OPTIONAL,
qosFlowFailedToModifyList QosFlowList OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyConfirmTransfer-ExtIEs} } OPTIONAL,
...
@ -1663,23 +1824,36 @@ PDUSessionResourceModifyConfirmTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceModifyRequestTransfer ::= SEQUENCE {
pDUSessionAggregateMaximumBitRate PDUSessionAggregateMaximumBitRate OPTIONAL,
uL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
dL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
qosFlowAddOrModifyRequestList QosFlowAddOrModifyRequestList OPTIONAL,
qosFlowToReleaseList QosFlowList OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyRequestTransfer-ExtIEs} } OPTIONAL,
PDUSessionResourceModifyIndicationUnsuccessfulTransfer ::= SEQUENCE {
cause Cause,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyIndicationUnsuccessfulTransfer-ExtIEs} } OPTIONAL,
...
}
PDUSessionResourceModifyRequestTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
PDUSessionResourceModifyIndicationUnsuccessfulTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
PDUSessionResourceModifyRequestTransfer ::= SEQUENCE {
protocolIEs ProtocolIE-Container { {PDUSessionResourceModifyRequestTransferIEs} },
...
}
PDUSessionResourceModifyRequestTransferIEs NGAP-PROTOCOL-IES ::= {
{ ID id-PDUSessionAggregateMaximumBitRate CRITICALITY reject TYPE PDUSessionAggregateMaximumBitRate PRESENCE optional }|
{ ID id-UL-NGU-UP-TNLModifyList CRITICALITY reject TYPE UL-NGU-UP-TNLModifyList PRESENCE optional }|
{ ID id-NetworkInstance CRITICALITY reject TYPE NetworkInstance PRESENCE optional }|
{ ID id-QosFlowAddOrModifyRequestList CRITICALITY reject TYPE QosFlowAddOrModifyRequestList PRESENCE optional }|
{ ID id-QosFlowToReleaseList CRITICALITY reject TYPE QosFlowList PRESENCE optional }|
{ ID id-AdditionalUL-NGU-UP-TNLInformation CRITICALITY reject TYPE UPTransportLayerInformation PRESENCE optional },
...
}
PDUSessionResourceModifyResponseTransfer ::= SEQUENCE {
dL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
qosFlowAddOrModifyResponseList QosFlowAddOrModifyResponseList OPTIONAL,
dL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
uL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
qosFlowAddOrModifyResponseList QosFlowAddOrModifyResponseList OPTIONAL,
additionalQosFlowPerTNLInformation QosFlowPerTNLInformation OPTIONAL,
qosFlowFailedToAddOrModifyList QosFlowList OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyResponseTransfer-ExtIEs} } OPTIONAL,
...
@ -1743,7 +1917,7 @@ PDUSessionResourceModifyListModRes ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF
PDUSessionResourceModifyItemModRes ::= SEQUENCE {
pDUSessionID PDUSessionID,
pDUSessionResourceModifyResponseTransfer OCTET STRING (CONTAINING PDUSessionResourceModifyResponseTransfer),
pDUSessionResourceModifyResponseTransfer OCTET STRING (CONTAINING PDUSessionResourceModifyResponseTransfer) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyItemModRes-ExtIEs} } OPTIONAL,
...
}
@ -1753,7 +1927,8 @@ PDUSessionResourceModifyItemModRes-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
}
PDUSessionResourceModifyUnsuccessfulTransfer ::= SEQUENCE {
cause Cause,
cause Cause,
criticalityDiagnostics CriticalityDiagnostics OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceModifyUnsuccessfulTransfer-ExtIEs} } OPTIONAL,
...
}
@ -1938,18 +2113,19 @@ PDUSessionResourceSetupItemSURes-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
}
PDUSessionResourceSetupRequestTransfer ::= SEQUENCE {
pDUSessionAggregateMaximumBitRate PDUSessionAggregateMaximumBitRate OPTIONAL,
uL-NGU-UP-TNLInformation UPTransportLayerInformation,
additionalUL-NGU-UP-TNLInformation UPTransportLayerInformation OPTIONAL,
dataForwardingNotPossible DataForwardingNotPossible OPTIONAL,
pDUSessionType PDUSessionType,
securityIndication SecurityIndication OPTIONAL,
qosFlowSetupRequestList QosFlowSetupRequestList,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceSetupRequestTransfer-ExtIEs} } OPTIONAL,
protocolIEs ProtocolIE-Container { {PDUSessionResourceSetupRequestTransferIEs} },
...
}
PDUSessionResourceSetupRequestTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
PDUSessionResourceSetupRequestTransferIEs NGAP-PROTOCOL-IES ::= {
{ ID id-PDUSessionAggregateMaximumBitRate CRITICALITY reject TYPE PDUSessionAggregateMaximumBitRate PRESENCE optional }|
{ ID id-UL-NGU-UP-TNLInformation CRITICALITY reject TYPE UPTransportLayerInformation PRESENCE mandatory }|
{ ID id-AdditionalUL-NGU-UP-TNLInformation CRITICALITY reject TYPE UPTransportLayerInformation PRESENCE optional }|
{ ID id-DataForwardingNotPossible CRITICALITY reject TYPE DataForwardingNotPossible PRESENCE optional }|
{ ID id-PDUSessionType CRITICALITY reject TYPE PDUSessionType PRESENCE mandatory }|
{ ID id-SecurityIndication CRITICALITY reject TYPE SecurityIndication PRESENCE optional }|
{ ID id-NetworkInstance CRITICALITY reject TYPE NetworkInstance PRESENCE optional }|
{ ID id-QosFlowSetupRequestList CRITICALITY reject TYPE QosFlowSetupRequestList PRESENCE mandatory },
...
}
@ -1967,7 +2143,8 @@ PDUSessionResourceSetupResponseTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
}
PDUSessionResourceSetupUnsuccessfulTransfer ::= SEQUENCE {
cause Cause,
cause Cause,
criticalityDiagnostics CriticalityDiagnostics OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionResourceSetupUnsuccessfulTransfer-ExtIEs} } OPTIONAL,
...
}
@ -2096,7 +2273,7 @@ QosCharacteristics-ExtIEs NGAP-PROTOCOL-IES ::= {
QosFlowAcceptedList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowAcceptedItem
QosFlowAcceptedItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
iE-Extensions ProtocolExtensionContainer { {QosFlowAcceptedItem-ExtIEs} } OPTIONAL,
...
}
@ -2108,8 +2285,8 @@ QosFlowAcceptedItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowAddOrModifyRequestList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowAddOrModifyRequestItem
QosFlowAddOrModifyRequestItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowLevelQosParameters QosFlowLevelQosParameters OPTIONAL, -- presence may need to be refined
qosFlowIdentifier QosFlowIdentifier,
qosFlowLevelQosParameters QosFlowLevelQosParameters OPTIONAL,
e-RAB-ID E-RAB-ID OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QosFlowAddOrModifyRequestItem-ExtIEs} } OPTIONAL,
...
@ -2122,7 +2299,7 @@ QosFlowAddOrModifyRequestItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowAddOrModifyResponseList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowAddOrModifyResponseItem
QosFlowAddOrModifyResponseItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
iE-Extensions ProtocolExtensionContainer { {QosFlowAddOrModifyResponseItem-ExtIEs} } OPTIONAL,
...
}
@ -2131,12 +2308,12 @@ QosFlowAddOrModifyResponseItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
QosFlowIndicator ::= INTEGER (0..63, ...)
QosFlowIdentifier ::= INTEGER (0..63, ...)
QosFlowInformationList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowInformationItem
QosFlowInformationItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
dLForwarding DLForwarding OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QosFlowInformationItem-ExtIEs} } OPTIONAL,
...
@ -2163,7 +2340,7 @@ QosFlowLevelQosParameters-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowItem
QosFlowItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
cause Cause,
iE-Extensions ProtocolExtensionContainer { {QosFlowItem-ExtIEs} } OPTIONAL,
...
@ -2176,7 +2353,7 @@ QosFlowItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowModifyConfirmList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowModifyConfirmItem
QosFlowModifyConfirmItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
iE-Extensions ProtocolExtensionContainer { {QosFlowModifyConfirmItem-ExtIEs} } OPTIONAL,
...
}
@ -2188,7 +2365,7 @@ QosFlowModifyConfirmItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowNotifyList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowNotifyItem
QosFlowNotifyItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
notificationCause NotificationCause,
iE-Extensions ProtocolExtensionContainer { {QosFlowNotifyItem-ExtIEs} } OPTIONAL,
...
@ -2212,7 +2389,7 @@ QosFlowPerTNLInformation-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowSetupRequestList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowSetupRequestItem
QosFlowSetupRequestItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
qosFlowLevelQosParameters QosFlowLevelQosParameters,
e-RAB-ID E-RAB-ID OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QosFlowSetupRequestItem-ExtIEs} } OPTIONAL,
@ -2226,7 +2403,7 @@ QosFlowSetupRequestItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowSetupResponseListHOReqAck ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowSetupResponseItemHOReqAck
QosFlowSetupResponseItemHOReqAck ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
dataForwardingAccepted DataForwardingAccepted OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QosFlowSetupResponseItemHOReqAck-ExtIEs} } OPTIONAL,
...
@ -2239,7 +2416,7 @@ QosFlowSetupResponseItemHOReqAck-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowSetupResponseListSURes ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowSetupResponseItemSURes
QosFlowSetupResponseItemSURes ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
iE-Extensions ProtocolExtensionContainer { {QosFlowSetupResponseItemSURes-ExtIEs} } OPTIONAL,
...
}
@ -2251,7 +2428,7 @@ QosFlowSetupResponseItemSURes-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
QosFlowToBeForwardedList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowToBeForwardedItem
QosFlowToBeForwardedItem ::= SEQUENCE {
qosFlowIndicator QosFlowIndicator,
qosFlowIdentifier QosFlowIdentifier,
iE-Extensions ProtocolExtensionContainer { {QosFlowToBeForwardedItem-ExtIEs} } OPTIONAL,
...
}
@ -2266,7 +2443,15 @@ RANNodeName ::= PrintableString (SIZE(1..150, ...))
RANPagingPriority ::= INTEGER (1..256)
RANStatusTransfer-TransparentContainer ::= OCTET STRING -- This IE may need to be refined
RANStatusTransfer-TransparentContainer ::= SEQUENCE {
dRBsSubjectToStatusTransferList DRBsSubjectToStatusTransferList,
iE-Extensions ProtocolExtensionContainer { {RANStatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
...
}
RANStatusTransfer-TransparentContainer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
RAN-UE-NGAP-ID ::= INTEGER (0..4294967295)
@ -2365,7 +2550,19 @@ RoutingID ::= OCTET STRING
RRCContainer ::= OCTET STRING
RRCEstablishmentCause ::= OCTET STRING -- This IE may need to be refined
RRCEstablishmentCause ::= ENUMERATED {
emergency,
highPriorityAccess,
mt-Access,
mo-Signalling,
mo-Data,
mo-VoiceCall,
mo-VideoCall,
mo-SMS,
mps-PriorityAccess,
mcs-PriorityAccess,
...
}
RRCInactiveTransitionReportRequest ::= ENUMERATED {
subsequent-state-transition-report,
@ -2771,6 +2968,19 @@ TNLInformationItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
TNLMappingList ::= SEQUENCE (SIZE(1..maxnoofMultiConnectivities)) OF TNLMappingItem
TNLMappingItem ::= SEQUENCE {
dL-NGU-UP-TNLInformation UPTransportLayerInformation,
uL-NGU-UP-TNLInformation UPTransportLayerInformation,
iE-Extensions ProtocolExtensionContainer { {TNLMappingItem-ExtIEs} } OPTIONAL,
...
}
TNLMappingItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
TraceActivation ::= SEQUENCE {
nGRANTraceID NGRANTraceID,
interfacesToTrace InterfacesToTrace,
@ -2889,7 +3099,20 @@ UEPresenceInAreaOfInterestItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
UERadioCapability ::= OCTET STRING
UERadioCapabilityForPaging ::= OCTET STRING
UERadioCapabilityForPaging ::= SEQUENCE {
uERadioCapabilityForPagingOfNR UERadioCapabilityForPagingOfNR OPTIONAL,
uERadioCapabilityForPagingOfEUTRA UERadioCapabilityForPagingOfEUTRA OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {UERadioCapabilityForPaging-ExtIEs} } OPTIONAL,
...
}
UERadioCapabilityForPaging-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
UERadioCapabilityForPagingOfNR ::= OCTET STRING
UERadioCapabilityForPagingOfEUTRA ::= OCTET STRING
UESecurityCapabilities ::= SEQUENCE {
nRencryptionAlgorithms NRencryptionAlgorithms,
@ -2905,6 +3128,19 @@ UESecurityCapabilities-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
UL-NGU-UP-TNLModifyList ::= SEQUENCE (SIZE(0..maxnoofMultiConnectivities)) OF UL-NGU-UP-TNLModifyItem
UL-NGU-UP-TNLModifyItem ::= SEQUENCE {
uL-NGU-UP-TNLInformation UPTransportLayerInformation,
dL-NGU-UP-TNLInformation UPTransportLayerInformation,
iE-Extensions ProtocolExtensionContainer { {UL-NGU-UP-TNLModifyItem-ExtIEs} } OPTIONAL,
...
}
UL-NGU-UP-TNLModifyItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
UnavailableGUAMIList ::= SEQUENCE (SIZE(1..maxnoofServedGUAMIs)) OF UnavailableGUAMIItem
UnavailableGUAMIItem ::= SEQUENCE {
@ -2953,7 +3189,7 @@ UserLocationInformationEUTRA ::= SEQUENCE {
eUTRA-CGI EUTRA-CGI,
tAI TAI,
timeStamp TimeStamp OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { UserLocationInformationEUTRA-ExtIEs} } OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {UserLocationInformationEUTRA-ExtIEs} } OPTIONAL,
...
}
@ -2998,6 +3234,8 @@ UserPlaneSecurityInformation-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
-- V
-- W
WarningAreaCoordinates ::= OCTET STRING (SIZE(1..1024))
WarningAreaList ::= CHOICE {
eUTRA-CGIListForWarning EUTRA-CGIListForWarning,
nR-CGIListForWarning NR-CGIListForWarning,

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -71,13 +71,16 @@ IMPORTS
PagingPriority,
PDUSessionAggregateMaximumBitRate,
PDUSessionResourceAdmittedList,
PDUSessionResourceFailedToModifyListModCfm,
PDUSessionResourceFailedToModifyListModRes,
PDUSessionResourceFailedToSetupListCxtFail,
PDUSessionResourceFailedToSetupListCxtRes,
PDUSessionResourceFailedToSetupListHOAck,
PDUSessionResourceFailedToSetupListPSReq,
PDUSessionResourceFailedToSetupListSURes,
PDUSessionResourceHandoverList,
PDUSessionResourceListCxtRelCpl,
PDUSessionResourceListCxtRelReq,
PDUSessionResourceListHORqd,
PDUSessionResourceModifyListModCfm,
PDUSessionResourceModifyListModInd,
@ -131,7 +134,6 @@ IMPORTS
UEAggregateMaximumBitRate,
UE-associatedLogicalNG-connectionList,
UEContextRequest,
UEIdentityIndexValue,
UE-NGAP-IDs,
UEPagingIdentity,
UEPresenceInAreaOfInterestList,
@ -140,6 +142,7 @@ IMPORTS
UESecurityCapabilities,
UnavailableGUAMIList,
UserLocationInformation,
WarningAreaCoordinates,
WarningAreaList,
WarningMessageContents,
WarningSecurityInfo,
@ -212,13 +215,16 @@ FROM NGAP-Containers
id-PagingOrigin,
id-PagingPriority,
id-PDUSessionResourceAdmittedList,
id-PDUSessionResourceFailedToModifyListModCfm,
id-PDUSessionResourceFailedToModifyListModRes,
id-PDUSessionResourceFailedToSetupListCxtFail,
id-PDUSessionResourceFailedToSetupListCxtRes,
id-PDUSessionResourceFailedToSetupListHOAck,
id-PDUSessionResourceFailedToSetupListPSReq,
id-PDUSessionResourceFailedToSetupListSURes,
id-PDUSessionResourceHandoverList,
id-PDUSessionResourceListCxtRelCpl,
id-PDUSessionResourceListCxtRelReq,
id-PDUSessionResourceListHORqd,
id-PDUSessionResourceModifyListModCfm,
id-PDUSessionResourceModifyListModInd,
@ -271,7 +277,6 @@ FROM NGAP-Containers
id-UEAggregateMaximumBitRate,
id-UE-associatedLogicalNG-connectionList,
id-UEContextRequest,
id-UEIdentityIndexValue,
id-UE-NGAP-IDs,
id-UEPagingIdentity,
id-UEPresenceInAreaOfInterestList,
@ -280,6 +285,7 @@ FROM NGAP-Containers
id-UESecurityCapabilities,
id-UnavailableGUAMIList,
id-UserLocationInformation,
id-WarningAreaCoordinates,
id-WarningAreaList,
id-WarningMessageContents,
id-WarningSecurityInfo,
@ -495,10 +501,11 @@ PDUSessionResourceModifyConfirm ::= SEQUENCE {
}
PDUSessionResourceModifyConfirmIEs 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-PDUSessionResourceModifyListModCfm CRITICALITY ignore TYPE PDUSessionResourceModifyListModCfm PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ 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-PDUSessionResourceModifyListModCfm CRITICALITY ignore TYPE PDUSessionResourceModifyListModCfm PRESENCE mandatory }|
{ ID id-PDUSessionResourceFailedToModifyListModCfm CRITICALITY ignore TYPE PDUSessionResourceFailedToModifyListModCfm PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@ -533,7 +540,7 @@ InitialContextSetupRequestIEs NGAP-PROTOCOL-IES ::= {
{ ID id-CoreNetworkAssistanceInformation CRITICALITY ignore TYPE CoreNetworkAssistanceInformation PRESENCE optional }|
{ ID id-GUAMI CRITICALITY reject TYPE GUAMI PRESENCE mandatory }|
{ ID id-PDUSessionResourceSetupListCxtReq CRITICALITY reject TYPE PDUSessionResourceSetupListCxtReq PRESENCE optional }|
{ ID id-AllowedNSSAI CRITICALITY ignore TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE mandatory }|
{ ID id-SecurityKey CRITICALITY reject TYPE SecurityKey PRESENCE mandatory }|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
@ -543,7 +550,8 @@ InitialContextSetupRequestIEs NGAP-PROTOCOL-IES ::= {
{ ID id-MaskedIMEISV CRITICALITY ignore TYPE MaskedIMEISV PRESENCE optional }|
{ ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE optional }|
{ ID id-EmergencyFallbackIndicator CRITICALITY reject TYPE EmergencyFallbackIndicator PRESENCE optional }|
{ ID id-RRCInactiveTransitionReportRequest CRITICALITY ignore TYPE RRCInactiveTransitionReportRequest PRESENCE optional },
{ ID id-RRCInactiveTransitionReportRequest CRITICALITY ignore TYPE RRCInactiveTransitionReportRequest PRESENCE optional }|
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional },
...
}
@ -580,10 +588,11 @@ InitialContextSetupFailure ::= SEQUENCE {
}
InitialContextSetupFailureIEs 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-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ 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-PDUSessionResourceFailedToSetupListCxtFail CRITICALITY ignore TYPE PDUSessionResourceFailedToSetupListCxtFail PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@ -605,9 +614,10 @@ UEContextReleaseRequest ::= SEQUENCE {
}
UEContextReleaseRequest-IEs NGAP-PROTOCOL-IES ::= {
{ ID id-AMF-UE-NGAP-ID CRITICALITY reject TYPE AMF-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
{ ID id-AMF-UE-NGAP-ID CRITICALITY reject TYPE AMF-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-RAN-UE-NGAP-ID CRITICALITY reject TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-PDUSessionResourceListCxtRelReq CRITICALITY reject TYPE PDUSessionResourceListCxtRelReq PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
...
}
@ -630,7 +640,6 @@ UEContextReleaseCommand ::= SEQUENCE {
UEContextReleaseCommand-IEs NGAP-PROTOCOL-IES ::= {
{ ID id-UE-NGAP-IDs CRITICALITY reject TYPE UE-NGAP-IDs PRESENCE mandatory }|
{ ID id-RANPagingPriority CRITICALITY ignore TYPE RANPagingPriority PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
...
}
@ -853,7 +862,7 @@ HandoverRequestIEs NGAP-PROTOCOL-IES ::= {
{ ID id-NewSecurityContextInd CRITICALITY reject TYPE NewSecurityContextInd PRESENCE optional }|
{ ID id-NASC CRITICALITY reject TYPE NAS-PDU PRESENCE optional }|
{ ID id-PDUSessionResourceSetupListHOReq CRITICALITY reject TYPE PDUSessionResourceSetupListHOReq PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY ignore TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
{ ID id-MaskedIMEISV CRITICALITY ignore TYPE MaskedIMEISV PRESENCE optional }|
{ ID id-SourceToTarget-TransparentContainer CRITICALITY reject TYPE SourceToTarget-TransparentContainer PRESENCE mandatory }|
@ -975,7 +984,7 @@ PathSwitchRequestAcknowledgeIEs NGAP-PROTOCOL-IES ::= {
{ ID id-NewSecurityContextInd CRITICALITY ignore TYPE NewSecurityContextInd PRESENCE optional }|
{ ID id-PDUSessionResourceSwitchedList CRITICALITY ignore TYPE PDUSessionResourceSwitchedList PRESENCE mandatory }|
{ ID id-PDUSessionResourceReleasedListPSAck CRITICALITY ignore TYPE PDUSessionResourceReleasedListPSAck PRESENCE optional }|
{ ID id-AllowedNSSAI CRITICALITY ignore TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE mandatory }|
{ ID id-CoreNetworkAssistanceInformation CRITICALITY ignore TYPE CoreNetworkAssistanceInformation PRESENCE optional }|
{ ID id-RRCInactiveTransitionReportRequest CRITICALITY ignore TYPE RRCInactiveTransitionReportRequest PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
@ -1110,7 +1119,6 @@ Paging ::= SEQUENCE {
}
PagingIEs NGAP-PROTOCOL-IES ::= {
{ ID id-UEIdentityIndexValue CRITICALITY ignore TYPE UEIdentityIndexValue PRESENCE mandatory }|
{ ID id-UEPagingIdentity CRITICALITY ignore TYPE UEPagingIdentity PRESENCE mandatory }|
{ ID id-PagingDRX CRITICALITY ignore TYPE PagingDRX PRESENCE optional }|
{ ID id-TAIListForPaging CRITICALITY ignore TYPE TAIListForPaging PRESENCE mandatory }|
@ -1142,7 +1150,7 @@ 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 optional }|
{ 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 }|
@ -1170,7 +1178,7 @@ DownlinkNASTransport-IEs NGAP-PROTOCOL-IES ::= {
{ ID id-MobilityRestrictionList CRITICALITY ignore TYPE MobilityRestrictionList PRESENCE optional }|
{ ID id-IndexToRFSP CRITICALITY ignore TYPE IndexToRFSP PRESENCE optional }|
{ ID id-UEAggregateMaximumBitRate CRITICALITY ignore TYPE UEAggregateMaximumBitRate PRESENCE optional }|
{ ID id-AllowedNSSAI CRITICALITY ignore TYPE AllowedNSSAI PRESENCE optional },
{ ID id-AllowedNSSAI CRITICALITY reject TYPE AllowedNSSAI PRESENCE optional },
...
}
@ -1231,9 +1239,9 @@ RerouteNASRequest-IEs NGAP-PROTOCOL-IES ::= {
{ 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 ignore TYPE AllowedNSSAI PRESENCE optional },
{ 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 },
...
}
@ -1619,7 +1627,8 @@ WriteReplaceWarningRequestIEs NGAP-PROTOCOL-IES ::= {
{ ID id-WarningSecurityInfo CRITICALITY ignore TYPE WarningSecurityInfo PRESENCE optional }|
{ ID id-DataCodingScheme CRITICALITY ignore TYPE DataCodingScheme PRESENCE optional }|
{ ID id-WarningMessageContents CRITICALITY ignore TYPE WarningMessageContents PRESENCE optional }|
{ ID id-ConcurrentWarningMessageInd CRITICALITY reject TYPE ConcurrentWarningMessageInd PRESENCE optional },
{ ID id-ConcurrentWarningMessageInd CRITICALITY reject TYPE ConcurrentWarningMessageInd PRESENCE optional }|
{ ID id-WarningAreaCoordinates CRITICALITY ignore TYPE WarningAreaCoordinates PRESENCE optional },
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V15.1.0 (2018-09)
-- 3GPP TS 38.413 V15.2.0 (2018-12)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -628,4 +628,3 @@ writeReplaceWarning NGAP-ELEMENTARY-PROCEDURE ::= {
}
END

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

@ -494,17 +494,31 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC
}
}
#.FN_BODY UERadioCapabilityForPaging VAL_PTR = &parameter_tvb
#.FN_BODY UERadioCapabilityForPagingOfNR VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb && nr_rrc_ue_radio_paging_info_handle) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_UERadioCapabilityForPaging);
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_UERadioCapabilityForPagingOfNR);
call_dissector(nr_rrc_ue_radio_paging_info_handle, parameter_tvb, actx->pinfo, subtree);
}
#.FN_BODY UERadioCapabilityForPagingOfEUTRA VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb && lte_rrc_ue_radio_paging_info_handle) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_UERadioCapabilityForPagingOfEUTRA);
call_dissector(lte_rrc_ue_radio_paging_info_handle, parameter_tvb, actx->pinfo, subtree);
}
#.TYPE_ATTR
RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY UERadioCapability VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
@ -599,6 +613,9 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 2, fields, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
ExpectedUEMovingTrajectoryItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY LastVisitedEUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
@ -634,6 +651,17 @@ TrafficLoadReductionIndication DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_
#.TYPE_ATTR
PeriodicRegistrationUpdateTimer TYPE=FT_UINT8 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ngap_PeriodicRegistrationUpdateTimer_fmt)
#.FN_BODY NASSecurityParametersFromNGRAN VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_NASSecurityParametersFromNGRAN);
proto_tree_add_item(subtree, hf_ngap_NASSecurityParametersFromNGRAN_sn, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
}
#.ASSIGN_VALUE_TO_TYPE # NGAP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
@ -804,7 +832,6 @@ id-TraceCollectionEntityIPAddress ProtocolIE-ID
id-UEAggregateMaximumBitRate ProtocolIE-ID
id-UE-associatedLogicalNG-connectionList ProtocolIE-ID
id-UEContextRequest ProtocolIE-ID
id-UEIdentityIndexValue ProtocolIE-ID
id-UE-NGAP-IDs ProtocolIE-ID
id-UEPagingIdentity ProtocolIE-ID
id-UEPresenceInAreaOfInterestList ProtocolIE-ID
@ -817,6 +844,22 @@ id-WarningAreaList ProtocolIE-ID
id-WarningMessageContents ProtocolIE-ID
id-WarningSecurityInfo ProtocolIE-ID
id-WarningType ProtocolIE-ID
id-AdditionalUL-NGU-UP-TNLInformation ProtocolIE-ID
id-DataForwardingNotPossible ProtocolIE-ID
id-DL-NGU-UP-TNLInformation ProtocolIE-ID
id-NetworkInstance ProtocolIE-ID
id-PDUSessionAggregateMaximumBitRate ProtocolIE-ID
id-PDUSessionResourceFailedToModifyListModCfm ProtocolIE-ID
id-PDUSessionResourceFailedToSetupListCxtFail ProtocolIE-ID
id-PDUSessionResourceListCxtRelReq ProtocolIE-ID
id-PDUSessionType ProtocolIE-ID
id-QosFlowAddOrModifyRequestList ProtocolIE-ID
id-QosFlowSetupRequestList ProtocolIE-ID
id-QosFlowToReleaseList ProtocolIE-ID
id-SecurityIndication ProtocolIE-ID
id-UL-NGU-UP-TNLInformation ProtocolIE-ID
id-UL-NGU-UP-TNLModifyList ProtocolIE-ID
id-WarningAreaCoordinates ProtocolIE-ID
#.END
@ -937,7 +980,6 @@ TransportLayerAddress N ngap.ies id-TraceCollectionEntityIP
UEAggregateMaximumBitRate N ngap.ies id-UEAggregateMaximumBitRate
UE-associatedLogicalNG-connectionList N ngap.ies id-UE-associatedLogicalNG-connectionList
UEContextRequest N ngap.ies id-UEContextRequest
UEIdentityIndexValue N ngap.ies id-UEIdentityIndexValue
UE-NGAP-IDs N ngap.ies id-UE-NGAP-IDs
UEPagingIdentity N ngap.ies id-UEPagingIdentity
UEPresenceInAreaOfInterestList N ngap.ies id-UEPresenceInAreaOfInterestList
@ -950,6 +992,21 @@ WarningAreaList N ngap.ies id-WarningAreaList
WarningMessageContents N ngap.ies id-WarningMessageContents
WarningSecurityInfo N ngap.ies id-WarningSecurityInfo
WarningType N ngap.ies id-WarningType
UPTransportLayerInformation N ngap.ies id-AdditionalUL-NGU-UP-TNLInformation
DataForwardingNotPossible N ngap.ies id-DataForwardingNotPossible
NetworkInstance N ngap.ies id-NetworkInstance
PDUSessionAggregateMaximumBitRate N ngap.ies id-PDUSessionAggregateMaximumBitRate
PDUSessionResourceFailedToModifyListModCfm N ngap.ies id-PDUSessionResourceFailedToModifyListModCfm
PDUSessionResourceFailedToSetupListCxtFail N ngap.ies id-PDUSessionResourceFailedToSetupListCxtFail
PDUSessionResourceListCxtRelReq N ngap.ies id-PDUSessionResourceListCxtRelReq
PDUSessionType N ngap.ies id-PDUSessionType
QosFlowAddOrModifyRequestList N ngap.ies id-QosFlowAddOrModifyRequestList
QosFlowSetupRequestList N ngap.ies id-QosFlowSetupRequestList
QosFlowList N ngap.ies id-QosFlowToReleaseList
SecurityIndication N ngap.ies id-SecurityIndication
UPTransportLayerInformation N ngap.ies id-UL-NGU-UP-TNLInformation
UL-NGU-UP-TNLModifyList N ngap.ies id-UL-NGU-UP-TNLModifyList
WarningAreaCoordinates N ngap.ies id-WarningAreaCoordinates
#NGAP-ELEMENTARY-PROCEDURE

17
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.0.0 (2018-06)
* References: 3GPP TS 38.413 v15.2.0 (2018-12)
*/
#include "config.h"
@ -47,6 +47,7 @@ static dissector_handle_t ngap_handle;
static dissector_handle_t nas_5gs_handle;
static dissector_handle_t nr_rrc_ue_radio_paging_info_handle;
static dissector_handle_t nr_rrc_ue_radio_access_cap_info_handle;
static dissector_handle_t lte_rrc_ue_radio_paging_info_handle;
#include "packet-ngap-val.h"
@ -83,6 +84,7 @@ static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia1 = -1;
static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia2 = -1;
static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia3 = -1;
static int hf_ngap_EUTRAintegrityProtectionAlgorithms_reserved = -1;
static int hf_ngap_NASSecurityParametersFromNGRAN_sn = -1;
#include "packet-ngap-hf.c"
/* Initialize the subtree pointers */
@ -102,9 +104,11 @@ static gint ett_ngap_NrencryptionAlgorithms = -1;
static gint ett_ngap_NrintegrityProtectionAlgorithms = -1;
static gint ett_ngap_EUTRAencryptionAlgorithms = -1;
static gint ett_ngap_EUTRAintegrityProtectionAlgorithms = -1;
static gint ett_ngap_UERadioCapabilityForPaging = -1;
static gint ett_ngap_UERadioCapabilityForPagingOfNR = -1;
static gint ett_ngap_UERadioCapabilityForPagingOfEUTRA = -1;
static gint ett_ngap_UERadioCapability = -1;
static gint ett_ngap_LastVisitedEUTRANCellInformation = -1;
static gint ett_ngap_NASSecurityParametersFromNGRAN = -1;
#include "packet-ngap-ett.c"
static expert_field ei_ngap_number_pages_le15 = EI_INIT;
@ -423,6 +427,7 @@ proto_reg_handoff_ngap(void)
nas_5gs_handle = find_dissector_add_dependency("nas-5gs", proto_ngap);
nr_rrc_ue_radio_paging_info_handle = find_dissector_add_dependency("nr-rrc.ue_radio_paging_info", proto_ngap);
nr_rrc_ue_radio_access_cap_info_handle = find_dissector_add_dependency("nr-rrc.ue_radio_access_cap_info", proto_ngap);
lte_rrc_ue_radio_paging_info_handle = find_dissector_add_dependency("lte-rrc.ue_radio_paging_info", proto_ngap);
dissector_add_for_decode_as("sctp.port", ngap_handle);
dissector_add_uint("sctp.ppi", NGAP_PROTOCOL_ID, ngap_handle);
Initialized=TRUE;
@ -569,6 +574,10 @@ void proto_register_ngap(void) {
{ "Reserved", "ngap.EUTRAintegrityProtectionAlgorithms.reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{ &hf_ngap_NASSecurityParametersFromNGRAN_sn,
{ "NAS Sequence Number", "ngap.NASSecurityParametersFromNGRAN.sn",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
#include "packet-ngap-hfarr.c"
};
@ -590,9 +599,11 @@ void proto_register_ngap(void) {
&ett_ngap_NrintegrityProtectionAlgorithms,
&ett_ngap_EUTRAencryptionAlgorithms,
&ett_ngap_EUTRAintegrityProtectionAlgorithms,
&ett_ngap_UERadioCapabilityForPaging,
&ett_ngap_UERadioCapabilityForPagingOfNR,
&ett_ngap_UERadioCapabilityForPagingOfEUTRA,
&ett_ngap_UERadioCapability,
&ett_ngap_LastVisitedEUTRANCellInformation,
&ett_ngap_NASSecurityParametersFromNGRAN,
#include "packet-ngap-ettarr.c"
};

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

File diff suppressed because it is too large Load Diff