diff --git a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn index 648246e897..880620618f 100644 --- a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn @@ -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 -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-Constants.asn b/epan/dissectors/asn1/ngap/NGAP-Constants.asn index 8d45e1d4a3..ba72b430d8 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Constants.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Constants.asn @@ -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 diff --git a/epan/dissectors/asn1/ngap/NGAP-Containers.asn b/epan/dissectors/asn1/ngap/NGAP-Containers.asn index f2b551f7ca..745fb28b88 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Containers.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Containers.asn @@ -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 -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-IEs.asn b/epan/dissectors/asn1/ngap/NGAP-IEs.asn index a96036b3f7..89afb099e2 100644 --- a/epan/dissectors/asn1/ngap/NGAP-IEs.asn +++ b/epan/dissectors/asn1/ngap/NGAP-IEs.asn @@ -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, diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn index 705e7f95a3..0f98a14916 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn @@ -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 }, ... } diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn index 87fff9d24a..d5aabcf23d 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn @@ -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 - diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index 20ead1e46b..8b6c817686 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -494,17 +494,31 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC } } -#.FN_BODY UERadioCapabilityForPaging VAL_PTR = ¶meter_tvb +#.FN_BODY UERadioCapabilityForPagingOfNR VAL_PTR = ¶meter_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 = ¶meter_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 = ¶meter_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 = ¶meter_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 = ¶meter_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 diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index d4b1ee7e04..4c66b285a1 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -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" }; diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index 67104dca2b..7ddbc9e994 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -16,7 +16,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" @@ -55,6 +55,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; /*--- Included file: packet-ngap-val.h ---*/ @@ -81,7 +82,7 @@ static dissector_handle_t nr_rrc_ue_radio_access_cap_info_handle; #define maxnoofE_RABs 256 #define maxnoofErrors 256 #define maxnoofForbTACs 4096 -#define maxnoofMultiConnectivities 8 +#define maxnoofMultiConnectivities 4 #define maxnoofNGConnectionsToReset 65536 #define maxnoofPDUSessions 256 #define maxnoofPLMNs 12 @@ -272,7 +273,7 @@ typedef enum _ProtocolIE_ID_enum { id_UEAggregateMaximumBitRate = 110, id_UE_associatedLogicalNG_connectionList = 111, id_UEContextRequest = 112, - id_UEIdentityIndexValue = 113, + id_Unknown_113 = 113, id_UE_NGAP_IDs = 114, id_UEPagingIdentity = 115, id_UEPresenceInAreaOfInterestList = 116, @@ -284,7 +285,23 @@ typedef enum _ProtocolIE_ID_enum { id_WarningAreaList = 122, id_WarningMessageContents = 123, id_WarningSecurityInfo = 124, - id_WarningType = 125 + id_WarningType = 125, + id_AdditionalUL_NGU_UP_TNLInformation = 126, + id_DataForwardingNotPossible = 127, + id_DL_NGU_UP_TNLInformation = 128, + id_NetworkInstance = 129, + id_PDUSessionAggregateMaximumBitRate = 130, + id_PDUSessionResourceFailedToModifyListModCfm = 131, + id_PDUSessionResourceFailedToSetupListCxtFail = 132, + id_PDUSessionResourceListCxtRelReq = 133, + id_PDUSessionType = 134, + id_QosFlowAddOrModifyRequestList = 135, + id_QosFlowSetupRequestList = 136, + id_QosFlowToReleaseList = 137, + id_SecurityIndication = 138, + id_UL_NGU_UP_TNLInformation = 139, + id_UL_NGU_UP_TNLModifyList = 140, + id_WarningAreaCoordinates = 141 } ProtocolIE_ID_enum; typedef enum _GlobalRANNodeID_enum { @@ -301,7 +318,7 @@ typedef enum _HandoverType_enum { } HandoverType_enum; /*--- End of included file: packet-ngap-val.h ---*/ -#line 52 "./asn1/ngap/packet-ngap-template.c" +#line 53 "./asn1/ngap/packet-ngap-template.c" /* Initialize the protocol and registered fields */ static int proto_ngap = -1; @@ -336,6 +353,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; /*--- Included file: packet-ngap-hf.c ---*/ #line 1 "./asn1/ngap/packet-ngap-hf.c" @@ -357,6 +375,7 @@ static int hf_ngap_ConcurrentWarningMessageInd_PDU = -1; /* ConcurrentWarningMe static int hf_ngap_CoreNetworkAssistanceInformation_PDU = -1; /* CoreNetworkAssistanceInformation */ static int hf_ngap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ static int hf_ngap_DataCodingScheme_PDU = -1; /* DataCodingScheme */ +static int hf_ngap_DataForwardingNotPossible_PDU = -1; /* DataForwardingNotPossible */ static int hf_ngap_DirectForwardingPathAvailability_PDU = -1; /* DirectForwardingPathAvailability */ static int hf_ngap_EmergencyAreaIDListForRestart_PDU = -1; /* EmergencyAreaIDListForRestart */ static int hf_ngap_EmergencyFallbackIndicator_PDU = -1; /* EmergencyFallbackIndicator */ @@ -374,6 +393,7 @@ static int hf_ngap_MessageIdentifier_PDU = -1; /* MessageIdentifier */ static int hf_ngap_MobilityRestrictionList_PDU = -1; /* MobilityRestrictionList */ static int hf_ngap_NAS_PDU_PDU = -1; /* NAS_PDU */ static int hf_ngap_NASSecurityParametersFromNGRAN_PDU = -1; /* NASSecurityParametersFromNGRAN */ +static int hf_ngap_NetworkInstance_PDU = -1; /* NetworkInstance */ static int hf_ngap_NewSecurityContextInd_PDU = -1; /* NewSecurityContextInd */ static int hf_ngap_NGRAN_CGI_PDU = -1; /* NGRAN_CGI */ static int hf_ngap_NGRANTraceID_PDU = -1; /* NGRANTraceID */ @@ -385,14 +405,18 @@ static int hf_ngap_OverloadStartNSSAIList_PDU = -1; /* OverloadStartNSSAIList * static int hf_ngap_PagingDRX_PDU = -1; /* PagingDRX */ static int hf_ngap_PagingOrigin_PDU = -1; /* PagingOrigin */ static int hf_ngap_PagingPriority_PDU = -1; /* PagingPriority */ +static int hf_ngap_PDUSessionAggregateMaximumBitRate_PDU = -1; /* PDUSessionAggregateMaximumBitRate */ static int hf_ngap_PDUSessionResourceAdmittedList_PDU = -1; /* PDUSessionResourceAdmittedList */ +static int hf_ngap_PDUSessionResourceFailedToModifyListModCfm_PDU = -1; /* PDUSessionResourceFailedToModifyListModCfm */ static int hf_ngap_PDUSessionResourceFailedToModifyListModRes_PDU = -1; /* PDUSessionResourceFailedToModifyListModRes */ +static int hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_PDU = -1; /* PDUSessionResourceFailedToSetupListCxtFail */ static int hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_PDU = -1; /* PDUSessionResourceFailedToSetupListCxtRes */ static int hf_ngap_PDUSessionResourceFailedToSetupListHOAck_PDU = -1; /* PDUSessionResourceFailedToSetupListHOAck */ static int hf_ngap_PDUSessionResourceFailedToSetupListPSReq_PDU = -1; /* PDUSessionResourceFailedToSetupListPSReq */ static int hf_ngap_PDUSessionResourceFailedToSetupListSURes_PDU = -1; /* PDUSessionResourceFailedToSetupListSURes */ static int hf_ngap_PDUSessionResourceHandoverList_PDU = -1; /* PDUSessionResourceHandoverList */ static int hf_ngap_PDUSessionResourceListCxtRelCpl_PDU = -1; /* PDUSessionResourceListCxtRelCpl */ +static int hf_ngap_PDUSessionResourceListCxtRelReq_PDU = -1; /* PDUSessionResourceListCxtRelReq */ static int hf_ngap_PDUSessionResourceListHORqd_PDU = -1; /* PDUSessionResourceListHORqd */ static int hf_ngap_PDUSessionResourceModifyListModCfm_PDU = -1; /* PDUSessionResourceModifyListModCfm */ static int hf_ngap_PDUSessionResourceModifyListModInd_PDU = -1; /* PDUSessionResourceModifyListModInd */ @@ -412,8 +436,12 @@ static int hf_ngap_PDUSessionResourceSwitchedList_PDU = -1; /* PDUSessionResour static int hf_ngap_PDUSessionResourceToBeSwitchedDLList_PDU = -1; /* PDUSessionResourceToBeSwitchedDLList */ static int hf_ngap_PDUSessionResourceToReleaseListHOCmd_PDU = -1; /* PDUSessionResourceToReleaseListHOCmd */ static int hf_ngap_PDUSessionResourceToReleaseListRelCmd_PDU = -1; /* PDUSessionResourceToReleaseListRelCmd */ +static int hf_ngap_PDUSessionType_PDU = -1; /* PDUSessionType */ static int hf_ngap_PLMNSupportList_PDU = -1; /* PLMNSupportList */ static int hf_ngap_PWSFailedCellIDList_PDU = -1; /* PWSFailedCellIDList */ +static int hf_ngap_QosFlowAddOrModifyRequestList_PDU = -1; /* QosFlowAddOrModifyRequestList */ +static int hf_ngap_QosFlowList_PDU = -1; /* QosFlowList */ +static int hf_ngap_QosFlowSetupRequestList_PDU = -1; /* QosFlowSetupRequestList */ static int hf_ngap_RANNodeName_PDU = -1; /* RANNodeName */ static int hf_ngap_RANPagingPriority_PDU = -1; /* RANPagingPriority */ static int hf_ngap_RANStatusTransfer_TransparentContainer_PDU = -1; /* RANStatusTransfer_TransparentContainer */ @@ -426,6 +454,7 @@ static int hf_ngap_RRCEstablishmentCause_PDU = -1; /* RRCEstablishmentCause */ static int hf_ngap_RRCInactiveTransitionReportRequest_PDU = -1; /* RRCInactiveTransitionReportRequest */ static int hf_ngap_RRCState_PDU = -1; /* RRCState */ static int hf_ngap_SecurityContext_PDU = -1; /* SecurityContext */ +static int hf_ngap_SecurityIndication_PDU = -1; /* SecurityIndication */ static int hf_ngap_SecurityKey_PDU = -1; /* SecurityKey */ static int hf_ngap_SerialNumber_PDU = -1; /* SerialNumber */ static int hf_ngap_ServedGUAMIList_PDU = -1; /* ServedGUAMIList */ @@ -447,15 +476,17 @@ static int hf_ngap_TransportLayerAddress_PDU = -1; /* TransportLayerAddress */ static int hf_ngap_UEAggregateMaximumBitRate_PDU = -1; /* UEAggregateMaximumBitRate */ static int hf_ngap_UE_associatedLogicalNG_connectionList_PDU = -1; /* UE_associatedLogicalNG_connectionList */ static int hf_ngap_UEContextRequest_PDU = -1; /* UEContextRequest */ -static int hf_ngap_UEIdentityIndexValue_PDU = -1; /* UEIdentityIndexValue */ static int hf_ngap_UE_NGAP_IDs_PDU = -1; /* UE_NGAP_IDs */ static int hf_ngap_UEPagingIdentity_PDU = -1; /* UEPagingIdentity */ static int hf_ngap_UEPresenceInAreaOfInterestList_PDU = -1; /* UEPresenceInAreaOfInterestList */ static int hf_ngap_UERadioCapability_PDU = -1; /* UERadioCapability */ static int hf_ngap_UERadioCapabilityForPaging_PDU = -1; /* UERadioCapabilityForPaging */ static int hf_ngap_UESecurityCapabilities_PDU = -1; /* UESecurityCapabilities */ +static int hf_ngap_UL_NGU_UP_TNLModifyList_PDU = -1; /* UL_NGU_UP_TNLModifyList */ static int hf_ngap_UnavailableGUAMIList_PDU = -1; /* UnavailableGUAMIList */ +static int hf_ngap_UPTransportLayerInformation_PDU = -1; /* UPTransportLayerInformation */ static int hf_ngap_UserLocationInformation_PDU = -1; /* UserLocationInformation */ +static int hf_ngap_WarningAreaCoordinates_PDU = -1; /* WarningAreaCoordinates */ static int hf_ngap_WarningAreaList_PDU = -1; /* WarningAreaList */ static int hf_ngap_WarningMessageContents_PDU = -1; /* WarningMessageContents */ static int hf_ngap_WarningSecurityInfo_PDU = -1; /* WarningSecurityInfo */ @@ -541,6 +572,7 @@ static int hf_ngap_UERadioCapabilityCheckResponse_PDU = -1; /* UERadioCapabilit static int hf_ngap_PrivateMessage_PDU = -1; /* PrivateMessage */ static int hf_ngap_NGAP_PDU_PDU = -1; /* NGAP_PDU */ static int hf_ngap_HandoverRequestAcknowledgeTransfer_PDU = -1; /* HandoverRequestAcknowledgeTransfer */ +static int hf_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU = -1; /* PDUSessionResourceModifyIndicationUnsuccessfulTransfer */ static int hf_ngap_PDUSessionResourceModifyUnsuccessfulTransfer_PDU = -1; /* PDUSessionResourceModifyUnsuccessfulTransfer */ static int hf_ngap_PDUSessionResourceSetupUnsuccessfulTransfer_PDU = -1; /* PDUSessionResourceSetupUnsuccessfulTransfer */ static int hf_ngap_HandoverResourceAllocationUnsuccessfulTransfer_PDU = -1; /* HandoverResourceAllocationUnsuccessfulTransfer */ @@ -604,7 +636,8 @@ static int hf_ngap_assistanceDataForRecommendedCells = -1; /* AssistanceDataFor static int hf_ngap_pagingAttemptInformation = -1; /* PagingAttemptInformation */ static int hf_ngap_recommendedCellsForPaging = -1; /* RecommendedCellsForPaging */ static int hf_ngap_AssociatedQosFlowList_item = -1; /* AssociatedQosFlowItem */ -static int hf_ngap_qosFlowIndicator = -1; /* QosFlowIndicator */ +static int hf_ngap_qosFlowIdentifier = -1; /* QosFlowIdentifier */ +static int hf_ngap_qosFlowMappingIndication = -1; /* T_qosFlowMappingIndication */ static int hf_ngap_cellIDCancelledEUTRA = -1; /* CellIDCancelledEUTRA */ static int hf_ngap_tAICancelledEUTRA = -1; /* TAICancelledEUTRA */ static int hf_ngap_emergencyAreaIDCancelledEUTRA = -1; /* EmergencyAreaIDCancelledEUTRA */ @@ -649,6 +682,10 @@ static int hf_ngap_periodicRegistrationUpdateTimer = -1; /* PeriodicRegistratio static int hf_ngap_mICOModeIndication = -1; /* MICOModeIndication */ static int hf_ngap_tAIListForInactive = -1; /* TAIListForInactive */ static int hf_ngap_expectedUEBehaviour = -1; /* ExpectedUEBehaviour */ +static int hf_ngap_pDCP_SN12 = -1; /* INTEGER_0_4095 */ +static int hf_ngap_hFN_PDCP_SN12 = -1; /* INTEGER_0_1048575 */ +static int hf_ngap_pDCP_SN18 = -1; /* INTEGER_0_262143 */ +static int hf_ngap_hFN_PDCP_SN18 = -1; /* INTEGER_0_16383 */ static int hf_ngap_endpointIPAddress = -1; /* TransportLayerAddress */ static int hf_ngap_procedureCode = -1; /* ProcedureCode */ static int hf_ngap_triggeringMessage = -1; /* TriggeringMessage */ @@ -662,6 +699,20 @@ static int hf_ngap_DataForwardingResponseDRBList_item = -1; /* DataForwardingRe static int hf_ngap_dRB_ID = -1; /* DRB_ID */ static int hf_ngap_dLForwardingUP_TNLInformation = -1; /* UPTransportLayerInformation */ static int hf_ngap_uLForwardingUP_TNLInformation = -1; /* UPTransportLayerInformation */ +static int hf_ngap_DRBsSubjectToStatusTransferList_item = -1; /* DRBsSubjectToStatusTransferItem */ +static int hf_ngap_dRBStatusUL = -1; /* DRBStatusUL */ +static int hf_ngap_dRBStatusDL = -1; /* DRBStatusDL */ +static int hf_ngap_iE_Extension = -1; /* ProtocolExtensionContainer */ +static int hf_ngap_dRBStatusDL12 = -1; /* DRBStatusDL12 */ +static int hf_ngap_dRBStatusDL18 = -1; /* DRBStatusDL18 */ +static int hf_ngap_dL_COUNTValue = -1; /* COUNTValueForPDCP_SN12 */ +static int hf_ngap_dL_COUNTValue_01 = -1; /* COUNTValueForPDCP_SN18 */ +static int hf_ngap_dRBStatusUL12 = -1; /* DRBStatusUL12 */ +static int hf_ngap_dRBStatusUL18 = -1; /* DRBStatusUL18 */ +static int hf_ngap_uL_COUNTValue = -1; /* COUNTValueForPDCP_SN12 */ +static int hf_ngap_receiveStatusOfUL_PDCP_SDUs = -1; /* BIT_STRING_SIZE_1_2048 */ +static int hf_ngap_uL_COUNTValue_01 = -1; /* COUNTValueForPDCP_SN18 */ +static int hf_ngap_receiveStatusOfUL_PDCP_SDUs_01 = -1; /* BIT_STRING_SIZE_1_131072 */ static int hf_ngap_DRBsToQosFlowsMappingList_item = -1; /* DRBsToQosFlowsMappingItem */ static int hf_ngap_associatedQosFlowList = -1; /* AssociatedQosFlowList */ static int hf_ngap_priorityLevelQos = -1; /* PriorityLevelQos */ @@ -732,6 +783,7 @@ static int hf_ngap_securityResult = -1; /* SecurityResult */ static int hf_ngap_qosFlowSetupResponseList = -1; /* QosFlowSetupResponseListHOReqAck */ static int hf_ngap_qosFlowFailedToSetupList = -1; /* QosFlowList */ static int hf_ngap_directForwardingPathAvailability = -1; /* DirectForwardingPathAvailability */ +static int hf_ngap_criticalityDiagnostics = -1; /* CriticalityDiagnostics */ static int hf_ngap_recommendRANNodesForPaging = -1; /* RecommendedRANNodesForPaging */ static int hf_ngap_nGRANCell = -1; /* LastVisitedNGRANCellInformation */ static int hf_ngap_eUTRANCell = -1; /* LastVisitedEUTRANCellInformation */ @@ -773,6 +825,7 @@ static int hf_ngap_intendedNumberOfPagingAttempts = -1; /* IntendedNumberOfPagi static int hf_ngap_nextPagingAreaScope = -1; /* NextPagingAreaScope */ static int hf_ngap_uL_NGU_UP_TNLInformation = -1; /* UPTransportLayerInformation */ static int hf_ngap_securityIndication = -1; /* SecurityIndication */ +static int hf_ngap_dL_NGU_TNLInformationReused = -1; /* DL_NGU_TNLInformationReused */ static int hf_ngap_userPlaneSecurityInformation = -1; /* UserPlaneSecurityInformation */ static int hf_ngap_qosFlowAcceptedList = -1; /* QosFlowAcceptedList */ static int hf_ngap_pDUSessionAggregateMaximumBitRateDL = -1; /* BitRate */ @@ -780,30 +833,35 @@ static int hf_ngap_pDUSessionAggregateMaximumBitRateUL = -1; /* BitRate */ static int hf_ngap_PDUSessionResourceAdmittedList_item = -1; /* PDUSessionResourceAdmittedItem */ static int hf_ngap_pDUSessionID = -1; /* PDUSessionID */ static int hf_ngap_handoverRequestAcknowledgeTransfer = -1; /* T_handoverRequestAcknowledgeTransfer */ +static int hf_ngap_PDUSessionResourceFailedToModifyListModCfm_item = -1; /* PDUSessionResourceFailedToModifyItemModCfm */ +static int hf_ngap_pDUSessionResourceModifyIndicationUnsuccessfulTransfer = -1; /* T_pDUSessionResourceModifyIndicationUnsuccessfulTransfer */ static int hf_ngap_PDUSessionResourceFailedToModifyListModRes_item = -1; /* PDUSessionResourceFailedToModifyItemModRes */ static int hf_ngap_pDUSessionResourceModifyUnsuccessfulTransfer = -1; /* T_pDUSessionResourceModifyUnsuccessfulTransfer */ -static int hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_item = -1; /* PDUSessionResourceFailedToSetupItemCxtRes */ +static int hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_item = -1; /* PDUSessionResourceFailedToSetupItemCxtFail */ static int hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer = -1; /* T_pDUSessionResourceSetupUnsuccessfulTransfer */ +static int hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_item = -1; /* PDUSessionResourceFailedToSetupItemCxtRes */ +static int hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01 = -1; /* T_pDUSessionResourceSetupUnsuccessfulTransfer_01 */ static int hf_ngap_PDUSessionResourceFailedToSetupListHOAck_item = -1; /* PDUSessionResourceFailedToSetupItemHOAck */ static int hf_ngap_handoverResourceAllocationUnsuccessfulTransfer = -1; /* T_handoverResourceAllocationUnsuccessfulTransfer */ static int hf_ngap_PDUSessionResourceFailedToSetupListPSReq_item = -1; /* PDUSessionResourceFailedToSetupItemPSReq */ static int hf_ngap_pathSwitchRequestSetupFailedTransfer = -1; /* T_pathSwitchRequestSetupFailedTransfer */ static int hf_ngap_PDUSessionResourceFailedToSetupListSURes_item = -1; /* PDUSessionResourceFailedToSetupItemSURes */ -static int hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01 = -1; /* T_pDUSessionResourceSetupUnsuccessfulTransfer_01 */ +static int hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_02 = -1; /* T_pDUSessionResourceSetupUnsuccessfulTransfer_02 */ static int hf_ngap_PDUSessionResourceHandoverList_item = -1; /* PDUSessionResourceHandoverItem */ static int hf_ngap_handoverCommandTransfer = -1; /* T_handoverCommandTransfer */ static int hf_ngap_PDUSessionResourceInformationList_item = -1; /* PDUSessionResourceInformationItem */ static int hf_ngap_qosFlowInformationList = -1; /* QosFlowInformationList */ static int hf_ngap_dRBsToQosFlowsMappingList = -1; /* DRBsToQosFlowsMappingList */ static int hf_ngap_PDUSessionResourceListCxtRelCpl_item = -1; /* PDUSessionResourceItemCxtRelCpl */ +static int hf_ngap_PDUSessionResourceListCxtRelReq_item = -1; /* PDUSessionResourceItemCxtRelReq */ static int hf_ngap_PDUSessionResourceListHORqd_item = -1; /* PDUSessionResourceItemHORqd */ static int hf_ngap_handoverRequiredTransfer = -1; /* T_handoverRequiredTransfer */ static int hf_ngap_qosFlowModifyConfirmList = -1; /* QosFlowModifyConfirmList */ +static int hf_ngap_tNLMappingList = -1; /* TNLMappingList */ static int hf_ngap_qosFlowFailedToModifyList = -1; /* QosFlowList */ -static int hf_ngap_pDUSessionAggregateMaximumBitRate = -1; /* PDUSessionAggregateMaximumBitRate */ -static int hf_ngap_qosFlowAddOrModifyRequestList = -1; /* QosFlowAddOrModifyRequestList */ -static int hf_ngap_qosFlowToReleaseList = -1; /* QosFlowList */ +static int hf_ngap_protocolIEs = -1; /* ProtocolIE_Container */ static int hf_ngap_qosFlowAddOrModifyResponseList = -1; /* QosFlowAddOrModifyResponseList */ +static int hf_ngap_additionalQosFlowPerTNLInformation = -1; /* QosFlowPerTNLInformation */ static int hf_ngap_qosFlowFailedToAddOrModifyList = -1; /* QosFlowList */ static int hf_ngap_dL_UP_TNLInformation = -1; /* UP_TNLInformation */ static int hf_ngap_PDUSessionResourceModifyListModCfm_item = -1; /* PDUSessionResourceModifyItemModCfm */ @@ -838,12 +896,7 @@ static int hf_ngap_pDUSessionNAS_PDU = -1; /* NAS_PDU */ static int hf_ngap_pDUSessionResourceSetupRequestTransfer_01 = -1; /* T_pDUSessionResourceSetupRequestTransfer_01 */ static int hf_ngap_PDUSessionResourceSetupListSURes_item = -1; /* PDUSessionResourceSetupItemSURes */ static int hf_ngap_pDUSessionResourceSetupResponseTransfer_01 = -1; /* T_pDUSessionResourceSetupResponseTransfer_01 */ -static int hf_ngap_additionalUL_NGU_UP_TNLInformation = -1; /* UPTransportLayerInformation */ -static int hf_ngap_dataForwardingNotPossible = -1; /* DataForwardingNotPossible */ -static int hf_ngap_pDUSessionType = -1; /* PDUSessionType */ -static int hf_ngap_qosFlowSetupRequestList = -1; /* QosFlowSetupRequestList */ static int hf_ngap_qosFlowPerTNLInformation = -1; /* QosFlowPerTNLInformation */ -static int hf_ngap_additionalQosFlowPerTNLInformation = -1; /* QosFlowPerTNLInformation */ static int hf_ngap_PDUSessionResourceSwitchedList_item = -1; /* PDUSessionResourceSwitchedItem */ static int hf_ngap_pathSwitchRequestAcknowledgeTransfer = -1; /* T_pathSwitchRequestAcknowledgeTransfer */ static int hf_ngap_PDUSessionResourceToBeSwitchedDLList_item = -1; /* PDUSessionResourceToBeSwitchedDLItem */ @@ -877,6 +930,7 @@ static int hf_ngap_QosFlowSetupRequestList_item = -1; /* QosFlowSetupRequestIte static int hf_ngap_QosFlowSetupResponseListHOReqAck_item = -1; /* QosFlowSetupResponseItemHOReqAck */ static int hf_ngap_dataForwardingAccepted = -1; /* DataForwardingAccepted */ static int hf_ngap_QosFlowToBeForwardedList_item = -1; /* QosFlowToBeForwardedItem */ +static int hf_ngap_dRBsSubjectToStatusTransferList = -1; /* DRBsSubjectToStatusTransferList */ static int hf_ngap_RATRestrictions_item = -1; /* RATRestrictions_Item */ static int hf_ngap_rATRestrictionInformation = -1; /* RATRestrictionInformation */ static int hf_ngap_recommendedCellList = -1; /* RecommendedCellList */ @@ -937,6 +991,7 @@ static int hf_ngap_targeteNB_ID = -1; /* TargeteNB_ID */ static int hf_ngap_TNLAssociationList_item = -1; /* TNLAssociationItem */ static int hf_ngap_tNLAssociationAddress = -1; /* CPTransportLayerInformation */ static int hf_ngap_TNLInformationList_item = -1; /* TNLInformationItem */ +static int hf_ngap_TNLMappingList_item = -1; /* TNLMappingItem */ static int hf_ngap_nGRANTraceID = -1; /* NGRANTraceID */ static int hf_ngap_interfacesToTrace = -1; /* InterfacesToTrace */ static int hf_ngap_traceDepth = -1; /* TraceDepth */ @@ -952,10 +1007,13 @@ static int hf_ngap_uE_NGAP_ID_pair = -1; /* UE_NGAP_ID_pair */ static int hf_ngap_fiveG_S_TMSI = -1; /* FiveG_S_TMSI */ static int hf_ngap_UEPresenceInAreaOfInterestList_item = -1; /* UEPresenceInAreaOfInterestItem */ static int hf_ngap_uEPresence = -1; /* UEPresence */ +static int hf_ngap_uERadioCapabilityForPagingOfNR = -1; /* UERadioCapabilityForPagingOfNR */ +static int hf_ngap_uERadioCapabilityForPagingOfEUTRA = -1; /* UERadioCapabilityForPagingOfEUTRA */ static int hf_ngap_nRencryptionAlgorithms = -1; /* NRencryptionAlgorithms */ static int hf_ngap_nRintegrityProtectionAlgorithms = -1; /* NRintegrityProtectionAlgorithms */ static int hf_ngap_eUTRAencryptionAlgorithms = -1; /* EUTRAencryptionAlgorithms */ static int hf_ngap_eUTRAintegrityProtectionAlgorithms = -1; /* EUTRAintegrityProtectionAlgorithms */ +static int hf_ngap_UL_NGU_UP_TNLModifyList_item = -1; /* UL_NGU_UP_TNLModifyItem */ static int hf_ngap_UnavailableGUAMIList_item = -1; /* UnavailableGUAMIItem */ static int hf_ngap_timerApproachForGUAMIRemoval = -1; /* TimerApproachForGUAMIRemoval */ static int hf_ngap_singleTNLInformation = -1; /* SingleTNLInformation */ @@ -978,7 +1036,6 @@ static int hf_ngap_XnGTP_TLAs_item = -1; /* TransportLayerAddress */ static int hf_ngap_XnTLAs_item = -1; /* TransportLayerAddress */ static int hf_ngap_xnTransportLayerAddresses = -1; /* XnTLAs */ static int hf_ngap_xnExtendedTransportLayerAddresses = -1; /* XnExtTLAs */ -static int hf_ngap_protocolIEs = -1; /* ProtocolIE_Container */ static int hf_ngap_privateIEs = -1; /* PrivateIE_Container */ static int hf_ngap_initiatingMessage = -1; /* InitiatingMessage */ static int hf_ngap_successfulOutcome = -1; /* SuccessfulOutcome */ @@ -988,7 +1045,7 @@ static int hf_ngap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_ngap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-ngap-hf.c ---*/ -#line 87 "./asn1/ngap/packet-ngap-template.c" +#line 89 "./asn1/ngap/packet-ngap-template.c" /* Initialize the subtree pointers */ static gint ett_ngap = -1; @@ -1007,9 +1064,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; /*--- Included file: packet-ngap-ett.c ---*/ #line 1 "./asn1/ngap/packet-ngap-ett.c" @@ -1078,12 +1137,22 @@ static gint ett_ngap_CompletedCellsInTAI_EUTRA_Item = -1; static gint ett_ngap_CompletedCellsInTAI_NR = -1; static gint ett_ngap_CompletedCellsInTAI_NR_Item = -1; static gint ett_ngap_CoreNetworkAssistanceInformation = -1; +static gint ett_ngap_COUNTValueForPDCP_SN12 = -1; +static gint ett_ngap_COUNTValueForPDCP_SN18 = -1; static gint ett_ngap_CPTransportLayerInformation = -1; static gint ett_ngap_CriticalityDiagnostics = -1; static gint ett_ngap_CriticalityDiagnostics_IE_List = -1; static gint ett_ngap_CriticalityDiagnostics_IE_Item = -1; static gint ett_ngap_DataForwardingResponseDRBList = -1; static gint ett_ngap_DataForwardingResponseDRBItem = -1; +static gint ett_ngap_DRBsSubjectToStatusTransferList = -1; +static gint ett_ngap_DRBsSubjectToStatusTransferItem = -1; +static gint ett_ngap_DRBStatusDL = -1; +static gint ett_ngap_DRBStatusDL12 = -1; +static gint ett_ngap_DRBStatusDL18 = -1; +static gint ett_ngap_DRBStatusUL = -1; +static gint ett_ngap_DRBStatusUL12 = -1; +static gint ett_ngap_DRBStatusUL18 = -1; static gint ett_ngap_DRBsToQosFlowsMappingList = -1; static gint ett_ngap_DRBsToQosFlowsMappingItem = -1; static gint ett_ngap_Dynamic5QIDescriptor = -1; @@ -1153,8 +1222,12 @@ static gint ett_ngap_PathSwitchRequestUnsuccessfulTransfer = -1; static gint ett_ngap_PDUSessionAggregateMaximumBitRate = -1; static gint ett_ngap_PDUSessionResourceAdmittedList = -1; static gint ett_ngap_PDUSessionResourceAdmittedItem = -1; +static gint ett_ngap_PDUSessionResourceFailedToModifyListModCfm = -1; +static gint ett_ngap_PDUSessionResourceFailedToModifyItemModCfm = -1; static gint ett_ngap_PDUSessionResourceFailedToModifyListModRes = -1; static gint ett_ngap_PDUSessionResourceFailedToModifyItemModRes = -1; +static gint ett_ngap_PDUSessionResourceFailedToSetupListCxtFail = -1; +static gint ett_ngap_PDUSessionResourceFailedToSetupItemCxtFail = -1; static gint ett_ngap_PDUSessionResourceFailedToSetupListCxtRes = -1; static gint ett_ngap_PDUSessionResourceFailedToSetupItemCxtRes = -1; static gint ett_ngap_PDUSessionResourceFailedToSetupListHOAck = -1; @@ -1169,9 +1242,12 @@ static gint ett_ngap_PDUSessionResourceInformationList = -1; static gint ett_ngap_PDUSessionResourceInformationItem = -1; static gint ett_ngap_PDUSessionResourceListCxtRelCpl = -1; static gint ett_ngap_PDUSessionResourceItemCxtRelCpl = -1; +static gint ett_ngap_PDUSessionResourceListCxtRelReq = -1; +static gint ett_ngap_PDUSessionResourceItemCxtRelReq = -1; static gint ett_ngap_PDUSessionResourceListHORqd = -1; static gint ett_ngap_PDUSessionResourceItemHORqd = -1; static gint ett_ngap_PDUSessionResourceModifyConfirmTransfer = -1; +static gint ett_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer = -1; static gint ett_ngap_PDUSessionResourceModifyRequestTransfer = -1; static gint ett_ngap_PDUSessionResourceModifyResponseTransfer = -1; static gint ett_ngap_PDUSessionResourceModifyIndicationTransfer = -1; @@ -1245,6 +1321,7 @@ static gint ett_ngap_QosFlowSetupResponseListHOReqAck = -1; static gint ett_ngap_QosFlowSetupResponseItemHOReqAck = -1; static gint ett_ngap_QosFlowToBeForwardedList = -1; static gint ett_ngap_QosFlowToBeForwardedItem = -1; +static gint ett_ngap_RANStatusTransfer_TransparentContainer = -1; static gint ett_ngap_RATRestrictions = -1; static gint ett_ngap_RATRestrictions_Item = -1; static gint ett_ngap_RecommendedCellsForPaging = -1; @@ -1297,6 +1374,8 @@ static gint ett_ngap_TNLAssociationList = -1; static gint ett_ngap_TNLAssociationItem = -1; static gint ett_ngap_TNLInformationList = -1; static gint ett_ngap_TNLInformationItem = -1; +static gint ett_ngap_TNLMappingList = -1; +static gint ett_ngap_TNLMappingItem = -1; static gint ett_ngap_TraceActivation = -1; static gint ett_ngap_UEAggregateMaximumBitRate = -1; static gint ett_ngap_UE_associatedLogicalNG_connectionList = -1; @@ -1308,7 +1387,10 @@ static gint ett_ngap_UE_NGAP_ID_pair = -1; static gint ett_ngap_UEPagingIdentity = -1; static gint ett_ngap_UEPresenceInAreaOfInterestList = -1; static gint ett_ngap_UEPresenceInAreaOfInterestItem = -1; +static gint ett_ngap_UERadioCapabilityForPaging = -1; static gint ett_ngap_UESecurityCapabilities = -1; +static gint ett_ngap_UL_NGU_UP_TNLModifyList = -1; +static gint ett_ngap_UL_NGU_UP_TNLModifyItem = -1; static gint ett_ngap_UnavailableGUAMIList = -1; static gint ett_ngap_UnavailableGUAMIItem = -1; static gint ett_ngap_UP_TNLInformation = -1; @@ -1408,7 +1490,7 @@ static gint ett_ngap_SuccessfulOutcome = -1; static gint ett_ngap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-ngap-ett.c ---*/ -#line 109 "./asn1/ngap/packet-ngap-template.c" +#line 113 "./asn1/ngap/packet-ngap-template.c" static expert_field ei_ngap_number_pages_le15 = EI_INIT; @@ -1617,6 +1699,7 @@ ngap_get_ranmode_id(address *addr, guint32 port, packet_info *pinfo) #line 1 "./asn1/ngap/packet-ngap-fn.c" /*--- PDUs declarations ---*/ static int dissect_HandoverRequestAcknowledgeTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); +static int dissect_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_PDUSessionResourceModifyUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_PDUSessionResourceSetupUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_HandoverResourceAllocationUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -1898,7 +1981,7 @@ static const value_string ngap_ProtocolIE_ID_vals[] = { { id_UEAggregateMaximumBitRate, "id-UEAggregateMaximumBitRate" }, { id_UE_associatedLogicalNG_connectionList, "id-UE-associatedLogicalNG-connectionList" }, { id_UEContextRequest, "id-UEContextRequest" }, - { id_UEIdentityIndexValue, "id-UEIdentityIndexValue" }, + { id_Unknown_113, "id-Unknown-113" }, { id_UE_NGAP_IDs, "id-UE-NGAP-IDs" }, { id_UEPagingIdentity, "id-UEPagingIdentity" }, { id_UEPresenceInAreaOfInterestList, "id-UEPresenceInAreaOfInterestList" }, @@ -1911,6 +1994,22 @@ static const value_string ngap_ProtocolIE_ID_vals[] = { { id_WarningMessageContents, "id-WarningMessageContents" }, { id_WarningSecurityInfo, "id-WarningSecurityInfo" }, { id_WarningType, "id-WarningType" }, + { id_AdditionalUL_NGU_UP_TNLInformation, "id-AdditionalUL-NGU-UP-TNLInformation" }, + { id_DataForwardingNotPossible, "id-DataForwardingNotPossible" }, + { id_DL_NGU_UP_TNLInformation, "id-DL-NGU-UP-TNLInformation" }, + { id_NetworkInstance, "id-NetworkInstance" }, + { id_PDUSessionAggregateMaximumBitRate, "id-PDUSessionAggregateMaximumBitRate" }, + { id_PDUSessionResourceFailedToModifyListModCfm, "id-PDUSessionResourceFailedToModifyListModCfm" }, + { id_PDUSessionResourceFailedToSetupListCxtFail, "id-PDUSessionResourceFailedToSetupListCxtFail" }, + { id_PDUSessionResourceListCxtRelReq, "id-PDUSessionResourceListCxtRelReq" }, + { id_PDUSessionType, "id-PDUSessionType" }, + { id_QosFlowAddOrModifyRequestList, "id-QosFlowAddOrModifyRequestList" }, + { id_QosFlowSetupRequestList, "id-QosFlowSetupRequestList" }, + { id_QosFlowToReleaseList, "id-QosFlowToReleaseList" }, + { id_SecurityIndication, "id-SecurityIndication" }, + { id_UL_NGU_UP_TNLInformation, "id-UL-NGU-UP-TNLInformation" }, + { id_UL_NGU_UP_TNLModifyList, "id-UL-NGU-UP-TNLModifyList" }, + { id_WarningAreaCoordinates, "id-WarningAreaCoordinates" }, { 0, NULL } }; @@ -2770,8 +2869,8 @@ dissect_ngap_AMF_TNLAssociationToUpdateList(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_ngap_AMF_UE_NGAP_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 4294967295U, NULL, FALSE); + offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index, + 0U, G_GUINT64_CONSTANT(1099511627775), NULL, FALSE); return offset; } @@ -3156,7 +3255,7 @@ dissect_ngap_AssistanceDataForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int -dissect_ngap_QosFlowIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ngap_QosFlowIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 63U, NULL, TRUE); @@ -3164,8 +3263,25 @@ dissect_ngap_QosFlowIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } +static const value_string ngap_T_qosFlowMappingIndication_vals[] = { + { 0, "ul" }, + { 1, "dl" }, + { 0, NULL } +}; + + +static int +dissect_ngap_T_qosFlowMappingIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, TRUE, 0, NULL); + + return offset; +} + + static const per_sequence_t AssociatedQosFlowItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, + { &hf_ngap_qosFlowMappingIndication, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_T_qosFlowMappingIndication }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -3988,30 +4104,29 @@ static const value_string ngap_CauseRadioNetwork_vals[] = { { 19, "reduce-load-in-serving-cell" }, { 20, "user-inactivity" }, { 21, "radio-connection-with-ue-lost" }, - { 22, "load-balancing-tau-required" }, - { 23, "radio-resources-not-available" }, - { 24, "invalid-qos-combination" }, - { 25, "failure-in-radio-interface-procedure" }, - { 26, "interaction-with-other-procedure" }, - { 27, "unknown-PDU-session-ID" }, - { 28, "unkown-qos-flow-ID" }, - { 29, "multiple-PDU-session-ID-instances" }, - { 30, "multiple-qos-flow-ID-instances" }, - { 31, "encryption-and-or-integrity-protection-algorithms-not-supported" }, - { 32, "ng-intra-system-handover-triggered" }, - { 33, "ng-inter-system-handover-triggered" }, - { 34, "xn-handover-triggered" }, - { 35, "not-supported-5QI-value" }, - { 36, "ue-context-transfer" }, - { 37, "ims-voice-eps-fallback-or-rat-fallback-triggered" }, - { 38, "up-integrity-protection-not-possible" }, - { 39, "up-confidentiality-protection-not-possible" }, - { 40, "slice-not-supported" }, - { 41, "ue-in-rrc-inactive-state-not-reachable" }, - { 42, "redirection" }, - { 43, "resources-not-available-for-the-slice" }, - { 44, "ue-max-integrity-protected-data-rate-reason" }, - { 45, "release-due-to-cn-detected-mobility" }, + { 22, "radio-resources-not-available" }, + { 23, "invalid-qos-combination" }, + { 24, "failure-in-radio-interface-procedure" }, + { 25, "interaction-with-other-procedure" }, + { 26, "unknown-PDU-session-ID" }, + { 27, "unkown-qos-flow-ID" }, + { 28, "multiple-PDU-session-ID-instances" }, + { 29, "multiple-qos-flow-ID-instances" }, + { 30, "encryption-and-or-integrity-protection-algorithms-not-supported" }, + { 31, "ng-intra-system-handover-triggered" }, + { 32, "ng-inter-system-handover-triggered" }, + { 33, "xn-handover-triggered" }, + { 34, "not-supported-5QI-value" }, + { 35, "ue-context-transfer" }, + { 36, "ims-voice-eps-fallback-or-rat-fallback-triggered" }, + { 37, "up-integrity-protection-not-possible" }, + { 38, "up-confidentiality-protection-not-possible" }, + { 39, "slice-not-supported" }, + { 40, "ue-in-rrc-inactive-state-not-reachable" }, + { 41, "redirection" }, + { 42, "resources-not-available-for-the-slice" }, + { 43, "ue-max-integrity-protected-data-rate-reason" }, + { 44, "release-due-to-cn-detected-mobility" }, { 0, NULL } }; @@ -4019,7 +4134,7 @@ static const value_string ngap_CauseRadioNetwork_vals[] = { static int dissect_ngap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 46, NULL, TRUE, 0, NULL); + 45, NULL, TRUE, 0, NULL); return offset; } @@ -4316,7 +4431,7 @@ dissect_ngap_PagingDRX(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_ngap_PeriodicRegistrationUpdateTimer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 627 "./asn1/ngap/ngap.cnf" +#line 644 "./asn1/ngap/ngap.cnf" tvbuff_t *val_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, -1, 8, 8, FALSE, &val_tvb, NULL); @@ -4534,6 +4649,68 @@ dissect_ngap_CoreNetworkAssistanceInformation(tvbuff_t *tvb _U_, int offset _U_, } + +static int +dissect_ngap_INTEGER_0_1048575(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 1048575U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t COUNTValueForPDCP_SN12_sequence[] = { + { &hf_ngap_pDCP_SN12 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_INTEGER_0_4095 }, + { &hf_ngap_hFN_PDCP_SN12 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_INTEGER_0_1048575 }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_COUNTValueForPDCP_SN12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_COUNTValueForPDCP_SN12, COUNTValueForPDCP_SN12_sequence); + + return offset; +} + + + +static int +dissect_ngap_INTEGER_0_262143(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 262143U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_ngap_INTEGER_0_16383(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 16383U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t COUNTValueForPDCP_SN18_sequence[] = { + { &hf_ngap_pDCP_SN18 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_INTEGER_0_262143 }, + { &hf_ngap_hFN_PDCP_SN18 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_INTEGER_0_16383 }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_COUNTValueForPDCP_SN18(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_COUNTValueForPDCP_SN18, COUNTValueForPDCP_SN18_sequence); + + return offset; +} + + static const value_string ngap_TypeOfError_vals[] = { { 0, "not-understood" }, { 1, "missing" }, @@ -4771,6 +4948,21 @@ dissect_ngap_DLForwarding(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } +static const value_string ngap_DL_NGU_TNLInformationReused_vals[] = { + { 0, "true" }, + { 0, NULL } +}; + + +static int +dissect_ngap_DL_NGU_TNLInformationReused(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, TRUE, 0, NULL); + + return offset; +} + + static const value_string ngap_DirectForwardingPathAvailability_vals[] = { { 0, "direct-path-available" }, { 0, NULL } @@ -4786,6 +4978,167 @@ dissect_ngap_DirectForwardingPathAvailability(tvbuff_t *tvb _U_, int offset _U_, } + +static int +dissect_ngap_BIT_STRING_SIZE_1_2048(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, 2048, FALSE, NULL, NULL); + + return offset; +} + + +static const per_sequence_t DRBStatusUL12_sequence[] = { + { &hf_ngap_uL_COUNTValue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_COUNTValueForPDCP_SN12 }, + { &hf_ngap_receiveStatusOfUL_PDCP_SDUs, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_BIT_STRING_SIZE_1_2048 }, + { &hf_ngap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusUL12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusUL12, DRBStatusUL12_sequence); + + return offset; +} + + + +static int +dissect_ngap_BIT_STRING_SIZE_1_131072(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, 131072, FALSE, NULL, NULL); + + return offset; +} + + +static const per_sequence_t DRBStatusUL18_sequence[] = { + { &hf_ngap_uL_COUNTValue_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_COUNTValueForPDCP_SN18 }, + { &hf_ngap_receiveStatusOfUL_PDCP_SDUs_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_BIT_STRING_SIZE_1_131072 }, + { &hf_ngap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusUL18(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusUL18, DRBStatusUL18_sequence); + + return offset; +} + + +static const value_string ngap_DRBStatusUL_vals[] = { + { 0, "dRBStatusUL12" }, + { 1, "dRBStatusUL18" }, + { 2, "choice-Extensions" }, + { 0, NULL } +}; + +static const per_choice_t DRBStatusUL_choice[] = { + { 0, &hf_ngap_dRBStatusUL12 , ASN1_NO_EXTENSIONS , dissect_ngap_DRBStatusUL12 }, + { 1, &hf_ngap_dRBStatusUL18 , ASN1_NO_EXTENSIONS , dissect_ngap_DRBStatusUL18 }, + { 2, &hf_ngap_choice_Extensions, ASN1_NO_EXTENSIONS , dissect_ngap_ProtocolIE_SingleContainer }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusUL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusUL, DRBStatusUL_choice, + NULL); + + return offset; +} + + +static const per_sequence_t DRBStatusDL12_sequence[] = { + { &hf_ngap_dL_COUNTValue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_COUNTValueForPDCP_SN12 }, + { &hf_ngap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusDL12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusDL12, DRBStatusDL12_sequence); + + return offset; +} + + +static const per_sequence_t DRBStatusDL18_sequence[] = { + { &hf_ngap_dL_COUNTValue_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_COUNTValueForPDCP_SN18 }, + { &hf_ngap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusDL18(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusDL18, DRBStatusDL18_sequence); + + return offset; +} + + +static const value_string ngap_DRBStatusDL_vals[] = { + { 0, "dRBStatusDL12" }, + { 1, "dRBStatusDL18" }, + { 2, "choice-Extensions" }, + { 0, NULL } +}; + +static const per_choice_t DRBStatusDL_choice[] = { + { 0, &hf_ngap_dRBStatusDL12 , ASN1_NO_EXTENSIONS , dissect_ngap_DRBStatusDL12 }, + { 1, &hf_ngap_dRBStatusDL18 , ASN1_NO_EXTENSIONS , dissect_ngap_DRBStatusDL18 }, + { 2, &hf_ngap_choice_Extensions, ASN1_NO_EXTENSIONS , dissect_ngap_ProtocolIE_SingleContainer }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_ngap_DRBStatusDL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBStatusDL, DRBStatusDL_choice, + NULL); + + return offset; +} + + +static const per_sequence_t DRBsSubjectToStatusTransferItem_sequence[] = { + { &hf_ngap_dRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_DRB_ID }, + { &hf_ngap_dRBStatusUL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_DRBStatusUL }, + { &hf_ngap_dRBStatusDL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_DRBStatusDL }, + { &hf_ngap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_DRBsSubjectToStatusTransferItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBsSubjectToStatusTransferItem, DRBsSubjectToStatusTransferItem_sequence); + + return offset; +} + + +static const per_sequence_t DRBsSubjectToStatusTransferList_sequence_of[1] = { + { &hf_ngap_DRBsSubjectToStatusTransferList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_DRBsSubjectToStatusTransferItem }, +}; + +static int +dissect_ngap_DRBsSubjectToStatusTransferList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_DRBsSubjectToStatusTransferList, DRBsSubjectToStatusTransferList_sequence_of, + 1, maxnoofDRBs, FALSE); + + return offset; +} + + static const per_sequence_t DRBsToQosFlowsMappingItem_sequence[] = { { &hf_ngap_dRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_DRB_ID }, { &hf_ngap_associatedQosFlowList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_AssociatedQosFlowList }, @@ -5083,7 +5436,7 @@ dissect_ngap_EUTRA_CGIListForWarning(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_ngap_EUTRAencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 573 "./asn1/ngap/ngap.cnf" +#line 587 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, TRUE, ¶meter_tvb, NULL); @@ -5109,7 +5462,7 @@ dissect_ngap_EUTRAencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_ngap_EUTRAintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 588 "./asn1/ngap/ngap.cnf" +#line 602 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, TRUE, ¶meter_tvb, NULL); @@ -5224,7 +5577,7 @@ dissect_ngap_ForbiddenAreaInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const value_string ngap_NotificationControl_vals[] = { - { 0, "notification-enabled" }, + { 0, "notification-requested" }, { 0, NULL } }; @@ -5288,7 +5641,7 @@ dissect_ngap_GUAMI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot static const per_sequence_t QosFlowToBeForwardedItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -5381,7 +5734,7 @@ dissect_ngap_SecurityResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t QosFlowSetupResponseItemHOReqAck_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_dataForwardingAccepted, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_DataForwardingAccepted }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -5411,7 +5764,7 @@ dissect_ngap_QosFlowSetupResponseListHOReqAck(tvbuff_t *tvb _U_, int offset _U_, static const per_sequence_t QosFlowItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_Cause }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -5477,6 +5830,7 @@ dissect_ngap_HandoverRequiredTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t HandoverResourceAllocationUnsuccessfulTransfer_sequence[] = { { &hf_ngap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_Cause }, + { &hf_ngap_criticalityDiagnostics, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_CriticalityDiagnostics }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -5685,7 +6039,7 @@ dissect_ngap_LastVisitedNGRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, static int dissect_ngap_LastVisitedEUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 603 "./asn1/ngap/ngap.cnf" +#line 620 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; proto_tree *subtree; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -5837,7 +6191,7 @@ dissect_ngap_MaximumIntegrityProtectedDataRate(tvbuff_t *tvb _U_, int offset _U_ static int dissect_ngap_RATRestrictionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 529 "./asn1/ngap/ngap.cnf" +#line 543 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 8, 8, TRUE, ¶meter_tvb, NULL); @@ -6037,8 +6391,30 @@ tvbuff_t *parameter_tvb=NULL; static int dissect_ngap_NASSecurityParametersFromNGRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 655 "./asn1/ngap/ngap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); + + 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); + } + + + + return offset; +} + + + +static int +dissect_ngap_NetworkInstance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 1U, 256U, NULL, TRUE); return offset; } @@ -6142,7 +6518,7 @@ dissect_ngap_NR_CGIListForWarning(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_ngap_NRencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 543 "./asn1/ngap/ngap.cnf" +#line 557 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, TRUE, ¶meter_tvb, NULL); @@ -6168,7 +6544,7 @@ dissect_ngap_NRencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_ngap_NRintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 558 "./asn1/ngap/ngap.cnf" +#line 572 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, TRUE, ¶meter_tvb, NULL); @@ -6423,7 +6799,7 @@ dissect_ngap_UserPlaneSecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn static const per_sequence_t QosFlowAcceptedItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -6453,6 +6829,7 @@ dissect_ngap_QosFlowAcceptedList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static const per_sequence_t PathSwitchRequestTransfer_sequence[] = { { &hf_ngap_dL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_dL_NGU_TNLInformationReused, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_DL_NGU_TNLInformationReused }, { &hf_ngap_userPlaneSecurityInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UserPlaneSecurityInformation }, { &hf_ngap_qosFlowAcceptedList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowAcceptedList }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, @@ -6550,6 +6927,46 @@ dissect_ngap_PDUSessionResourceAdmittedList(tvbuff_t *tvb _U_, int offset _U_, a +static int +dissect_ngap_T_pDUSessionResourceModifyIndicationUnsuccessfulTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, dissect_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU); + + return offset; +} + + +static const per_sequence_t PDUSessionResourceFailedToModifyItemModCfm_sequence[] = { + { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, + { &hf_ngap_pDUSessionResourceModifyIndicationUnsuccessfulTransfer, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceModifyIndicationUnsuccessfulTransfer }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_PDUSessionResourceFailedToModifyItemModCfm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceFailedToModifyItemModCfm, PDUSessionResourceFailedToModifyItemModCfm_sequence); + + return offset; +} + + +static const per_sequence_t PDUSessionResourceFailedToModifyListModCfm_sequence_of[1] = { + { &hf_ngap_PDUSessionResourceFailedToModifyListModCfm_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionResourceFailedToModifyItemModCfm }, +}; + +static int +dissect_ngap_PDUSessionResourceFailedToModifyListModCfm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceFailedToModifyListModCfm, PDUSessionResourceFailedToModifyListModCfm_sequence_of, + 1, maxnoofPDUSessions, FALSE); + + return offset; +} + + + static int dissect_ngap_T_pDUSessionResourceModifyUnsuccessfulTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, @@ -6599,13 +7016,53 @@ dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer(tvbuff_t *tvb _U_, in } -static const per_sequence_t PDUSessionResourceFailedToSetupItemCxtRes_sequence[] = { +static const per_sequence_t PDUSessionResourceFailedToSetupItemCxtFail_sequence[] = { { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; +static int +dissect_ngap_PDUSessionResourceFailedToSetupItemCxtFail(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceFailedToSetupItemCxtFail, PDUSessionResourceFailedToSetupItemCxtFail_sequence); + + return offset; +} + + +static const per_sequence_t PDUSessionResourceFailedToSetupListCxtFail_sequence_of[1] = { + { &hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionResourceFailedToSetupItemCxtFail }, +}; + +static int +dissect_ngap_PDUSessionResourceFailedToSetupListCxtFail(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceFailedToSetupListCxtFail, PDUSessionResourceFailedToSetupListCxtFail_sequence_of, + 1, maxnoofPDUSessions, FALSE); + + return offset; +} + + + +static int +dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, dissect_PDUSessionResourceSetupUnsuccessfulTransfer_PDU); + + return offset; +} + + +static const per_sequence_t PDUSessionResourceFailedToSetupItemCxtRes_sequence[] = { + { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, + { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_01 }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + static int dissect_ngap_PDUSessionResourceFailedToSetupItemCxtRes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6711,7 +7168,7 @@ dissect_ngap_PDUSessionResourceFailedToSetupListPSReq(tvbuff_t *tvb _U_, int off static int -dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, dissect_PDUSessionResourceSetupUnsuccessfulTransfer_PDU); @@ -6721,7 +7178,7 @@ dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_01(tvbuff_t *tvb _U_, static const per_sequence_t PDUSessionResourceFailedToSetupItemSURes_sequence[] = { { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, - { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_01 }, + { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_02, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceSetupUnsuccessfulTransfer_02 }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -6790,7 +7247,7 @@ dissect_ngap_PDUSessionResourceHandoverList(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t QosFlowInformationItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_dLForwarding , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_DLForwarding }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -6879,6 +7336,35 @@ dissect_ngap_PDUSessionResourceListCxtRelCpl(tvbuff_t *tvb _U_, int offset _U_, } +static const per_sequence_t PDUSessionResourceItemCxtRelReq_sequence[] = { + { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_PDUSessionResourceItemCxtRelReq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceItemCxtRelReq, PDUSessionResourceItemCxtRelReq_sequence); + + return offset; +} + + +static const per_sequence_t PDUSessionResourceListCxtRelReq_sequence_of[1] = { + { &hf_ngap_PDUSessionResourceListCxtRelReq_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionResourceItemCxtRelReq }, +}; + +static int +dissect_ngap_PDUSessionResourceListCxtRelReq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_PDUSessionResourceListCxtRelReq, PDUSessionResourceListCxtRelReq_sequence_of, + 1, maxnoofPDUSessions, FALSE); + + return offset; +} + + static int dissect_ngap_T_handoverRequiredTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -6920,7 +7406,7 @@ dissect_ngap_PDUSessionResourceListHORqd(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t QosFlowModifyConfirmItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -6948,8 +7434,39 @@ dissect_ngap_QosFlowModifyConfirmList(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } +static const per_sequence_t TNLMappingItem_sequence[] = { + { &hf_ngap_dL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_uL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_TNLMappingItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_TNLMappingItem, TNLMappingItem_sequence); + + return offset; +} + + +static const per_sequence_t TNLMappingList_sequence_of[1] = { + { &hf_ngap_TNLMappingList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_TNLMappingItem }, +}; + +static int +dissect_ngap_TNLMappingList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_TNLMappingList, TNLMappingList_sequence_of, + 1, maxnoofMultiConnectivities, FALSE); + + return offset; +} + + static const per_sequence_t PDUSessionResourceModifyConfirmTransfer_sequence[] = { { &hf_ngap_qosFlowModifyConfirmList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowModifyConfirmList }, + { &hf_ngap_tNLMappingList , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_TNLMappingList }, { &hf_ngap_qosFlowFailedToModifyList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowList }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -6964,102 +7481,23 @@ dissect_ngap_PDUSessionResourceModifyConfirmTransfer(tvbuff_t *tvb _U_, int offs } -static const value_string ngap_QosCharacteristics_vals[] = { - { 0, "nonDynamic5QI" }, - { 1, "dynamic5QI" }, - { 2, "choice-Extensions" }, - { 0, NULL } -}; - -static const per_choice_t QosCharacteristics_choice[] = { - { 0, &hf_ngap_nonDynamic5QI , ASN1_NO_EXTENSIONS , dissect_ngap_NonDynamic5QIDescriptor }, - { 1, &hf_ngap_dynamic5QI , ASN1_NO_EXTENSIONS , dissect_ngap_Dynamic5QIDescriptor }, - { 2, &hf_ngap_choice_Extensions, ASN1_NO_EXTENSIONS , dissect_ngap_ProtocolIE_SingleContainer }, - { 0, NULL, 0, NULL } -}; - -static int -dissect_ngap_QosCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_ngap_QosCharacteristics, QosCharacteristics_choice, - NULL); - - return offset; -} - - -static const value_string ngap_ReflectiveQosAttribute_vals[] = { - { 0, "subject-to" }, - { 0, NULL } -}; - - -static int -dissect_ngap_ReflectiveQosAttribute(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 1, NULL, TRUE, 0, NULL); - - return offset; -} - - -static const per_sequence_t QosFlowLevelQosParameters_sequence[] = { - { &hf_ngap_qosCharacteristics, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosCharacteristics }, - { &hf_ngap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_AllocationAndRetentionPriority }, - { &hf_ngap_gBR_QosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_GBR_QosInformation }, - { &hf_ngap_reflectiveQosAttribute, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ReflectiveQosAttribute }, - { &hf_ngap_additionalQosFlowInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_AdditionalQosFlowInformation }, +static const per_sequence_t PDUSessionResourceModifyIndicationUnsuccessfulTransfer_sequence[] = { + { &hf_ngap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_Cause }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; static int -dissect_ngap_QosFlowLevelQosParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_ngap_QosFlowLevelQosParameters, QosFlowLevelQosParameters_sequence); - - return offset; -} - - -static const per_sequence_t QosFlowAddOrModifyRequestItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, - { &hf_ngap_qosFlowLevelQosParameters, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowLevelQosParameters }, - { &hf_ngap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_E_RAB_ID }, - { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_ngap_QosFlowAddOrModifyRequestItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_ngap_QosFlowAddOrModifyRequestItem, QosFlowAddOrModifyRequestItem_sequence); - - return offset; -} - - -static const per_sequence_t QosFlowAddOrModifyRequestList_sequence_of[1] = { - { &hf_ngap_QosFlowAddOrModifyRequestList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowAddOrModifyRequestItem }, -}; - -static int -dissect_ngap_QosFlowAddOrModifyRequestList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_ngap_QosFlowAddOrModifyRequestList, QosFlowAddOrModifyRequestList_sequence_of, - 1, maxnoofQosFlows, FALSE); + ett_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer, PDUSessionResourceModifyIndicationUnsuccessfulTransfer_sequence); return offset; } static const per_sequence_t PDUSessionResourceModifyRequestTransfer_sequence[] = { - { &hf_ngap_pDUSessionAggregateMaximumBitRate, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_PDUSessionAggregateMaximumBitRate }, - { &hf_ngap_uL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UPTransportLayerInformation }, - { &hf_ngap_dL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UPTransportLayerInformation }, - { &hf_ngap_qosFlowAddOrModifyRequestList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowAddOrModifyRequestList }, - { &hf_ngap_qosFlowToReleaseList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowList }, - { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { &hf_ngap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_ProtocolIE_Container }, { NULL, 0, 0, NULL } }; @@ -7073,7 +7511,7 @@ dissect_ngap_PDUSessionResourceModifyRequestTransfer(tvbuff_t *tvb _U_, int offs static const per_sequence_t QosFlowAddOrModifyResponseItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -7103,7 +7541,9 @@ dissect_ngap_QosFlowAddOrModifyResponseList(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t PDUSessionResourceModifyResponseTransfer_sequence[] = { { &hf_ngap_dL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_uL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UPTransportLayerInformation }, { &hf_ngap_qosFlowAddOrModifyResponseList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowAddOrModifyResponseList }, + { &hf_ngap_additionalQosFlowPerTNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowPerTNLInformation }, { &hf_ngap_qosFlowFailedToAddOrModifyList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowList }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -7305,7 +7745,7 @@ dissect_ngap_T_pDUSessionResourceModifyResponseTransfer(tvbuff_t *tvb _U_, int o static const per_sequence_t PDUSessionResourceModifyItemModRes_sequence[] = { { &hf_ngap_pDUSessionID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionID }, - { &hf_ngap_pDUSessionResourceModifyResponseTransfer, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_T_pDUSessionResourceModifyResponseTransfer }, + { &hf_ngap_pDUSessionResourceModifyResponseTransfer, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_T_pDUSessionResourceModifyResponseTransfer }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -7335,6 +7775,7 @@ dissect_ngap_PDUSessionResourceModifyListModRes(tvbuff_t *tvb _U_, int offset _U static const per_sequence_t PDUSessionResourceModifyUnsuccessfulTransfer_sequence[] = { { &hf_ngap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_Cause }, + { &hf_ngap_criticalityDiagnostics, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_CriticalityDiagnostics }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -7404,7 +7845,7 @@ dissect_ngap_PDUSessionResourceNotifyReleasedTransfer(tvbuff_t *tvb _U_, int off static const per_sequence_t QosFlowNotifyItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, { &hf_ngap_notificationCause, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_NotificationCause }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } @@ -7843,65 +8284,8 @@ dissect_ngap_PDUSessionResourceSetupListSURes(tvbuff_t *tvb _U_, int offset _U_, } -static const value_string ngap_PDUSessionType_vals[] = { - { 0, "ipv4" }, - { 1, "ipv6" }, - { 2, "ipv4v6" }, - { 3, "ethernet" }, - { 4, "unstructured" }, - { 0, NULL } -}; - - -static int -dissect_ngap_PDUSessionType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 5, NULL, TRUE, 0, NULL); - - return offset; -} - - -static const per_sequence_t QosFlowSetupRequestItem_sequence[] = { - { &hf_ngap_qosFlowIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIndicator }, - { &hf_ngap_qosFlowLevelQosParameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowLevelQosParameters }, - { &hf_ngap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_E_RAB_ID }, - { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_ngap_QosFlowSetupRequestItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_ngap_QosFlowSetupRequestItem, QosFlowSetupRequestItem_sequence); - - return offset; -} - - -static const per_sequence_t QosFlowSetupRequestList_sequence_of[1] = { - { &hf_ngap_QosFlowSetupRequestList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowSetupRequestItem }, -}; - -static int -dissect_ngap_QosFlowSetupRequestList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_ngap_QosFlowSetupRequestList, QosFlowSetupRequestList_sequence_of, - 1, maxnoofQosFlows, FALSE); - - return offset; -} - - static const per_sequence_t PDUSessionResourceSetupRequestTransfer_sequence[] = { - { &hf_ngap_pDUSessionAggregateMaximumBitRate, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_PDUSessionAggregateMaximumBitRate }, - { &hf_ngap_uL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, - { &hf_ngap_additionalUL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UPTransportLayerInformation }, - { &hf_ngap_dataForwardingNotPossible, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_DataForwardingNotPossible }, - { &hf_ngap_pDUSessionType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PDUSessionType }, - { &hf_ngap_securityIndication, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_SecurityIndication }, - { &hf_ngap_qosFlowSetupRequestList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowSetupRequestList }, - { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { &hf_ngap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_ProtocolIE_Container }, { NULL, 0, 0, NULL } }; @@ -7934,6 +8318,7 @@ dissect_ngap_PDUSessionResourceSetupResponseTransfer(tvbuff_t *tvb _U_, int offs static const per_sequence_t PDUSessionResourceSetupUnsuccessfulTransfer_sequence[] = { { &hf_ngap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_Cause }, + { &hf_ngap_criticalityDiagnostics, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_CriticalityDiagnostics }, { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -8107,6 +8492,25 @@ dissect_ngap_PDUSessionResourceToReleaseListRelCmd(tvbuff_t *tvb _U_, int offset } +static const value_string ngap_PDUSessionType_vals[] = { + { 0, "ipv4" }, + { 1, "ipv6" }, + { 2, "ipv4v6" }, + { 3, "ethernet" }, + { 4, "unstructured" }, + { 0, NULL } +}; + + +static int +dissect_ngap_PDUSessionType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 5, NULL, TRUE, 0, NULL); + + return offset; +} + + static const per_sequence_t PLMNSupportItem_sequence[] = { { &hf_ngap_pLMNIdentity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_PLMNIdentity }, { &hf_ngap_sliceSupportList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_SliceSupportList }, @@ -8179,6 +8583,126 @@ dissect_ngap_PWSFailedCellIDList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } +static const value_string ngap_QosCharacteristics_vals[] = { + { 0, "nonDynamic5QI" }, + { 1, "dynamic5QI" }, + { 2, "choice-Extensions" }, + { 0, NULL } +}; + +static const per_choice_t QosCharacteristics_choice[] = { + { 0, &hf_ngap_nonDynamic5QI , ASN1_NO_EXTENSIONS , dissect_ngap_NonDynamic5QIDescriptor }, + { 1, &hf_ngap_dynamic5QI , ASN1_NO_EXTENSIONS , dissect_ngap_Dynamic5QIDescriptor }, + { 2, &hf_ngap_choice_Extensions, ASN1_NO_EXTENSIONS , dissect_ngap_ProtocolIE_SingleContainer }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_ngap_QosCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_ngap_QosCharacteristics, QosCharacteristics_choice, + NULL); + + return offset; +} + + +static const value_string ngap_ReflectiveQosAttribute_vals[] = { + { 0, "subject-to" }, + { 0, NULL } +}; + + +static int +dissect_ngap_ReflectiveQosAttribute(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const per_sequence_t QosFlowLevelQosParameters_sequence[] = { + { &hf_ngap_qosCharacteristics, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosCharacteristics }, + { &hf_ngap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_AllocationAndRetentionPriority }, + { &hf_ngap_gBR_QosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_GBR_QosInformation }, + { &hf_ngap_reflectiveQosAttribute, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ReflectiveQosAttribute }, + { &hf_ngap_additionalQosFlowInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_AdditionalQosFlowInformation }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_QosFlowLevelQosParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowLevelQosParameters, QosFlowLevelQosParameters_sequence); + + return offset; +} + + +static const per_sequence_t QosFlowAddOrModifyRequestItem_sequence[] = { + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, + { &hf_ngap_qosFlowLevelQosParameters, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QosFlowLevelQosParameters }, + { &hf_ngap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_E_RAB_ID }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_QosFlowAddOrModifyRequestItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowAddOrModifyRequestItem, QosFlowAddOrModifyRequestItem_sequence); + + return offset; +} + + +static const per_sequence_t QosFlowAddOrModifyRequestList_sequence_of[1] = { + { &hf_ngap_QosFlowAddOrModifyRequestList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowAddOrModifyRequestItem }, +}; + +static int +dissect_ngap_QosFlowAddOrModifyRequestList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowAddOrModifyRequestList, QosFlowAddOrModifyRequestList_sequence_of, + 1, maxnoofQosFlows, FALSE); + + return offset; +} + + +static const per_sequence_t QosFlowSetupRequestItem_sequence[] = { + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, + { &hf_ngap_qosFlowLevelQosParameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowLevelQosParameters }, + { &hf_ngap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_E_RAB_ID }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_QosFlowSetupRequestItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowSetupRequestItem, QosFlowSetupRequestItem_sequence); + + return offset; +} + + +static const per_sequence_t QosFlowSetupRequestList_sequence_of[1] = { + { &hf_ngap_QosFlowSetupRequestList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowSetupRequestItem }, +}; + +static int +dissect_ngap_QosFlowSetupRequestList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowSetupRequestList, QosFlowSetupRequestList_sequence_of, + 1, maxnoofQosFlows, FALSE); + + return offset; +} + + static int dissect_ngap_RANNodeName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -8199,11 +8723,16 @@ dissect_ngap_RANPagingPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } +static const per_sequence_t RANStatusTransfer_TransparentContainer_sequence[] = { + { &hf_ngap_dRBsSubjectToStatusTransferList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_DRBsSubjectToStatusTransferList }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; static int dissect_ngap_RANStatusTransfer_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_RANStatusTransfer_TransparentContainer, RANStatusTransfer_TransparentContainer_sequence); return offset; } @@ -8365,11 +8894,25 @@ dissect_ngap_RRCContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } +static const value_string ngap_RRCEstablishmentCause_vals[] = { + { 0, "emergency" }, + { 1, "highPriorityAccess" }, + { 2, "mt-Access" }, + { 3, "mo-Signalling" }, + { 4, "mo-Data" }, + { 5, "mo-VoiceCall" }, + { 6, "mo-VideoCall" }, + { 7, "mo-SMS" }, + { 8, "mps-PriorityAccess" }, + { 9, "mcs-PriorityAccess" }, + { 0, NULL } +}; + static int dissect_ngap_RRCEstablishmentCause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 10, NULL, TRUE, 0, NULL); return offset; } @@ -8931,7 +9474,7 @@ dissect_ngap_TimerApproachForGUAMIRemoval(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_ngap_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 520 "./asn1/ngap/ngap.cnf" +#line 534 "./asn1/ngap/ngap.cnf" tvbuff_t *timestamp_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 4, 4, FALSE, ×tamp_tvb); @@ -8939,7 +9482,7 @@ dissect_ngap_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, -#line 524 "./asn1/ngap/ngap.cnf" +#line 538 "./asn1/ngap/ngap.cnf" if (timestamp_tvb) { proto_item_append_text(actx->created_item, " (%s)", tvb_ntp_fmt_ts_sec(timestamp_tvb, 0)); } @@ -9180,7 +9723,7 @@ dissect_ngap_UEPresenceInAreaOfInterestList(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_ngap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 509 "./asn1/ngap/ngap.cnf" +#line 523 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -9201,7 +9744,7 @@ dissect_ngap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int -dissect_ngap_UERadioCapabilityForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ngap_UERadioCapabilityForPagingOfNR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 498 "./asn1/ngap/ngap.cnf" tvbuff_t *parameter_tvb = NULL; @@ -9211,7 +9754,7 @@ dissect_ngap_UERadioCapabilityForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ 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); } @@ -9221,6 +9764,44 @@ dissect_ngap_UERadioCapabilityForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ } + +static int +dissect_ngap_UERadioCapabilityForPagingOfEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 509 "./asn1/ngap/ngap.cnf" + tvbuff_t *parameter_tvb = NULL; + + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); + + 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); + } + + + + return offset; +} + + +static const per_sequence_t UERadioCapabilityForPaging_sequence[] = { + { &hf_ngap_uERadioCapabilityForPagingOfNR, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UERadioCapabilityForPagingOfNR }, + { &hf_ngap_uERadioCapabilityForPagingOfEUTRA, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UERadioCapabilityForPagingOfEUTRA }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_UERadioCapabilityForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_UERadioCapabilityForPaging, UERadioCapabilityForPaging_sequence); + + return offset; +} + + static const per_sequence_t UESecurityCapabilities_sequence[] = { { &hf_ngap_nRencryptionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_NRencryptionAlgorithms }, { &hf_ngap_nRintegrityProtectionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_NRintegrityProtectionAlgorithms }, @@ -9239,6 +9820,36 @@ dissect_ngap_UESecurityCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const per_sequence_t UL_NGU_UP_TNLModifyItem_sequence[] = { + { &hf_ngap_uL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_dL_NGU_UP_TNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_UPTransportLayerInformation }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_UL_NGU_UP_TNLModifyItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_UL_NGU_UP_TNLModifyItem, UL_NGU_UP_TNLModifyItem_sequence); + + return offset; +} + + +static const per_sequence_t UL_NGU_UP_TNLModifyList_sequence_of[1] = { + { &hf_ngap_UL_NGU_UP_TNLModifyList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_UL_NGU_UP_TNLModifyItem }, +}; + +static int +dissect_ngap_UL_NGU_UP_TNLModifyList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_UL_NGU_UP_TNLModifyList, UL_NGU_UP_TNLModifyList_sequence_of, + 0, maxnoofMultiConnectivities, FALSE); + + return offset; +} + + static const per_sequence_t UnavailableGUAMIItem_sequence[] = { { &hf_ngap_gUAMI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_GUAMI }, { &hf_ngap_timerApproachForGUAMIRemoval, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_TimerApproachForGUAMIRemoval }, @@ -9346,6 +9957,16 @@ dissect_ngap_UserLocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } + +static int +dissect_ngap_WarningAreaCoordinates(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + 1, 1024, FALSE, NULL); + + return offset; +} + + static const value_string ngap_WarningAreaList_vals[] = { { 0, "eUTRA-CGIListForWarning" }, { 1, "nR-CGIListForWarning" }, @@ -9422,7 +10043,7 @@ static const per_sequence_t PDUSessionResourceSetupRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1231 "./asn1/ngap/ngap.cnf" +#line 1288 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupRequest"); @@ -9440,7 +10061,7 @@ static const per_sequence_t PDUSessionResourceSetupResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1234 "./asn1/ngap/ngap.cnf" +#line 1291 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupResponse"); @@ -9458,7 +10079,7 @@ static const per_sequence_t PDUSessionResourceReleaseCommand_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1225 "./asn1/ngap/ngap.cnf" +#line 1282 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseCommand"); @@ -9476,7 +10097,7 @@ static const per_sequence_t PDUSessionResourceReleaseResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1228 "./asn1/ngap/ngap.cnf" +#line 1285 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseResponse"); @@ -9494,7 +10115,7 @@ static const per_sequence_t PDUSessionResourceModifyRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1210 "./asn1/ngap/ngap.cnf" +#line 1267 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyRequest"); @@ -9512,7 +10133,7 @@ static const per_sequence_t PDUSessionResourceModifyResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1213 "./asn1/ngap/ngap.cnf" +#line 1270 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyResponse"); @@ -9530,7 +10151,7 @@ static const per_sequence_t PDUSessionResourceNotify_sequence[] = { static int dissect_ngap_PDUSessionResourceNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1222 "./asn1/ngap/ngap.cnf" +#line 1279 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceNotify"); @@ -9548,7 +10169,7 @@ static const per_sequence_t PDUSessionResourceModifyIndication_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1216 "./asn1/ngap/ngap.cnf" +#line 1273 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyIndication"); @@ -9566,7 +10187,7 @@ static const per_sequence_t PDUSessionResourceModifyConfirm_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1219 "./asn1/ngap/ngap.cnf" +#line 1276 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyConfirm"); @@ -9584,7 +10205,7 @@ static const per_sequence_t InitialContextSetupRequest_sequence[] = { static int dissect_ngap_InitialContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1153 "./asn1/ngap/ngap.cnf" +#line 1210 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupRequest"); @@ -9602,7 +10223,7 @@ static const per_sequence_t InitialContextSetupResponse_sequence[] = { static int dissect_ngap_InitialContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1156 "./asn1/ngap/ngap.cnf" +#line 1213 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupResponse"); @@ -9620,7 +10241,7 @@ static const per_sequence_t InitialContextSetupFailure_sequence[] = { static int dissect_ngap_InitialContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1159 "./asn1/ngap/ngap.cnf" +#line 1216 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupFailure"); @@ -9638,7 +10259,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = { static int dissect_ngap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1288 "./asn1/ngap/ngap.cnf" +#line 1345 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest"); @@ -9656,7 +10277,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = { static int dissect_ngap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1282 "./asn1/ngap/ngap.cnf" +#line 1339 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand"); @@ -9674,7 +10295,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = { static int dissect_ngap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1285 "./asn1/ngap/ngap.cnf" +#line 1342 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete"); @@ -9692,7 +10313,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = { static int dissect_ngap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1273 "./asn1/ngap/ngap.cnf" +#line 1330 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest"); @@ -9710,7 +10331,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = { static int dissect_ngap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1276 "./asn1/ngap/ngap.cnf" +#line 1333 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse"); @@ -9728,7 +10349,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = { static int dissect_ngap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1279 "./asn1/ngap/ngap.cnf" +#line 1336 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure"); @@ -9746,7 +10367,7 @@ static const per_sequence_t RRCInactiveTransitionReport_sequence[] = { static int dissect_ngap_RRCInactiveTransitionReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1264 "./asn1/ngap/ngap.cnf" +#line 1321 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCInactiveTransitionReport"); @@ -9764,7 +10385,7 @@ static const per_sequence_t HandoverRequired_sequence[] = { static int dissect_ngap_HandoverRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1135 "./asn1/ngap/ngap.cnf" +#line 1192 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequired"); @@ -9782,7 +10403,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_ngap_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1138 "./asn1/ngap/ngap.cnf" +#line 1195 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCommand"); @@ -9800,7 +10421,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = { static int dissect_ngap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1141 "./asn1/ngap/ngap.cnf" +#line 1198 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure"); @@ -9839,7 +10460,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = { static int dissect_ngap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1147 "./asn1/ngap/ngap.cnf" +#line 1204 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge"); @@ -9857,7 +10478,7 @@ static const per_sequence_t HandoverFailure_sequence[] = { static int dissect_ngap_HandoverFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1150 "./asn1/ngap/ngap.cnf" +#line 1207 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverFailure"); @@ -9875,7 +10496,7 @@ static const per_sequence_t HandoverNotify_sequence[] = { static int dissect_ngap_HandoverNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1132 "./asn1/ngap/ngap.cnf" +#line 1189 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverNotify"); @@ -9893,7 +10514,7 @@ static const per_sequence_t PathSwitchRequest_sequence[] = { static int dissect_ngap_PathSwitchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1201 "./asn1/ngap/ngap.cnf" +#line 1258 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequest"); @@ -9911,7 +10532,7 @@ static const per_sequence_t PathSwitchRequestAcknowledge_sequence[] = { static int dissect_ngap_PathSwitchRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1204 "./asn1/ngap/ngap.cnf" +#line 1261 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestAcknowledge"); @@ -9929,7 +10550,7 @@ static const per_sequence_t PathSwitchRequestFailure_sequence[] = { static int dissect_ngap_PathSwitchRequestFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1207 "./asn1/ngap/ngap.cnf" +#line 1264 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestFailure"); @@ -9947,7 +10568,7 @@ static const per_sequence_t HandoverCancel_sequence[] = { static int dissect_ngap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1126 "./asn1/ngap/ngap.cnf" +#line 1183 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel"); @@ -9965,7 +10586,7 @@ static const per_sequence_t HandoverCancelAcknowledge_sequence[] = { static int dissect_ngap_HandoverCancelAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1129 "./asn1/ngap/ngap.cnf" +#line 1186 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancelAcknowledge"); @@ -9983,7 +10604,7 @@ static const per_sequence_t UplinkRANStatusTransfer_sequence[] = { static int dissect_ngap_UplinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1312 "./asn1/ngap/ngap.cnf" +#line 1369 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANStatusTransfer"); @@ -10001,7 +10622,7 @@ static const per_sequence_t DownlinkRANStatusTransfer_sequence[] = { static int dissect_ngap_DownlinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1117 "./asn1/ngap/ngap.cnf" +#line 1174 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANStatusTransfer"); @@ -10019,7 +10640,7 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_ngap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1198 "./asn1/ngap/ngap.cnf" +#line 1255 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Paging"); @@ -10100,7 +10721,7 @@ static const per_sequence_t NASNonDeliveryIndication_sequence[] = { static int dissect_ngap_NASNonDeliveryIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1174 "./asn1/ngap/ngap.cnf" +#line 1231 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NASNonDeliveryIndication"); @@ -10118,7 +10739,7 @@ static const per_sequence_t RerouteNASRequest_sequence[] = { static int dissect_ngap_RerouteNASRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1261 "./asn1/ngap/ngap.cnf" +#line 1318 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RerouteNASRequest"); @@ -10158,7 +10779,7 @@ static const per_sequence_t NGSetupRequest_sequence[] = { static int dissect_ngap_NGSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1183 "./asn1/ngap/ngap.cnf" +#line 1240 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupRequest"); @@ -10176,7 +10797,7 @@ static const per_sequence_t NGSetupResponse_sequence[] = { static int dissect_ngap_NGSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1186 "./asn1/ngap/ngap.cnf" +#line 1243 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupResponse"); @@ -10194,7 +10815,7 @@ static const per_sequence_t NGSetupFailure_sequence[] = { static int dissect_ngap_NGSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1189 "./asn1/ngap/ngap.cnf" +#line 1246 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupFailure"); @@ -10212,7 +10833,7 @@ static const per_sequence_t RANConfigurationUpdate_sequence[] = { static int dissect_ngap_RANConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1252 "./asn1/ngap/ngap.cnf" +#line 1309 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdate"); @@ -10230,7 +10851,7 @@ static const per_sequence_t RANConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_RANConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1255 "./asn1/ngap/ngap.cnf" +#line 1312 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateAcknowledge"); @@ -10248,7 +10869,7 @@ static const per_sequence_t RANConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_RANConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1258 "./asn1/ngap/ngap.cnf" +#line 1315 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateFailure"); @@ -10266,7 +10887,7 @@ static const per_sequence_t AMFConfigurationUpdate_sequence[] = { static int dissect_ngap_AMFConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1090 "./asn1/ngap/ngap.cnf" +#line 1147 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdate"); @@ -10284,7 +10905,7 @@ static const per_sequence_t AMFConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1093 "./asn1/ngap/ngap.cnf" +#line 1150 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateAcknowledge"); @@ -10302,7 +10923,7 @@ static const per_sequence_t AMFConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1096 "./asn1/ngap/ngap.cnf" +#line 1153 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateFailure"); @@ -10320,7 +10941,7 @@ static const per_sequence_t AMFStatusIndication_sequence[] = { static int dissect_ngap_AMFStatusIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1099 "./asn1/ngap/ngap.cnf" +#line 1156 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFStatusIndication"); @@ -10338,7 +10959,7 @@ static const per_sequence_t NGReset_sequence[] = { static int dissect_ngap_NGReset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1177 "./asn1/ngap/ngap.cnf" +#line 1234 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGReset"); @@ -10356,7 +10977,7 @@ static const per_sequence_t NGResetAcknowledge_sequence[] = { static int dissect_ngap_NGResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1180 "./asn1/ngap/ngap.cnf" +#line 1237 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGResetAcknowledge"); @@ -10374,7 +10995,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_ngap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1123 "./asn1/ngap/ngap.cnf" +#line 1180 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); @@ -10392,7 +11013,7 @@ static const per_sequence_t OverloadStart_sequence[] = { static int dissect_ngap_OverloadStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1192 "./asn1/ngap/ngap.cnf" +#line 1249 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStart"); @@ -10410,7 +11031,7 @@ static const per_sequence_t OverloadStop_sequence[] = { static int dissect_ngap_OverloadStop(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1195 "./asn1/ngap/ngap.cnf" +#line 1252 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStop"); @@ -10428,7 +11049,7 @@ static const per_sequence_t UplinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_UplinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1309 "./asn1/ngap/ngap.cnf" +#line 1366 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANConfigurationTransfer"); @@ -10446,7 +11067,7 @@ static const per_sequence_t DownlinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_DownlinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1114 "./asn1/ngap/ngap.cnf" +#line 1171 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANConfigurationTransfer"); @@ -10464,7 +11085,7 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = { static int dissect_ngap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1318 "./asn1/ngap/ngap.cnf" +#line 1375 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest"); @@ -10482,7 +11103,7 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = { static int dissect_ngap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1321 "./asn1/ngap/ngap.cnf" +#line 1378 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningResponse"); @@ -10501,7 +11122,7 @@ static const per_sequence_t PWSCancelRequest_sequence[] = { static int dissect_ngap_PWSCancelRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1240 "./asn1/ngap/ngap.cnf" +#line 1297 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelRequest"); @@ -10519,7 +11140,7 @@ static const per_sequence_t PWSCancelResponse_sequence[] = { static int dissect_ngap_PWSCancelResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1243 "./asn1/ngap/ngap.cnf" +#line 1300 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelResponse"); @@ -10537,7 +11158,7 @@ static const per_sequence_t PWSRestartIndication_sequence[] = { static int dissect_ngap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1249 "./asn1/ngap/ngap.cnf" +#line 1306 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSRestartIndication"); @@ -10555,7 +11176,7 @@ static const per_sequence_t PWSFailureIndication_sequence[] = { static int dissect_ngap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1246 "./asn1/ngap/ngap.cnf" +#line 1303 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSFailureIndication"); @@ -10573,7 +11194,7 @@ static const per_sequence_t DownlinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1120 "./asn1/ngap/ngap.cnf" +#line 1177 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkUEAssociatedNRPPaTransport"); @@ -10591,7 +11212,7 @@ static const per_sequence_t UplinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1315 "./asn1/ngap/ngap.cnf" +#line 1372 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkUEAssociatedNRPPaTransport"); @@ -10609,7 +11230,7 @@ static const per_sequence_t DownlinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1111 "./asn1/ngap/ngap.cnf" +#line 1168 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkNonUEAssociatedNRPPaTransport"); @@ -10627,7 +11248,7 @@ static const per_sequence_t UplinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1306 "./asn1/ngap/ngap.cnf" +#line 1363 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkNonUEAssociatedNRPPaTransport"); @@ -10645,7 +11266,7 @@ static const per_sequence_t TraceStart_sequence[] = { static int dissect_ngap_TraceStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1270 "./asn1/ngap/ngap.cnf" +#line 1327 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceStart"); @@ -10663,7 +11284,7 @@ static const per_sequence_t TraceFailureIndication_sequence[] = { static int dissect_ngap_TraceFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1267 "./asn1/ngap/ngap.cnf" +#line 1324 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceFailureIndication"); @@ -10681,7 +11302,7 @@ static const per_sequence_t DeactivateTrace_sequence[] = { static int dissect_ngap_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1105 "./asn1/ngap/ngap.cnf" +#line 1162 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DeactivateTrace"); @@ -10699,7 +11320,7 @@ static const per_sequence_t CellTrafficTrace_sequence[] = { static int dissect_ngap_CellTrafficTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1102 "./asn1/ngap/ngap.cnf" +#line 1159 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace"); @@ -10717,7 +11338,7 @@ static const per_sequence_t LocationReportingControl_sequence[] = { static int dissect_ngap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1168 "./asn1/ngap/ngap.cnf" +#line 1225 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingControl"); @@ -10735,7 +11356,7 @@ static const per_sequence_t LocationReportingFailureIndication_sequence[] = { static int dissect_ngap_LocationReportingFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1171 "./asn1/ngap/ngap.cnf" +#line 1228 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingFailureIndication"); @@ -10753,7 +11374,7 @@ static const per_sequence_t LocationReport_sequence[] = { static int dissect_ngap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1165 "./asn1/ngap/ngap.cnf" +#line 1222 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReport"); @@ -10771,7 +11392,7 @@ static const per_sequence_t UETNLABindingReleaseRequest_sequence[] = { static int dissect_ngap_UETNLABindingReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1297 "./asn1/ngap/ngap.cnf" +#line 1354 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UETNLABindingReleaseRequest"); @@ -10789,7 +11410,7 @@ static const per_sequence_t UERadioCapabilityInfoIndication_sequence[] = { static int dissect_ngap_UERadioCapabilityInfoIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1300 "./asn1/ngap/ngap.cnf" +#line 1357 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityInfoIndication"); @@ -10807,7 +11428,7 @@ static const per_sequence_t UERadioCapabilityCheckRequest_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1291 "./asn1/ngap/ngap.cnf" +#line 1348 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckRequest"); @@ -10825,7 +11446,7 @@ static const per_sequence_t UERadioCapabilityCheckResponse_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1294 "./asn1/ngap/ngap.cnf" +#line 1351 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckResponse"); @@ -10843,7 +11464,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_ngap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1237 "./asn1/ngap/ngap.cnf" +#line 1294 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage"); @@ -11124,6 +11745,14 @@ static int dissect_DataCodingScheme_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U offset += 7; offset >>= 3; return offset; } +static int dissect_DataForwardingNotPossible_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_DataForwardingNotPossible(tvb, offset, &asn1_ctx, tree, hf_ngap_DataForwardingNotPossible_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_DirectForwardingPathAvailability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11260,6 +11889,14 @@ static int dissect_NASSecurityParametersFromNGRAN_PDU(tvbuff_t *tvb _U_, packet_ offset += 7; offset >>= 3; return offset; } +static int dissect_NetworkInstance_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_NetworkInstance(tvb, offset, &asn1_ctx, tree, hf_ngap_NetworkInstance_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_NewSecurityContextInd_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11348,6 +11985,14 @@ static int dissect_PagingPriority_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionAggregateMaximumBitRate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionAggregateMaximumBitRate(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionAggregateMaximumBitRate_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PDUSessionResourceAdmittedList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11356,6 +12001,14 @@ static int dissect_PDUSessionResourceAdmittedList_PDU(tvbuff_t *tvb _U_, packet_ offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionResourceFailedToModifyListModCfm_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionResourceFailedToModifyListModCfm(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionResourceFailedToModifyListModCfm_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PDUSessionResourceFailedToModifyListModRes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11364,6 +12017,14 @@ static int dissect_PDUSessionResourceFailedToModifyListModRes_PDU(tvbuff_t *tvb offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionResourceFailedToSetupListCxtFail_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionResourceFailedToSetupListCxtFail(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PDUSessionResourceFailedToSetupListCxtRes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11412,6 +12073,14 @@ static int dissect_PDUSessionResourceListCxtRelCpl_PDU(tvbuff_t *tvb _U_, packet offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionResourceListCxtRelReq_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionResourceListCxtRelReq(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionResourceListCxtRelReq_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PDUSessionResourceListHORqd_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11564,6 +12233,14 @@ static int dissect_PDUSessionResourceToReleaseListRelCmd_PDU(tvbuff_t *tvb _U_, offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionType(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionType_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PLMNSupportList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11580,6 +12257,30 @@ static int dissect_PWSFailedCellIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo offset += 7; offset >>= 3; return offset; } +static int dissect_QosFlowAddOrModifyRequestList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_QosFlowAddOrModifyRequestList(tvb, offset, &asn1_ctx, tree, hf_ngap_QosFlowAddOrModifyRequestList_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_QosFlowList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_QosFlowList(tvb, offset, &asn1_ctx, tree, hf_ngap_QosFlowList_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_QosFlowSetupRequestList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_QosFlowSetupRequestList(tvb, offset, &asn1_ctx, tree, hf_ngap_QosFlowSetupRequestList_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_RANNodeName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11676,6 +12377,14 @@ static int dissect_SecurityContext_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ offset += 7; offset >>= 3; return offset; } +static int dissect_SecurityIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_SecurityIndication(tvb, offset, &asn1_ctx, tree, hf_ngap_SecurityIndication_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_SecurityKey_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11844,14 +12553,6 @@ static int dissect_UEContextRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U offset += 7; offset >>= 3; return offset; } -static int dissect_UEIdentityIndexValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { - int offset = 0; - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_ngap_UEIdentityIndexValue(tvb, offset, &asn1_ctx, tree, hf_ngap_UEIdentityIndexValue_PDU); - offset += 7; offset >>= 3; - return offset; -} static int dissect_UE_NGAP_IDs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11900,6 +12601,14 @@ static int dissect_UESecurityCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pi offset += 7; offset >>= 3; return offset; } +static int dissect_UL_NGU_UP_TNLModifyList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_UL_NGU_UP_TNLModifyList(tvb, offset, &asn1_ctx, tree, hf_ngap_UL_NGU_UP_TNLModifyList_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_UnavailableGUAMIList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11908,6 +12617,14 @@ static int dissect_UnavailableGUAMIList_PDU(tvbuff_t *tvb _U_, packet_info *pinf offset += 7; offset >>= 3; return offset; } +static int dissect_UPTransportLayerInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_UPTransportLayerInformation(tvb, offset, &asn1_ctx, tree, hf_ngap_UPTransportLayerInformation_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_UserLocationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -11916,6 +12633,14 @@ static int dissect_UserLocationInformation_PDU(tvbuff_t *tvb _U_, packet_info *p offset += 7; offset >>= 3; return offset; } +static int dissect_WarningAreaCoordinates_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_WarningAreaCoordinates(tvb, offset, &asn1_ctx, tree, hf_ngap_WarningAreaCoordinates_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_WarningAreaList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -12596,6 +13321,14 @@ static int dissect_HandoverRequestAcknowledgeTransfer_PDU(tvbuff_t *tvb _U_, pac offset += 7; offset >>= 3; return offset; } +static int dissect_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer(tvb, offset, &asn1_ctx, tree, hf_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_PDUSessionResourceModifyUnsuccessfulTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -12759,7 +13492,7 @@ static int dissect_PDUSessionResourceReleaseCommandTransfer_PDU(tvbuff_t *tvb _U /*--- End of included file: packet-ngap-fn.c ---*/ -#line 313 "./asn1/ngap/packet-ngap-template.c" +#line 317 "./asn1/ngap/packet-ngap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -12873,6 +13606,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; @@ -12992,7 +13726,6 @@ proto_reg_handoff_ngap(void) dissector_add_uint("ngap.ies", id_UEAggregateMaximumBitRate, create_dissector_handle(dissect_UEAggregateMaximumBitRate_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_UE_associatedLogicalNG_connectionList, create_dissector_handle(dissect_UE_associatedLogicalNG_connectionList_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_UEContextRequest, create_dissector_handle(dissect_UEContextRequest_PDU, proto_ngap)); - dissector_add_uint("ngap.ies", id_UEIdentityIndexValue, create_dissector_handle(dissect_UEIdentityIndexValue_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_UE_NGAP_IDs, create_dissector_handle(dissect_UE_NGAP_IDs_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_UEPagingIdentity, create_dissector_handle(dissect_UEPagingIdentity_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_UEPresenceInAreaOfInterestList, create_dissector_handle(dissect_UEPresenceInAreaOfInterestList_PDU, proto_ngap)); @@ -13005,6 +13738,21 @@ proto_reg_handoff_ngap(void) dissector_add_uint("ngap.ies", id_WarningMessageContents, create_dissector_handle(dissect_WarningMessageContents_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_WarningSecurityInfo, create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_WarningType, create_dissector_handle(dissect_WarningType_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_AdditionalUL_NGU_UP_TNLInformation, create_dissector_handle(dissect_UPTransportLayerInformation_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_DataForwardingNotPossible, create_dissector_handle(dissect_DataForwardingNotPossible_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_NetworkInstance, create_dissector_handle(dissect_NetworkInstance_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_PDUSessionAggregateMaximumBitRate, create_dissector_handle(dissect_PDUSessionAggregateMaximumBitRate_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_PDUSessionResourceFailedToModifyListModCfm, create_dissector_handle(dissect_PDUSessionResourceFailedToModifyListModCfm_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_PDUSessionResourceFailedToSetupListCxtFail, create_dissector_handle(dissect_PDUSessionResourceFailedToSetupListCxtFail_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_PDUSessionResourceListCxtRelReq, create_dissector_handle(dissect_PDUSessionResourceListCxtRelReq_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_PDUSessionType, create_dissector_handle(dissect_PDUSessionType_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_QosFlowAddOrModifyRequestList, create_dissector_handle(dissect_QosFlowAddOrModifyRequestList_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_QosFlowSetupRequestList, create_dissector_handle(dissect_QosFlowSetupRequestList_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_QosFlowToReleaseList, create_dissector_handle(dissect_QosFlowList_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_SecurityIndication, create_dissector_handle(dissect_SecurityIndication_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_UL_NGU_UP_TNLInformation, create_dissector_handle(dissect_UPTransportLayerInformation_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_UL_NGU_UP_TNLModifyList, create_dissector_handle(dissect_UL_NGU_UP_TNLModifyList_PDU, proto_ngap)); + dissector_add_uint("ngap.ies", id_WarningAreaCoordinates, create_dissector_handle(dissect_WarningAreaCoordinates_PDU, proto_ngap)); dissector_add_uint("ngap.proc.imsg", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdate_PDU, proto_ngap)); dissector_add_uint("ngap.proc.sout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateAcknowledge_PDU, proto_ngap)); dissector_add_uint("ngap.proc.uout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateFailure_PDU, proto_ngap)); @@ -13086,7 +13834,7 @@ proto_reg_handoff_ngap(void) /*--- End of included file: packet-ngap-dis-tab.c ---*/ -#line 430 "./asn1/ngap/packet-ngap-template.c" +#line 435 "./asn1/ngap/packet-ngap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, ngap_handle); @@ -13229,6 +13977,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 }}, /*--- Included file: packet-ngap-hfarr.c ---*/ #line 1 "./asn1/ngap/packet-ngap-hfarr.c" @@ -13262,7 +14014,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_AMF_UE_NGAP_ID_PDU, { "AMF-UE-NGAP-ID", "ngap.AMF_UE_NGAP_ID", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ngap_AssistanceDataForPaging_PDU, { "AssistanceDataForPaging", "ngap.AssistanceDataForPaging_element", @@ -13304,6 +14056,10 @@ void proto_register_ngap(void) { { "DataCodingScheme", "ngap.DataCodingScheme", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_DataForwardingNotPossible_PDU, + { "DataForwardingNotPossible", "ngap.DataForwardingNotPossible", + FT_UINT32, BASE_DEC, VALS(ngap_DataForwardingNotPossible_vals), 0, + NULL, HFILL }}, { &hf_ngap_DirectForwardingPathAvailability_PDU, { "DirectForwardingPathAvailability", "ngap.DirectForwardingPathAvailability", FT_UINT32, BASE_DEC, VALS(ngap_DirectForwardingPathAvailability_vals), 0, @@ -13372,6 +14128,10 @@ void proto_register_ngap(void) { { "NASSecurityParametersFromNGRAN", "ngap.NASSecurityParametersFromNGRAN", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_NetworkInstance_PDU, + { "NetworkInstance", "ngap.NetworkInstance", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_NewSecurityContextInd_PDU, { "NewSecurityContextInd", "ngap.NewSecurityContextInd", FT_UINT32, BASE_DEC, VALS(ngap_NewSecurityContextInd_vals), 0, @@ -13416,14 +14176,26 @@ void proto_register_ngap(void) { { "PagingPriority", "ngap.PagingPriority", FT_UINT32, BASE_DEC, VALS(ngap_PagingPriority_vals), 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionAggregateMaximumBitRate_PDU, + { "PDUSessionAggregateMaximumBitRate", "ngap.PDUSessionAggregateMaximumBitRate_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceAdmittedList_PDU, { "PDUSessionResourceAdmittedList", "ngap.PDUSessionResourceAdmittedList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceFailedToModifyListModCfm_PDU, + { "PDUSessionResourceFailedToModifyListModCfm", "ngap.PDUSessionResourceFailedToModifyListModCfm", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceFailedToModifyListModRes_PDU, { "PDUSessionResourceFailedToModifyListModRes", "ngap.PDUSessionResourceFailedToModifyListModRes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_PDU, + { "PDUSessionResourceFailedToSetupListCxtFail", "ngap.PDUSessionResourceFailedToSetupListCxtFail", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_PDU, { "PDUSessionResourceFailedToSetupListCxtRes", "ngap.PDUSessionResourceFailedToSetupListCxtRes", FT_UINT32, BASE_DEC, NULL, 0, @@ -13448,6 +14220,10 @@ void proto_register_ngap(void) { { "PDUSessionResourceListCxtRelCpl", "ngap.PDUSessionResourceListCxtRelCpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceListCxtRelReq_PDU, + { "PDUSessionResourceListCxtRelReq", "ngap.PDUSessionResourceListCxtRelReq", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceListHORqd_PDU, { "PDUSessionResourceListHORqd", "ngap.PDUSessionResourceListHORqd", FT_UINT32, BASE_DEC, NULL, 0, @@ -13524,6 +14300,10 @@ void proto_register_ngap(void) { { "PDUSessionResourceToReleaseListRelCmd", "ngap.PDUSessionResourceToReleaseListRelCmd", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionType_PDU, + { "PDUSessionType", "ngap.PDUSessionType", + FT_UINT32, BASE_DEC, VALS(ngap_PDUSessionType_vals), 0, + NULL, HFILL }}, { &hf_ngap_PLMNSupportList_PDU, { "PLMNSupportList", "ngap.PLMNSupportList", FT_UINT32, BASE_DEC, NULL, 0, @@ -13532,6 +14312,18 @@ void proto_register_ngap(void) { { "PWSFailedCellIDList", "ngap.PWSFailedCellIDList", FT_UINT32, BASE_DEC, VALS(ngap_PWSFailedCellIDList_vals), 0, NULL, HFILL }}, + { &hf_ngap_QosFlowAddOrModifyRequestList_PDU, + { "QosFlowAddOrModifyRequestList", "ngap.QosFlowAddOrModifyRequestList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_QosFlowList_PDU, + { "QosFlowList", "ngap.QosFlowList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_QosFlowSetupRequestList_PDU, + { "QosFlowSetupRequestList", "ngap.QosFlowSetupRequestList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_RANNodeName_PDU, { "RANNodeName", "ngap.RANNodeName", FT_STRING, BASE_NONE, NULL, 0, @@ -13541,8 +14333,8 @@ void proto_register_ngap(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ngap_RANStatusTransfer_TransparentContainer_PDU, - { "RANStatusTransfer-TransparentContainer", "ngap.RANStatusTransfer_TransparentContainer", - FT_BYTES, BASE_NONE, NULL, 0, + { "RANStatusTransfer-TransparentContainer", "ngap.RANStatusTransfer_TransparentContainer_element", + FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_RAN_UE_NGAP_ID_PDU, { "RAN-UE-NGAP-ID", "ngap.RAN_UE_NGAP_ID", @@ -13566,7 +14358,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_RRCEstablishmentCause_PDU, { "RRCEstablishmentCause", "ngap.RRCEstablishmentCause", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(ngap_RRCEstablishmentCause_vals), 0, NULL, HFILL }}, { &hf_ngap_RRCInactiveTransitionReportRequest_PDU, { "RRCInactiveTransitionReportRequest", "ngap.RRCInactiveTransitionReportRequest", @@ -13580,6 +14372,10 @@ void proto_register_ngap(void) { { "SecurityContext", "ngap.SecurityContext_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_SecurityIndication_PDU, + { "SecurityIndication", "ngap.SecurityIndication_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_SecurityKey_PDU, { "SecurityKey", "ngap.SecurityKey", FT_BYTES, BASE_NONE, NULL, 0, @@ -13664,10 +14460,6 @@ void proto_register_ngap(void) { { "UEContextRequest", "ngap.UEContextRequest", FT_UINT32, BASE_DEC, VALS(ngap_UEContextRequest_vals), 0, NULL, HFILL }}, - { &hf_ngap_UEIdentityIndexValue_PDU, - { "UEIdentityIndexValue", "ngap.UEIdentityIndexValue", - FT_UINT32, BASE_DEC, VALS(ngap_UEIdentityIndexValue_vals), 0, - NULL, HFILL }}, { &hf_ngap_UE_NGAP_IDs_PDU, { "UE-NGAP-IDs", "ngap.UE_NGAP_IDs", FT_UINT32, BASE_DEC, VALS(ngap_UE_NGAP_IDs_vals), 0, @@ -13685,21 +14477,33 @@ void proto_register_ngap(void) { FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_UERadioCapabilityForPaging_PDU, - { "UERadioCapabilityForPaging", "ngap.UERadioCapabilityForPaging", - FT_BYTES, BASE_NONE, NULL, 0, + { "UERadioCapabilityForPaging", "ngap.UERadioCapabilityForPaging_element", + FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_UESecurityCapabilities_PDU, { "UESecurityCapabilities", "ngap.UESecurityCapabilities_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_UL_NGU_UP_TNLModifyList_PDU, + { "UL-NGU-UP-TNLModifyList", "ngap.UL_NGU_UP_TNLModifyList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_UnavailableGUAMIList_PDU, { "UnavailableGUAMIList", "ngap.UnavailableGUAMIList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_UPTransportLayerInformation_PDU, + { "UPTransportLayerInformation", "ngap.UPTransportLayerInformation", + FT_UINT32, BASE_DEC, VALS(ngap_UPTransportLayerInformation_vals), 0, + NULL, HFILL }}, { &hf_ngap_UserLocationInformation_PDU, { "UserLocationInformation", "ngap.UserLocationInformation", FT_UINT32, BASE_DEC, VALS(ngap_UserLocationInformation_vals), 0, NULL, HFILL }}, + { &hf_ngap_WarningAreaCoordinates_PDU, + { "WarningAreaCoordinates", "ngap.WarningAreaCoordinates", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_WarningAreaList_PDU, { "WarningAreaList", "ngap.WarningAreaList", FT_UINT32, BASE_DEC, VALS(ngap_WarningAreaList_vals), 0, @@ -14040,6 +14844,10 @@ void proto_register_ngap(void) { { "HandoverRequestAcknowledgeTransfer", "ngap.HandoverRequestAcknowledgeTransfer_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer_PDU, + { "PDUSessionResourceModifyIndicationUnsuccessfulTransfer", "ngap.PDUSessionResourceModifyIndicationUnsuccessfulTransfer_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceModifyUnsuccessfulTransfer_PDU, { "PDUSessionResourceModifyUnsuccessfulTransfer", "ngap.PDUSessionResourceModifyUnsuccessfulTransfer_element", FT_NONE, BASE_NONE, NULL, 0, @@ -14292,10 +15100,14 @@ void proto_register_ngap(void) { { "AssociatedQosFlowItem", "ngap.AssociatedQosFlowItem_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_ngap_qosFlowIndicator, - { "qosFlowIndicator", "ngap.qosFlowIndicator", + { &hf_ngap_qosFlowIdentifier, + { "qosFlowIdentifier", "ngap.qosFlowIdentifier", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_qosFlowMappingIndication, + { "qosFlowMappingIndication", "ngap.qosFlowMappingIndication", + FT_UINT32, BASE_DEC, VALS(ngap_T_qosFlowMappingIndication_vals), 0, + NULL, HFILL }}, { &hf_ngap_cellIDCancelledEUTRA, { "cellIDCancelledEUTRA", "ngap.cellIDCancelledEUTRA", FT_UINT32, BASE_DEC, NULL, 0, @@ -14472,6 +15284,22 @@ void proto_register_ngap(void) { { "expectedUEBehaviour", "ngap.expectedUEBehaviour_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_pDCP_SN12, + { "pDCP-SN12", "ngap.pDCP_SN12", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_0_4095", HFILL }}, + { &hf_ngap_hFN_PDCP_SN12, + { "hFN-PDCP-SN12", "ngap.hFN_PDCP_SN12", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_0_1048575", HFILL }}, + { &hf_ngap_pDCP_SN18, + { "pDCP-SN18", "ngap.pDCP_SN18", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_0_262143", HFILL }}, + { &hf_ngap_hFN_PDCP_SN18, + { "hFN-PDCP-SN18", "ngap.hFN_PDCP_SN18", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_0_16383", HFILL }}, { &hf_ngap_endpointIPAddress, { "endpointIPAddress", "ngap.endpointIPAddress", FT_BYTES, BASE_NONE, NULL, 0, @@ -14524,6 +15352,62 @@ void proto_register_ngap(void) { { "uLForwardingUP-TNLInformation", "ngap.uLForwardingUP_TNLInformation", FT_UINT32, BASE_DEC, VALS(ngap_UPTransportLayerInformation_vals), 0, "UPTransportLayerInformation", HFILL }}, + { &hf_ngap_DRBsSubjectToStatusTransferList_item, + { "DRBsSubjectToStatusTransferItem", "ngap.DRBsSubjectToStatusTransferItem_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_dRBStatusUL, + { "dRBStatusUL", "ngap.dRBStatusUL", + FT_UINT32, BASE_DEC, VALS(ngap_DRBStatusUL_vals), 0, + NULL, HFILL }}, + { &hf_ngap_dRBStatusDL, + { "dRBStatusDL", "ngap.dRBStatusDL", + FT_UINT32, BASE_DEC, VALS(ngap_DRBStatusDL_vals), 0, + NULL, HFILL }}, + { &hf_ngap_iE_Extension, + { "iE-Extension", "ngap.iE_Extension", + FT_UINT32, BASE_DEC, NULL, 0, + "ProtocolExtensionContainer", HFILL }}, + { &hf_ngap_dRBStatusDL12, + { "dRBStatusDL12", "ngap.dRBStatusDL12_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_dRBStatusDL18, + { "dRBStatusDL18", "ngap.dRBStatusDL18_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_dL_COUNTValue, + { "dL-COUNTValue", "ngap.dL_COUNTValue_element", + FT_NONE, BASE_NONE, NULL, 0, + "COUNTValueForPDCP_SN12", HFILL }}, + { &hf_ngap_dL_COUNTValue_01, + { "dL-COUNTValue", "ngap.dL_COUNTValue_element", + FT_NONE, BASE_NONE, NULL, 0, + "COUNTValueForPDCP_SN18", HFILL }}, + { &hf_ngap_dRBStatusUL12, + { "dRBStatusUL12", "ngap.dRBStatusUL12_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_dRBStatusUL18, + { "dRBStatusUL18", "ngap.dRBStatusUL18_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_uL_COUNTValue, + { "uL-COUNTValue", "ngap.uL_COUNTValue_element", + FT_NONE, BASE_NONE, NULL, 0, + "COUNTValueForPDCP_SN12", HFILL }}, + { &hf_ngap_receiveStatusOfUL_PDCP_SDUs, + { "receiveStatusOfUL-PDCP-SDUs", "ngap.receiveStatusOfUL_PDCP_SDUs", + FT_BYTES, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_1_2048", HFILL }}, + { &hf_ngap_uL_COUNTValue_01, + { "uL-COUNTValue", "ngap.uL_COUNTValue_element", + FT_NONE, BASE_NONE, NULL, 0, + "COUNTValueForPDCP_SN18", HFILL }}, + { &hf_ngap_receiveStatusOfUL_PDCP_SDUs_01, + { "receiveStatusOfUL-PDCP-SDUs", "ngap.receiveStatusOfUL_PDCP_SDUs", + FT_BYTES, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_1_131072", HFILL }}, { &hf_ngap_DRBsToQosFlowsMappingList_item, { "DRBsToQosFlowsMappingItem", "ngap.DRBsToQosFlowsMappingItem_element", FT_NONE, BASE_NONE, NULL, 0, @@ -14678,7 +15562,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_timeStayedInCell, { "timeStayedInCell", "ngap.timeStayedInCell", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0, "INTEGER_0_4095", HFILL }}, { &hf_ngap_aMFSetID, { "aMFSetID", "ngap.aMFSetID", @@ -14804,6 +15688,10 @@ void proto_register_ngap(void) { { "directForwardingPathAvailability", "ngap.directForwardingPathAvailability", FT_UINT32, BASE_DEC, VALS(ngap_DirectForwardingPathAvailability_vals), 0, NULL, HFILL }}, + { &hf_ngap_criticalityDiagnostics, + { "criticalityDiagnostics", "ngap.criticalityDiagnostics_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_recommendRANNodesForPaging, { "recommendRANNodesForPaging", "ngap.recommendRANNodesForPaging_element", FT_NONE, BASE_NONE, NULL, 0, @@ -14968,6 +15856,10 @@ void proto_register_ngap(void) { { "securityIndication", "ngap.securityIndication_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_dL_NGU_TNLInformationReused, + { "dL-NGU-TNLInformationReused", "ngap.dL_NGU_TNLInformationReused", + FT_UINT32, BASE_DEC, VALS(ngap_DL_NGU_TNLInformationReused_vals), 0, + NULL, HFILL }}, { &hf_ngap_userPlaneSecurityInformation, { "userPlaneSecurityInformation", "ngap.userPlaneSecurityInformation_element", FT_NONE, BASE_NONE, NULL, 0, @@ -14996,6 +15888,14 @@ void proto_register_ngap(void) { { "handoverRequestAcknowledgeTransfer", "ngap.handoverRequestAcknowledgeTransfer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceFailedToModifyListModCfm_item, + { "PDUSessionResourceFailedToModifyItemModCfm", "ngap.PDUSessionResourceFailedToModifyItemModCfm_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_pDUSessionResourceModifyIndicationUnsuccessfulTransfer, + { "pDUSessionResourceModifyIndicationUnsuccessfulTransfer", "ngap.pDUSessionResourceModifyIndicationUnsuccessfulTransfer", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceFailedToModifyListModRes_item, { "PDUSessionResourceFailedToModifyItemModRes", "ngap.PDUSessionResourceFailedToModifyItemModRes_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15004,14 +15904,22 @@ void proto_register_ngap(void) { { "pDUSessionResourceModifyUnsuccessfulTransfer", "ngap.pDUSessionResourceModifyUnsuccessfulTransfer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_item, - { "PDUSessionResourceFailedToSetupItemCxtRes", "ngap.PDUSessionResourceFailedToSetupItemCxtRes_element", + { &hf_ngap_PDUSessionResourceFailedToSetupListCxtFail_item, + { "PDUSessionResourceFailedToSetupItemCxtFail", "ngap.PDUSessionResourceFailedToSetupItemCxtFail_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer, { "pDUSessionResourceSetupUnsuccessfulTransfer", "ngap.pDUSessionResourceSetupUnsuccessfulTransfer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceFailedToSetupListCxtRes_item, + { "PDUSessionResourceFailedToSetupItemCxtRes", "ngap.PDUSessionResourceFailedToSetupItemCxtRes_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01, + { "pDUSessionResourceSetupUnsuccessfulTransfer", "ngap.pDUSessionResourceSetupUnsuccessfulTransfer", + FT_BYTES, BASE_NONE, NULL, 0, + "T_pDUSessionResourceSetupUnsuccessfulTransfer_01", HFILL }}, { &hf_ngap_PDUSessionResourceFailedToSetupListHOAck_item, { "PDUSessionResourceFailedToSetupItemHOAck", "ngap.PDUSessionResourceFailedToSetupItemHOAck_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15032,10 +15940,10 @@ void proto_register_ngap(void) { { "PDUSessionResourceFailedToSetupItemSURes", "ngap.PDUSessionResourceFailedToSetupItemSURes_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_01, + { &hf_ngap_pDUSessionResourceSetupUnsuccessfulTransfer_02, { "pDUSessionResourceSetupUnsuccessfulTransfer", "ngap.pDUSessionResourceSetupUnsuccessfulTransfer", FT_BYTES, BASE_NONE, NULL, 0, - "T_pDUSessionResourceSetupUnsuccessfulTransfer_01", HFILL }}, + "T_pDUSessionResourceSetupUnsuccessfulTransfer_02", HFILL }}, { &hf_ngap_PDUSessionResourceHandoverList_item, { "PDUSessionResourceHandoverItem", "ngap.PDUSessionResourceHandoverItem_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15060,6 +15968,10 @@ void proto_register_ngap(void) { { "PDUSessionResourceItemCxtRelCpl", "ngap.PDUSessionResourceItemCxtRelCpl_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_PDUSessionResourceListCxtRelReq_item, + { "PDUSessionResourceItemCxtRelReq", "ngap.PDUSessionResourceItemCxtRelReq_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_PDUSessionResourceListHORqd_item, { "PDUSessionResourceItemHORqd", "ngap.PDUSessionResourceItemHORqd_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15072,26 +15984,26 @@ void proto_register_ngap(void) { { "qosFlowModifyConfirmList", "ngap.qosFlowModifyConfirmList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_tNLMappingList, + { "tNLMappingList", "ngap.tNLMappingList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_qosFlowFailedToModifyList, { "qosFlowFailedToModifyList", "ngap.qosFlowFailedToModifyList", FT_UINT32, BASE_DEC, NULL, 0, "QosFlowList", HFILL }}, - { &hf_ngap_pDUSessionAggregateMaximumBitRate, - { "pDUSessionAggregateMaximumBitRate", "ngap.pDUSessionAggregateMaximumBitRate_element", - FT_NONE, BASE_NONE, NULL, 0, - NULL, HFILL }}, - { &hf_ngap_qosFlowAddOrModifyRequestList, - { "qosFlowAddOrModifyRequestList", "ngap.qosFlowAddOrModifyRequestList", + { &hf_ngap_protocolIEs, + { "protocolIEs", "ngap.protocolIEs", FT_UINT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_ngap_qosFlowToReleaseList, - { "qosFlowToReleaseList", "ngap.qosFlowToReleaseList", - FT_UINT32, BASE_DEC, NULL, 0, - "QosFlowList", HFILL }}, + "ProtocolIE_Container", HFILL }}, { &hf_ngap_qosFlowAddOrModifyResponseList, { "qosFlowAddOrModifyResponseList", "ngap.qosFlowAddOrModifyResponseList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_additionalQosFlowPerTNLInformation, + { "additionalQosFlowPerTNLInformation", "ngap.additionalQosFlowPerTNLInformation_element", + FT_NONE, BASE_NONE, NULL, 0, + "QosFlowPerTNLInformation", HFILL }}, { &hf_ngap_qosFlowFailedToAddOrModifyList, { "qosFlowFailedToAddOrModifyList", "ngap.qosFlowFailedToAddOrModifyList", FT_UINT32, BASE_DEC, NULL, 0, @@ -15228,30 +16140,10 @@ void proto_register_ngap(void) { { "pDUSessionResourceSetupResponseTransfer", "ngap.pDUSessionResourceSetupResponseTransfer", FT_BYTES, BASE_NONE, NULL, 0, "T_pDUSessionResourceSetupResponseTransfer_01", HFILL }}, - { &hf_ngap_additionalUL_NGU_UP_TNLInformation, - { "additionalUL-NGU-UP-TNLInformation", "ngap.additionalUL_NGU_UP_TNLInformation", - FT_UINT32, BASE_DEC, VALS(ngap_UPTransportLayerInformation_vals), 0, - "UPTransportLayerInformation", HFILL }}, - { &hf_ngap_dataForwardingNotPossible, - { "dataForwardingNotPossible", "ngap.dataForwardingNotPossible", - FT_UINT32, BASE_DEC, VALS(ngap_DataForwardingNotPossible_vals), 0, - NULL, HFILL }}, - { &hf_ngap_pDUSessionType, - { "pDUSessionType", "ngap.pDUSessionType", - FT_UINT32, BASE_DEC, VALS(ngap_PDUSessionType_vals), 0, - NULL, HFILL }}, - { &hf_ngap_qosFlowSetupRequestList, - { "qosFlowSetupRequestList", "ngap.qosFlowSetupRequestList", - FT_UINT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, { &hf_ngap_qosFlowPerTNLInformation, { "qosFlowPerTNLInformation", "ngap.qosFlowPerTNLInformation_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_ngap_additionalQosFlowPerTNLInformation, - { "additionalQosFlowPerTNLInformation", "ngap.additionalQosFlowPerTNLInformation_element", - FT_NONE, BASE_NONE, NULL, 0, - "QosFlowPerTNLInformation", HFILL }}, { &hf_ngap_PDUSessionResourceSwitchedList_item, { "PDUSessionResourceSwitchedItem", "ngap.PDUSessionResourceSwitchedItem_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15384,6 +16276,10 @@ void proto_register_ngap(void) { { "QosFlowToBeForwardedItem", "ngap.QosFlowToBeForwardedItem_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_dRBsSubjectToStatusTransferList, + { "dRBsSubjectToStatusTransferList", "ngap.dRBsSubjectToStatusTransferList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_RATRestrictions_item, { "RATRestrictions-Item", "ngap.RATRestrictions_Item_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15624,6 +16520,10 @@ void proto_register_ngap(void) { { "TNLInformationItem", "ngap.TNLInformationItem_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_TNLMappingList_item, + { "TNLMappingItem", "ngap.TNLMappingItem_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_nGRANTraceID, { "nGRANTraceID", "ngap.nGRANTraceID", FT_BYTES, BASE_NONE, NULL, 0, @@ -15654,7 +16554,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_aMF_UE_NGAP_ID, { "aMF-UE-NGAP-ID", "ngap.aMF_UE_NGAP_ID", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ngap_rAN_UE_NGAP_ID, { "rAN-UE-NGAP-ID", "ngap.rAN_UE_NGAP_ID", @@ -15684,6 +16584,14 @@ void proto_register_ngap(void) { { "uEPresence", "ngap.uEPresence", FT_UINT32, BASE_DEC, VALS(ngap_UEPresence_vals), 0, NULL, HFILL }}, + { &hf_ngap_uERadioCapabilityForPagingOfNR, + { "uERadioCapabilityForPagingOfNR", "ngap.uERadioCapabilityForPagingOfNR", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_uERadioCapabilityForPagingOfEUTRA, + { "uERadioCapabilityForPagingOfEUTRA", "ngap.uERadioCapabilityForPagingOfEUTRA", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_nRencryptionAlgorithms, { "nRencryptionAlgorithms", "ngap.nRencryptionAlgorithms", FT_BYTES, BASE_NONE, NULL, 0, @@ -15700,6 +16608,10 @@ void proto_register_ngap(void) { { "eUTRAintegrityProtectionAlgorithms", "ngap.eUTRAintegrityProtectionAlgorithms", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_UL_NGU_UP_TNLModifyList_item, + { "UL-NGU-UP-TNLModifyItem", "ngap.UL_NGU_UP_TNLModifyItem_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_UnavailableGUAMIList_item, { "UnavailableGUAMIItem", "ngap.UnavailableGUAMIItem_element", FT_NONE, BASE_NONE, NULL, 0, @@ -15788,10 +16700,6 @@ void proto_register_ngap(void) { { "xnExtendedTransportLayerAddresses", "ngap.xnExtendedTransportLayerAddresses", FT_UINT32, BASE_DEC, NULL, 0, "XnExtTLAs", HFILL }}, - { &hf_ngap_protocolIEs, - { "protocolIEs", "ngap.protocolIEs", - FT_UINT32, BASE_DEC, NULL, 0, - "ProtocolIE_Container", HFILL }}, { &hf_ngap_privateIEs, { "privateIEs", "ngap.privateIEs", FT_UINT32, BASE_DEC, NULL, 0, @@ -15822,7 +16730,7 @@ void proto_register_ngap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-ngap-hfarr.c ---*/ -#line 573 "./asn1/ngap/packet-ngap-template.c" +#line 582 "./asn1/ngap/packet-ngap-template.c" }; /* List of subtrees */ @@ -15843,9 +16751,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, /*--- Included file: packet-ngap-ettarr.c ---*/ #line 1 "./asn1/ngap/packet-ngap-ettarr.c" @@ -15914,12 +16824,22 @@ void proto_register_ngap(void) { &ett_ngap_CompletedCellsInTAI_NR, &ett_ngap_CompletedCellsInTAI_NR_Item, &ett_ngap_CoreNetworkAssistanceInformation, + &ett_ngap_COUNTValueForPDCP_SN12, + &ett_ngap_COUNTValueForPDCP_SN18, &ett_ngap_CPTransportLayerInformation, &ett_ngap_CriticalityDiagnostics, &ett_ngap_CriticalityDiagnostics_IE_List, &ett_ngap_CriticalityDiagnostics_IE_Item, &ett_ngap_DataForwardingResponseDRBList, &ett_ngap_DataForwardingResponseDRBItem, + &ett_ngap_DRBsSubjectToStatusTransferList, + &ett_ngap_DRBsSubjectToStatusTransferItem, + &ett_ngap_DRBStatusDL, + &ett_ngap_DRBStatusDL12, + &ett_ngap_DRBStatusDL18, + &ett_ngap_DRBStatusUL, + &ett_ngap_DRBStatusUL12, + &ett_ngap_DRBStatusUL18, &ett_ngap_DRBsToQosFlowsMappingList, &ett_ngap_DRBsToQosFlowsMappingItem, &ett_ngap_Dynamic5QIDescriptor, @@ -15989,8 +16909,12 @@ void proto_register_ngap(void) { &ett_ngap_PDUSessionAggregateMaximumBitRate, &ett_ngap_PDUSessionResourceAdmittedList, &ett_ngap_PDUSessionResourceAdmittedItem, + &ett_ngap_PDUSessionResourceFailedToModifyListModCfm, + &ett_ngap_PDUSessionResourceFailedToModifyItemModCfm, &ett_ngap_PDUSessionResourceFailedToModifyListModRes, &ett_ngap_PDUSessionResourceFailedToModifyItemModRes, + &ett_ngap_PDUSessionResourceFailedToSetupListCxtFail, + &ett_ngap_PDUSessionResourceFailedToSetupItemCxtFail, &ett_ngap_PDUSessionResourceFailedToSetupListCxtRes, &ett_ngap_PDUSessionResourceFailedToSetupItemCxtRes, &ett_ngap_PDUSessionResourceFailedToSetupListHOAck, @@ -16005,9 +16929,12 @@ void proto_register_ngap(void) { &ett_ngap_PDUSessionResourceInformationItem, &ett_ngap_PDUSessionResourceListCxtRelCpl, &ett_ngap_PDUSessionResourceItemCxtRelCpl, + &ett_ngap_PDUSessionResourceListCxtRelReq, + &ett_ngap_PDUSessionResourceItemCxtRelReq, &ett_ngap_PDUSessionResourceListHORqd, &ett_ngap_PDUSessionResourceItemHORqd, &ett_ngap_PDUSessionResourceModifyConfirmTransfer, + &ett_ngap_PDUSessionResourceModifyIndicationUnsuccessfulTransfer, &ett_ngap_PDUSessionResourceModifyRequestTransfer, &ett_ngap_PDUSessionResourceModifyResponseTransfer, &ett_ngap_PDUSessionResourceModifyIndicationTransfer, @@ -16081,6 +17008,7 @@ void proto_register_ngap(void) { &ett_ngap_QosFlowSetupResponseItemHOReqAck, &ett_ngap_QosFlowToBeForwardedList, &ett_ngap_QosFlowToBeForwardedItem, + &ett_ngap_RANStatusTransfer_TransparentContainer, &ett_ngap_RATRestrictions, &ett_ngap_RATRestrictions_Item, &ett_ngap_RecommendedCellsForPaging, @@ -16133,6 +17061,8 @@ void proto_register_ngap(void) { &ett_ngap_TNLAssociationItem, &ett_ngap_TNLInformationList, &ett_ngap_TNLInformationItem, + &ett_ngap_TNLMappingList, + &ett_ngap_TNLMappingItem, &ett_ngap_TraceActivation, &ett_ngap_UEAggregateMaximumBitRate, &ett_ngap_UE_associatedLogicalNG_connectionList, @@ -16144,7 +17074,10 @@ void proto_register_ngap(void) { &ett_ngap_UEPagingIdentity, &ett_ngap_UEPresenceInAreaOfInterestList, &ett_ngap_UEPresenceInAreaOfInterestItem, + &ett_ngap_UERadioCapabilityForPaging, &ett_ngap_UESecurityCapabilities, + &ett_ngap_UL_NGU_UP_TNLModifyList, + &ett_ngap_UL_NGU_UP_TNLModifyItem, &ett_ngap_UnavailableGUAMIList, &ett_ngap_UnavailableGUAMIItem, &ett_ngap_UP_TNLInformation, @@ -16244,7 +17177,7 @@ void proto_register_ngap(void) { &ett_ngap_UnsuccessfulOutcome, /*--- End of included file: packet-ngap-ettarr.c ---*/ -#line 597 "./asn1/ngap/packet-ngap-template.c" +#line 608 "./asn1/ngap/packet-ngap-template.c" }; static ei_register_info ei[] = {