diff options
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-Constants.asn | 70 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-Containers.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-IEs.asn | 553 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn | 441 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn | 82 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/e1ap.cnf | 204 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/packet-e1ap-template.c | 94 |
8 files changed, 1361 insertions, 87 deletions
diff --git a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn index 34523495a7..71d4ae7219 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- Common definitions diff --git a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn index 836b154ce6..93bc9416e9 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- Constant definitions @@ -46,6 +46,13 @@ id-gNB-CU-UP-CounterCheck ProcedureCode ::= 16 id-gNB-CU-UP-StatusIndication ProcedureCode ::= 17 id-uLDataNotification ProcedureCode ::= 18 id-mRDC-DataUsageReport ProcedureCode ::= 19 +id-TraceStart ProcedureCode ::= 20 +id-DeactivateTrace ProcedureCode ::= 21 +id-resourceStatusReportingInitiation ProcedureCode ::= 22 +id-resourceStatusReporting ProcedureCode ::= 23 +id-iAB-UPTNLAddressUpdate ProcedureCode ::= 24 +id-CellTrafficTrace ProcedureCode ::= 25 +id-earlyForwardingSNTransfer ProcedureCode ::= 26 -- ************************************************************** @@ -68,6 +75,12 @@ maxnoofUPParameters INTEGER ::= 8 maxnoofCellGroups INTEGER ::= 4 maxnooftimeperiods INTEGER ::= 2 maxnoofTNLAssociations INTEGER ::= 32 +maxnoofTLAs INTEGER ::= 16 +maxnoofGTPTLAs INTEGER ::= 16 +maxnoofTNLAddresses INTEGER ::= 8 +maxnoofMDTPLMNs INTEGER ::= 16 +maxnoofQoSParaSets INTEGER ::= 8 +maxnoofExtSliceItems INTEGER ::= 65535 -- ************************************************************** @@ -146,17 +159,62 @@ id-UEDLMaximumIntegrityProtectedDataRate ProtocolIE-ID ::= 66 id-PDU-Session-To-Notify-List ProtocolIE-ID ::= 67 id-PDU-Session-Resource-Data-Usage-List ProtocolIE-ID ::= 68 id-SNSSAI ProtocolIE-ID ::= 69 -id-DataDiscardRequired ProtocolIE-ID ::= 70 +id-DataDiscardRequired ProtocolIE-ID ::= 70 id-OldQoSFlowMap-ULendmarkerexpected ProtocolIE-ID ::= 71 -id-DRB-QoS ProtocolIE-ID ::= 72 +id-DRB-QoS ProtocolIE-ID ::= 72 id-GNB-CU-UP-TNLA-To-Remove-List ProtocolIE-ID ::= 73 id-endpoint-IP-Address-and-Port ProtocolIE-ID ::= 74 id-TNLAssociationTransportLayerAddressgNBCUUP ProtocolIE-ID ::= 75 -id-RANUEID ProtocolIE-ID ::= 76 +id-RANUEID ProtocolIE-ID ::= 76 id-GNB-DU-ID ProtocolIE-ID ::= 77 -id-CommonNetworkInstance ProtocolIE-ID ::= 78 +id-CommonNetworkInstance ProtocolIE-ID ::= 78 id-NetworkInstance ProtocolIE-ID ::= 79 -id-QoSFlowMappingIndication ProtocolIE-ID ::= 80 +id-QoSFlowMappingIndication ProtocolIE-ID ::= 80 +id-TraceActivation ProtocolIE-ID ::= 81 +id-TraceID ProtocolIE-ID ::= 82 +id-SubscriberProfileIDforRFP ProtocolIE-ID ::= 83 +id-AdditionalRRMPriorityIndex ProtocolIE-ID ::= 84 +id-RetainabilityMeasurementsInfo ProtocolIE-ID ::= 85 +id-Transport-Layer-Address-Info ProtocolIE-ID ::= 86 +id-QoSMonitoringRequest ProtocolIE-ID ::= 87 +id-PDCP-StatusReportIndication ProtocolIE-ID ::= 88 +id-gNB-CU-CP-Measurement-ID ProtocolIE-ID ::= 89 +id-gNB-CU-UP-Measurement-ID ProtocolIE-ID ::= 90 +id-RegistrationRequest ProtocolIE-ID ::= 91 +id-ReportCharacteristics ProtocolIE-ID ::= 92 +id-ReportingPeriodicity ProtocolIE-ID ::= 93 +id-TNL-AvailableCapacityIndicator ProtocolIE-ID ::= 94 +id-HW-CapacityIndicator ProtocolIE-ID ::= 95 +id-RedundantCommonNetworkInstance ProtocolIE-ID ::= 96 +id-redundant-nG-UL-UP-TNL-Information ProtocolIE-ID ::= 97 +id-redundant-nG-DL-UP-TNL-Information ProtocolIE-ID ::= 98 +id-RedundantQosFlowIndicator ProtocolIE-ID ::= 99 +id-TSCTrafficCharacteristics ProtocolIE-ID ::= 100 +id-CNPacketDelayBudgetDownlink ProtocolIE-ID ::= 101 +id-CNPacketDelayBudgetUplink ProtocolIE-ID ::= 102 +id-ExtendedPacketDelayBudget ProtocolIE-ID ::= 103 +id-AdditionalPDCPduplicationInformation ProtocolIE-ID ::= 104 +id-RedundantPDUSessionInformation ProtocolIE-ID ::= 105 +id-RedundantPDUSessionInformation-used ProtocolIE-ID ::= 106 +id-QoS-Mapping-Information ProtocolIE-ID ::= 107 +id-DLUPTNLAddressToUpdateList ProtocolIE-ID ::= 108 +id-ULUPTNLAddressToUpdateList ProtocolIE-ID ::= 109 +id-NPNSupportInfo ProtocolIE-ID ::= 110 +id-NPNContextInfo ProtocolIE-ID ::= 111 +id-MDTConfiguration ProtocolIE-ID ::= 112 +id-ManagementBasedMDTPLMNList ProtocolIE-ID ::= 113 +id-TraceCollectionEntityIPAddress ProtocolIE-ID ::= 114 +id-PrivacyIndicator ProtocolIE-ID ::= 115 +id-TraceCollectionEntityURI ProtocolIE-ID ::= 116 +id-URIaddress ProtocolIE-ID ::= 117 +id-EHC-Parameters ProtocolIE-ID ::= 118 +id-DRBs-Subject-To-Early-Forwarding-List ProtocolIE-ID ::= 119 +id-DAPSRequestInfo ProtocolIE-ID ::= 120 +id-CHOInitiation ProtocolIE-ID ::= 121 +id-EarlyForwardingCOUNTReq ProtocolIE-ID ::= 122 +id-EarlyForwardingCOUNTInfo ProtocolIE-ID ::= 123 +id-AlternativeQoSParaSetList ProtocolIE-ID ::= 124 + id-ExtendedSliceSupportList ProtocolIE-ID ::= 125 END diff --git a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn index 00b9210800..498689fab9 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- Container definitions diff --git a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn index 911d4851bb..85a06ba83b 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- Information Element Definitions @@ -24,6 +24,28 @@ IMPORTS id-QoSFlowMappingIndication, id-TNLAssociationTransportLayerAddressgNBCUUP, id-Cause, + id-QoSMonitoringRequest, + id-PDCP-StatusReportIndication, + id-RedundantCommonNetworkInstance, + id-redundant-nG-UL-UP-TNL-Information, + id-redundant-nG-DL-UP-TNL-Information, + id-RedundantQosFlowIndicator, + id-TSCTrafficCharacteristics, + id-ExtendedPacketDelayBudget, + id-CNPacketDelayBudgetDownlink, + id-CNPacketDelayBudgetUplink, + id-AdditionalPDCPduplicationInformation, + id-RedundantPDUSessionInformation, + id-RedundantPDUSessionInformation-used, + id-QoS-Mapping-Information, + id-MDTConfiguration, + id-TraceCollectionEntityURI, + id-EHC-Parameters, + id-DAPSRequestInfo, + id-EarlyForwardingCOUNTReq, + id-EarlyForwardingCOUNTInfo, + id-AlternativeQoSParaSetList, + maxnoofQoSParaSets, maxnoofErrors, maxnoofSliceItems, maxnoofEUTRANQOSParameters, @@ -34,7 +56,12 @@ IMPORTS maxnoofUPParameters, maxnoofCellGroups, maxnooftimeperiods, - maxnoofNRCGI + maxnoofNRCGI, + maxnoofTLAs, + maxnoofGTPTLAs, + maxnoofSPLMNs, + maxnoofMDTPLMNs, + maxnoofExtSliceItems FROM E1AP-Constants @@ -73,8 +100,32 @@ ActivityNotificationLevel ::= ENUMERATED { ... } +AdditionalPDCPduplicationInformation ::= ENUMERATED { + three, + four, + ... +} + +AdditionalRRMPriorityIndex ::= BIT STRING (SIZE(32)) + AveragingWindow ::= INTEGER (0..4095, ...) +AlternativeQoSParaSetList ::= SEQUENCE (SIZE(1..maxnoofQoSParaSets)) OF AlternativeQoSParaSetItem + +AlternativeQoSParaSetItem ::= SEQUENCE { + alternativeQoSParameterIndex INTEGER(1..8,...), + guaranteedFlowBitRateDL BitRate OPTIONAL, + guaranteedFlowBitRateUL BitRate OPTIONAL, + packetDelayBudget PacketDelayBudget OPTIONAL, + packetErrorRate PacketErrorRate OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {AlternativeQoSParaSetItem-ExtIEs} } OPTIONAL, + ... +} + +AlternativeQoSParaSetItem-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- B BearerContextStatusChange ::= ENUMERATED { @@ -148,13 +199,16 @@ CauseRadioNetwork ::= ENUMERATED { ..., ue-dl-max-IP-data-rate-reason, uP-integrity-protection-failure, - release-due-to-pre-emption + release-due-to-pre-emption, + rsn-not-available-for-the-up, + nPN-not-supported } CauseTransport ::= ENUMERATED { unspecified, transport-resource-unavailable, - ... + ..., + unknown-TNL-address-for-IAB } Cell-Group-Information ::= SEQUENCE (SIZE(1.. maxnoofCellGroups)) OF Cell-Group-Information-Item @@ -175,6 +229,8 @@ Cell-Group-Information-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { Cell-Group-ID ::= INTEGER (0..3, ...) +CHOInitiation ::= ENUMERATED {true, ...} + CipheringAlgorithm ::= ENUMERATED { nEA0, c-128-NEA1, @@ -248,6 +304,16 @@ CriticalityDiagnostics-IE-List-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { -- D +DAPSRequestInfo ::= SEQUENCE { + dapsIndicator ENUMERATED {daps-HO-required, ...}, + iE-Extensions ProtocolExtensionContainer { {DAPSRequestInfo-ExtIEs} } OPTIONAL, + ... +} + +DAPSRequestInfo-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + Data-Forwarding-Information-Request ::= SEQUENCE { data-Forwarding-Request Data-Forwarding-Request, qoS-Flows-Forwarded-On-Fwd-Tunnels QoS-Flow-Mapping-List OPTIONAL, @@ -324,6 +390,26 @@ DefaultDRB ::= ENUMERATED { DiscardTimer ::= ENUMERATED {ms10, ms20, ms30, ms40, ms50, ms60, ms75, ms100, ms150, ms200, ms250, ms300, ms500, ms750, ms1500, infinity} +DLDiscarding ::= SEQUENCE { + dLDiscardingCountVal PDCP-Count, + iE-Extensions ProtocolExtensionContainer { { DLDiscarding-ExtIEs } } OPTIONAL +} + +DLDiscarding-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +DLUPTNLAddressToUpdateItem ::= SEQUENCE { + oldTNLAdress TransportLayerAddress, + newTNLAdress TransportLayerAddress, + iE-Extensions ProtocolExtensionContainer { { DLUPTNLAddressToUpdateItemExtIEs } } OPTIONAL, + ... +} + +DLUPTNLAddressToUpdateItemExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + DL-TX-Stop ::= ENUMERATED { stop, resume, @@ -483,6 +569,21 @@ DRB-Modified-Item-NG-RAN ::= SEQUENCE { } DRB-Modified-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-EarlyForwardingCOUNTInfo CRITICALITY reject EXTENSION EarlyForwardingCOUNTInfo PRESENCE optional}| + {ID id-OldQoSFlowMap-ULendmarkerexpected CRITICALITY ignore EXTENSION QoS-Flow-List PRESENCE optional}, + ... +} + +DRB-Removed-Item ::= SEQUENCE { + dRB-ID DRB-ID, + dRB-Released-In-Session ENUMERATED {released-in-session, not-released-in-session, ...} OPTIONAL, + dRB-Accumulated-Session-Time OCTET STRING (SIZE(5)) OPTIONAL, + qoS-Flow-Removed-List SEQUENCE (SIZE(1.. maxnoofQoSFlows)) OF QoS-Flow-Removed-Item OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { DRB-Removed-Item-ExtIEs } } OPTIONAL, + ... +} + +DRB-Removed-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } @@ -621,6 +722,18 @@ DRBs-Subject-To-Counter-Check-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +DRBs-Subject-To-Early-Forwarding-List ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRBs-Subject-To-Early-Forwarding-Item + +DRBs-Subject-To-Early-Forwarding-Item ::= SEQUENCE { + dRB-ID DRB-ID, + dLCountValue PDCP-Count, + iE-Extensions ProtocolExtensionContainer { { DRBs-Subject-To-Early-Forwarding-Item-ExtIEs } } OPTIONAL, + ... +} + +DRBs-Subject-To-Early-Forwarding-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} DRB-To-Modify-List-EUTRAN ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-To-Modify-Item-EUTRAN @@ -666,7 +779,9 @@ DRB-To-Modify-Item-NG-RAN ::= SEQUENCE { DRB-To-Modify-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-OldQoSFlowMap-ULendmarkerexpected CRITICALITY reject EXTENSION QoS-Flow-List PRESENCE optional}| - {ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional}, + {ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional}| + {ID id-EarlyForwardingCOUNTReq CRITICALITY reject EXTENSION EarlyForwardingCOUNTReq PRESENCE optional}| + {ID id-EarlyForwardingCOUNTInfo CRITICALITY reject EXTENSION EarlyForwardingCOUNTInfo PRESENCE optional}, ... } @@ -775,7 +890,8 @@ DRB-To-Setup-Item-NG-RAN ::= SEQUENCE { } DRB-To-Setup-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional}, + {ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional}| + {ID id-DAPSRequestInfo CRITICALITY ignore EXTENSION DAPSRequestInfo PRESENCE optional}, ... } @@ -833,6 +949,9 @@ Dynamic5QIDescriptor ::= SEQUENCE { } Dynamic5QIDescriptor-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-ExtendedPacketDelayBudget CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }| + { ID id-CNPacketDelayBudgetDownlink CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }| + { ID id-CNPacketDelayBudgetUplink CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }, ... } @@ -843,6 +962,56 @@ DataDiscardRequired ::= ENUMERATED { -- E +EarlyForwardingCOUNTInfo ::= CHOICE { + firstDLCount FirstDLCount, + dLDiscardingCount DLDiscarding, + choice-Extension ProtocolIE-SingleContainer { { EarlyForwardingCOUNTInfo-ExtIEs} } +} + +EarlyForwardingCOUNTInfo-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + +EarlyForwardingCOUNTReq ::= ENUMERATED { first-dl-count, dl-discarding, ...} + +EHC-Common-Parameters ::= SEQUENCE { + ehc-CID-Length ENUMERATED { bits7, bits15, ...}, + iE-Extensions ProtocolExtensionContainer { { EHC-Common-Parameters-ExtIEs } } OPTIONAL +} + +EHC-Common-Parameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +EHC-Downlink-Parameters ::= SEQUENCE { + drb-ContinueEHC-DL ENUMERATED { true, ...}, + iE-Extensions ProtocolExtensionContainer { { EHC-Downlink-Parameters-ExtIEs } } OPTIONAL +} + +EHC-Downlink-Parameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +EHC-Uplink-Parameters ::= SEQUENCE { + drb-ContinueEHC-UL ENUMERATED { true, ...}, + iE-Extensions ProtocolExtensionContainer { { EHC-Uplink-Parameters-ExtIEs } } OPTIONAL +} + +EHC-Uplink-Parameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +EHC-Parameters ::= SEQUENCE { + ehc-Common EHC-Common-Parameters, + ehc-Downlink EHC-Downlink-Parameters OPTIONAL, + ehc-Uplink EHC-Uplink-Parameters OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { EHC-Parameters-ExtIEs } } OPTIONAL +} + +EHC-Parameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + EncryptionKey ::= OCTET STRING Endpoint-IP-address-and-port::= SEQUENCE { @@ -863,6 +1032,8 @@ EUTRANAllocationAndRetentionPriority ::= SEQUENCE { ... } +ExtendedPacketDelayBudget ::= INTEGER (1..65535, ...) + EUTRANAllocationAndRetentionPriority-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } @@ -891,8 +1062,19 @@ EUTRAN-QoS-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +ExtendedSliceSupportList ::= SEQUENCE (SIZE(1.. maxnoofExtSliceItems)) OF Slice-Support-Item + -- F +FirstDLCount ::= SEQUENCE { + firstDLCountVal PDCP-Count, + iE-Extensions ProtocolExtensionContainer { { FirstDLCount-ExtIEs } } OPTIONAL +} + +FirstDLCount-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- G GNB-CU-CP-Name ::= PrintableString(SIZE(1..150,...)) @@ -1005,11 +1187,24 @@ GBR-QoSFlowInformation::= SEQUENCE { } GBR-QosFlowInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-AlternativeQoSParaSetList CRITICALITY ignore EXTENSION AlternativeQoSParaSetList PRESENCE optional}, ... } GTP-TEID ::= OCTET STRING (SIZE (4)) +GTPTLAs ::= SEQUENCE (SIZE(1.. maxnoofGTPTLAs)) OF GTPTLA-Item + +GTPTLA-Item ::= SEQUENCE { + gTPTransportLayerAddresses TransportLayerAddress, + iE-Extensions ProtocolExtensionContainer { { GTPTLA-Item-ExtIEs } } OPTIONAL, + ... +} + +GTPTLA-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + GTPTunnel ::= SEQUENCE { transportLayerAddress TransportLayerAddress, gTP-TEID GTP-TEID, @@ -1030,6 +1225,17 @@ GNB-DU-ID ::= INTEGER (0..68719476735) HFN ::= INTEGER (0..4294967295) +HW-CapacityIndicator ::= SEQUENCE { + offeredThroughput INTEGER (1..16777216, ...), + availableThroughput INTEGER (0..100, ...), + iE-Extensions ProtocolExtensionContainer { { HW-CapacityIndicator-ExtIEs } }, + ... +} + +HW-CapacityIndicator-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- I IntegrityProtectionIndication ::= ENUMERATED { @@ -1057,15 +1263,36 @@ IntegrityProtectionResult ::= ENUMERATED { Inactivity-Timer ::= INTEGER (1..7200, ...) +InterfacesToTrace ::= BIT STRING (SIZE(8)) + +ImmediateMDT ::= SEQUENCE { +measurementsToActivate MeasurementsToActivate, + measurementFour M4Configuration OPTIONAL, + measurementSix M6Configuration OPTIONAL, + measurementSeven M7Configuration OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { ImmediateMDT-ExtIEs} } OPTIONAL, + ... +} +ImmediateMDT-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- J -- K -- L +Links-to-log ::= ENUMERATED { + uplink, + downlink, + both-uplink-and-downlink, + ... +} + -- M -MaxDataBurstVolume ::= INTEGER (0..4095, ...) +MaxDataBurstVolume ::= INTEGER (0..4095, ..., 4096.. 2000000) MaximumIPdatarate ::= SEQUENCE { maxIPrate MaxIPrate, @@ -1109,6 +1336,74 @@ MRDC-Usage-Information-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +M4Configuration ::= SEQUENCE { + m4period M4period, + m4-links-to-log Links-to-log, + iE-Extensions ProtocolExtensionContainer { { M4Configuration-ExtIEs} } OPTIONAL, + ... +} + +M4Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } + +M6Configuration ::= SEQUENCE { + m6report-Interval M6report-Interval, + m6-links-to-log Links-to-log, + iE-Extensions ProtocolExtensionContainer { { M6Configuration-ExtIEs} } OPTIONAL, + ... +} + +M6Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +M6report-Interval ::= ENUMERATED { ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, ms20480 ,ms40960, min1, min6, min12, min30, ... } + +M7Configuration ::= SEQUENCE { + m7period M7period, + m7-links-to-log Links-to-log, + iE-Extensions ProtocolExtensionContainer { { M7Configuration-ExtIEs} } OPTIONAL, + ... +} + +M7Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +M7period ::= INTEGER(1..60, ...) + +MDT-Activation ::= ENUMERATED { + immediate-MDT-only, + immediate-MDT-and-Trace, + ... +} + +MDT-Configuration ::= SEQUENCE { + mdt-Activation MDT-Activation, + mDTMode MDTMode, + iE-Extensions ProtocolExtensionContainer { { MDT-Configuration-ExtIEs} } OPTIONAL, + ... +} +MDT-Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +MDTMode ::= CHOICE { + immediateMDT ImmediateMDT, + choice-extension ProtocolIE-SingleContainer {{MDTMode-ExtIEs}} +} + +MDTMode-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + +MeasurementsToActivate ::= BIT STRING (SIZE (8)) + +MDTPLMNList ::= SEQUENCE (SIZE(1..maxnoofMDTPLMNs)) OF PLMN-Identity + -- N NetworkInstance ::= INTEGER (1..256, ...) @@ -1139,6 +1434,8 @@ NG-RAN-QoS-Support-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +NID ::= BIT STRING (SIZE (44)) + Non-Dynamic5QIDescriptor ::= SEQUENCE { fiveQI INTEGER (0..255, ...), qoSPriorityLevel QoSPriorityLevel OPTIONAL, @@ -1148,6 +1445,45 @@ Non-Dynamic5QIDescriptor ::= SEQUENCE { } Non-Dynamic5QIDescriptor-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-CNPacketDelayBudgetDownlink CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }| + { ID id-CNPacketDelayBudgetUplink CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }, + ... +} + +NPNSupportInfo ::= CHOICE { + sNPN NPNSupportInfo-SNPN, + choice-extension ProtocolIE-SingleContainer {{NPNSupportInfo-ExtIEs}} +} + +NPNSupportInfo-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + +NPNSupportInfo-SNPN ::= SEQUENCE { + nID NID, + iE-Extensions ProtocolExtensionContainer { { NPNSupportInfo-SNPN-ExtIEs } } OPTIONAL +} + + +NPNSupportInfo-SNPN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +NPNContextInfo ::= CHOICE { + sNPN NPNContextInfo-SNPN, + choice-extension ProtocolIE-SingleContainer {{NPNContextInfo-ExtIEs}} +} + +NPNContextInfo-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + +NPNContextInfo-SNPN ::= SEQUENCE { + nID NID, + iE-Extensions ProtocolExtensionContainer { {NPNContextInfo-SNPN-ExtIEs } } OPTIONAL +} + +NPNContextInfo-SNPN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } @@ -1219,6 +1555,9 @@ PDCP-Configuration ::= SEQUENCE { } PDCP-Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-PDCP-StatusReportIndication CRITICALITY ignore EXTENSION PDCP-StatusReportIndication PRESENCE optional}| + { ID id-AdditionalPDCPduplicationInformation CRITICALITY ignore EXTENSION AdditionalPDCPduplicationInformation PRESENCE optional }| + { ID id-EHC-Parameters CRITICALITY ignore EXTENSION EHC-Parameters PRESENCE optional}, ... } @@ -1281,6 +1620,13 @@ PDCP-SN-Status-Information ::= SEQUENCE { ... } +PDCP-StatusReportIndication ::= ENUMERATED { + downlink, + uplink, + both, + ... +} + DRBsSubjectToStatusTransfer-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } @@ -1386,6 +1732,7 @@ PDU-Session-Resource-Modified-Item ::= SEQUENCE { } PDU-Session-Resource-Modified-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-redundant-nG-DL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }, ... } @@ -1401,6 +1748,7 @@ PDU-Session-Resource-Required-To-Modify-Item ::= SEQUENCE { } PDU-Session-Resource-Required-To-Modify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-redundant-nG-DL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }, ... } @@ -1419,8 +1767,10 @@ PDU-Session-Resource-Setup-Item ::= SEQUENCE { } PDU-Session-Resource-Setup-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-redundant-nG-DL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }| + { ID id-RedundantPDUSessionInformation-used CRITICALITY ignore EXTENSION RedundantPDUSessionInformation PRESENCE optional }, ... -} +} PDU-Session-Resource-Setup-Mod-List ::= SEQUENCE (SIZE(1.. maxnoofPDUSessionResource)) OF PDU-Session-Resource-Setup-Mod-Item @@ -1436,6 +1786,7 @@ PDU-Session-Resource-Setup-Mod-Item ::= SEQUENCE { } PDU-Session-Resource-Setup-Mod-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-redundant-nG-DL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }, ... } @@ -1459,7 +1810,9 @@ PDU-Session-Resource-To-Modify-Item ::= SEQUENCE { PDU-Session-Resource-To-Modify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-SNSSAI CRITICALITY reject EXTENSION SNSSAI PRESENCE optional}| - { ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }, + { ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }| + {ID id-redundant-nG-UL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }| + {ID id-RedundantCommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }, ... } @@ -1495,7 +1848,10 @@ PDU-Session-Resource-To-Setup-Item ::= SEQUENCE { } PDU-Session-Resource-To-Setup-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - { ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }, + { ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }| + { ID id-redundant-nG-UL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }| + { ID id-RedundantCommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }| + { ID id-RedundantPDUSessionInformation CRITICALITY ignore EXTENSION RedundantPDUSessionInformation PRESENCE optional }, ... } @@ -1517,7 +1873,9 @@ PDU-Session-Resource-To-Setup-Mod-Item ::= SEQUENCE { PDU-Session-Resource-To-Setup-Mod-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-NetworkInstance CRITICALITY ignore EXTENSION NetworkInstance PRESENCE optional}| - {ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional}, + {ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional}| + {ID id-redundant-nG-UL-UP-TNL-Information CRITICALITY ignore EXTENSION UP-TNL-Information PRESENCE optional }| + {ID id-RedundantCommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }, ... } @@ -1561,6 +1919,12 @@ Pre-emptionVulnerability ::= ENUMERATED { pre-emptable } +PrivacyIndicator ::= ENUMERATED { + immediate-MDT, + logged-MDT, + ... +} + -- Q QCI ::= INTEGER (0..255) @@ -1643,6 +2007,8 @@ QoS-Flow-QoS-Parameter-Item ::= SEQUENCE { } QoS-Flow-QoS-Parameter-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-RedundantQosFlowIndicator CRITICALITY ignore EXTENSION RedundantQoSFlowIndicator PRESENCE optional}| + {ID id-TSCTrafficCharacteristics CRITICALITY ignore EXTENSION TSCTrafficCharacteristics PRESENCE optional}, ... } @@ -1658,9 +2024,30 @@ QoSFlowLevelQoSParameters ::= SEQUENCE { } QoSFlowLevelQoSParameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-QoSMonitoringRequest CRITICALITY ignore EXTENSION QosMonitoringRequest PRESENCE optional}, ... } +QosMonitoringRequest ::= ENUMERATED {ul, dl, both} + +QoS-Flow-Removed-Item ::= SEQUENCE { + qoS-Flow-Identifier QoS-Flow-Identifier, + qoS-Flow-Released-In-Session ENUMERATED {released-in-session, not-released-in-session, ...} OPTIONAL, + qoS-Flow-Accumulated-Session-Time OCTET STRING (SIZE(5)) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { QoS-Flow-Removed-Item-ExtIEs } } OPTIONAL, + ... +} + +QoS-Flow-Removed-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +QoS-Mapping-Information ::= SEQUENCE { +dscp BIT STRING (SIZE(6)) OPTIONAL, +flow-label BIT STRING (SIZE(20)) OPTIONAL, +... +} + -- R RANUEID ::= OCTET STRING (SIZE (8)) @@ -1671,6 +2058,36 @@ RAT-Type ::= ENUMERATED { ... } +RedundantQoSFlowIndicator::= ENUMERATED {true,false} + +RedundantPDUSessionInformation ::= SEQUENCE { + rSN RSN, + iE-Extensions ProtocolExtensionContainer { {RedundantPDUSessionInformation-ExtIEs} } OPTIONAL, + ... +} + +RedundantPDUSessionInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +RSN ::= ENUMERATED {v1, v2, ...} + +RetainabilityMeasurementsInfo ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-Removed-Item + +RegistrationRequest ::= ENUMERATED { + start, + stop, + ... +} + + +ReportCharacteristics ::= BIT STRING (SIZE(36)) + +ReportingPeriodicity ::= ENUMERATED { + ms500, ms1000, ms2000, ms5000, ms10000, ms20000, ms30000, ms40000, ms50000, ms60000, ms70000, ms80000, ms90000, ms100000, ms110000, ms120000, + ... +} + RLC-Mode ::= ENUMERATED { rlc-tm, rlc-am, @@ -1796,6 +2213,8 @@ SDAP-Header-UL ::= ENUMERATED { ... } +SubscriberProfileIDforRFP ::= INTEGER (1..256, ...) + -- T TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...} @@ -1807,6 +2226,69 @@ TNLAssociationUsage ::= ENUMERATED { ... } +TNL-AvailableCapacityIndicator ::= SEQUENCE { + dL-TNL-OfferedCapacity INTEGER (0..16777216, ...), + dL-TNL-AvailableCapacity INTEGER (0..100, ...), + uL-TNL-OfferedCapacity INTEGER (0..16777216, ...), + uL-TNL-AvailableCapacity INTEGER (0..100, ...), + iE-Extensions ProtocolExtensionContainer { { TNL-AvailableCapacityIndicator-ExtIEs } }, + ... +} + +TNL-AvailableCapacityIndicator-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +TSCTrafficCharacteristics ::= SEQUENCE { + tSCTrafficCharacteristicsUL TSCTrafficInformation OPTIONAL, + tSCTrafficCharacteristicsDL TSCTrafficInformation OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { TSCTrafficCharacteristics-ExtIEs } } OPTIONAL +} + +TSCTrafficCharacteristics-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +TSCTrafficInformation ::= SEQUENCE { + periodicity Periodicity, + burstArrivalTime BurstArrivalTime OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { TSCTrafficInformation-ExtIEs } } OPTIONAL +} + +TSCTrafficInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +Periodicity ::= INTEGER (1..640000, ...) + +BurstArrivalTime ::= OCTET STRING + +TraceActivation ::= SEQUENCE { + traceID TraceID, + interfacesToTrace InterfacesToTrace, + traceDepth TraceDepth, + traceCollectionEntityIPAddress TransportLayerAddress, + iE-Extensions ProtocolExtensionContainer { {TraceActivation-ExtIEs} } OPTIONAL, + ... +} + +TraceActivation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional }| + { ID id-TraceCollectionEntityURI CRITICALITY ignore EXTENSION URIaddress PRESENCE optional}, + ... +} + +TraceDepth ::= ENUMERATED { + minimum, + medium, + maximum, + minimumWithoutVendorSpecificExtension, + mediumWithoutVendorSpecificExtension, + maximumWithoutVendorSpecificExtension, + ... +} + +TraceID ::= OCTET STRING (SIZE(8)) TransportLayerAddress ::= BIT STRING (SIZE(1..160, ...)) @@ -1830,6 +2312,42 @@ TypeOfError ::= ENUMERATED { ... } +Transport-Layer-Address-Info ::= SEQUENCE { + transport-UP-Layer-Addresses-Info-To-Add-List Transport-UP-Layer-Addresses-Info-To-Add-List OPTIONAL, + transport-UP-Layer-Addresses-Info-To-Remove-List Transport-UP-Layer-Addresses-Info-To-Remove-List OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Transport-Layer-Address-Info-ExtIEs} } OPTIONAL, + ... + } + +Transport-Layer-Address-Info-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +Transport-UP-Layer-Addresses-Info-To-Add-List ::= SEQUENCE (SIZE(1.. maxnoofTLAs)) OF Transport-UP-Layer-Addresses-Info-To-Add-Item + +Transport-UP-Layer-Addresses-Info-To-Add-Item ::= SEQUENCE { + iP-SecTransportLayerAddress TransportLayerAddress, + gTPTransportLayerAddressesToAdd GTPTLAs OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Transport-UP-Layer-Addresses-Info-To-Add-ItemExtIEs } } OPTIONAL, + ... +} + +Transport-UP-Layer-Addresses-Info-To-Add-ItemExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +Transport-UP-Layer-Addresses-Info-To-Remove-List ::= SEQUENCE (SIZE(1.. maxnoofTLAs)) OF Transport-UP-Layer-Addresses-Info-To-Remove-Item + +Transport-UP-Layer-Addresses-Info-To-Remove-Item ::= SEQUENCE { + iP-SecTransportLayerAddress TransportLayerAddress, + gTPTransportLayerAddressesToRemove GTPTLAs OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Transport-UP-Layer-Addresses-Info-To-Remove-ItemExtIEs } } OPTIONAL, + ... +} + +Transport-UP-Layer-Addresses-Info-To-Remove-ItemExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} -- U UE-Activity ::= ENUMERATED { @@ -1856,6 +2374,17 @@ UL-Configuration ::= ENUMERATED { ... } +ULUPTNLAddressToUpdateItem ::= SEQUENCE { + oldTNLAdress TransportLayerAddress, + newTNLAdress TransportLayerAddress, + iE-Extensions ProtocolExtensionContainer { { ULUPTNLAddressToUpdateItemExtIEs } } OPTIONAL, + ... +} + +ULUPTNLAddressToUpdateItemExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + ULDataSplitThreshold ::= ENUMERATED {b0, b100, b200, b400, b800, b1600, b3200, b6400, b12800, b25600, b51200, b102400, b204800, b409600, b819200, b1228800, b1638400, b2457600, b3276800, b4096000, b4915200, b5734400, b6553600, infinity, ...} UP-Parameters ::= SEQUENCE (SIZE(1.. maxnoofUPParameters)) OF UP-Parameters-Item @@ -1868,6 +2397,7 @@ UP-Parameters-Item ::= SEQUENCE { } UP-Parameters-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-QoS-Mapping-Information CRITICALITY reject EXTENSION QoS-Mapping-Information PRESENCE optional}, ... } @@ -1902,6 +2432,7 @@ UplinkOnlyROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +URIaddress ::= VisibleString -- V diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn index f0af0c10e5..f97ccd4630 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- PDU definitions for E1AP @@ -9,7 +9,7 @@ E1AP-PDU-Contents { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) ngran-access (22) modules (3) e1ap (5) version1 (1) e1ap-PDU-Contents (1) } -DEFINITIONS AUTOMATIC TAGS ::= +DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -20,7 +20,7 @@ BEGIN -- ************************************************************** IMPORTS - + Cause, CriticalityDiagnostics, GNB-CU-CP-UE-E1AP-ID, @@ -50,6 +50,7 @@ IMPORTS DRB-To-Setup-Mod-List-EUTRAN, DRB-Setup-Mod-List-EUTRAN, DRB-Failed-Mod-List-EUTRAN, + ExtendedSliceSupportList, PDU-Session-Resource-To-Setup-List, PDU-Session-Resource-Setup-List, PDU-Session-Resource-Failed-List, @@ -86,7 +87,29 @@ IMPORTS DataDiscardRequired, PDU-Session-Resource-Data-Usage-List, RANUEID, - GNB-DU-ID + GNB-DU-ID, + TraceID, + TraceActivation, + SubscriberProfileIDforRFP, + AdditionalRRMPriorityIndex, + RetainabilityMeasurementsInfo, + Transport-Layer-Address-Info, + HW-CapacityIndicator, + RegistrationRequest, + ReportCharacteristics, + ReportingPeriodicity, + TNL-AvailableCapacityIndicator, + DLUPTNLAddressToUpdateItem, + ULUPTNLAddressToUpdateItem, + NPNContextInfo, + NPNSupportInfo, + MDTPLMNList, + PrivacyIndicator, + URIaddress, + DRBs-Subject-To-Early-Forwarding-List, + CHOInitiation, + ExtendedSliceSupportList, + TransportLayerAddress FROM E1AP-IEs @@ -102,10 +125,10 @@ FROM E1AP-IEs FROM E1AP-Containers - + id-Cause, id-CriticalityDiagnostics, - id-gNB-CU-CP-UE-E1AP-ID, + id-gNB-CU-CP-UE-E1AP-ID, id-gNB-CU-UP-UE-E1AP-ID, id-ResetType, id-UE-associatedLogicalE1-ConnectionItem, @@ -115,6 +138,8 @@ FROM E1AP-Containers id-gNB-CU-CP-Name, id-CNSupport, id-SupportedPLMNs, + id-NPNSupportInfo, + id-NPNContextInfo, id-SecurityInformation, id-UEDLAggregateMaximumBitRate, id-BearerContextStatusChange, @@ -125,7 +150,7 @@ FROM E1AP-Containers id-System-BearerContextModificationConfirm, id-System-BearerContextModificationRequired, id-DRB-Status-List, - id-Data-Usage-Report-List, + id-Data-Usage-Report-List, id-TimeToWait, id-ActivityNotificationLevel, id-ActivityInformation, @@ -176,19 +201,42 @@ FROM E1AP-Containers id-PDU-Session-Resource-Data-Usage-List, id-RANUEID, id-GNB-DU-ID, + id-TraceID, + id-TraceActivation, + id-SubscriberProfileIDforRFP, + id-AdditionalRRMPriorityIndex, + id-RetainabilityMeasurementsInfo, + id-Transport-Layer-Address-Info, + id-gNB-CU-CP-Measurement-ID, + id-gNB-CU-UP-Measurement-ID, + id-RegistrationRequest, + id-ReportCharacteristics, + id-ReportingPeriodicity, + id-TNL-AvailableCapacityIndicator, + id-HW-CapacityIndicator, + id-DLUPTNLAddressToUpdateList, + id-ULUPTNLAddressToUpdateList, + id-ManagementBasedMDTPLMNList, + id-TraceCollectionEntityIPAddress, + id-PrivacyIndicator, + id-URIaddress, + id-DRBs-Subject-To-Early-Forwarding-List, + id-CHOInitiation, + id-ExtendedSliceSupportList, maxnoofErrors, maxnoofSPLMNs, maxnoofDRBs, maxnoofTNLAssociations, - maxnoofIndividualE1ConnectionsToReset + maxnoofIndividualE1ConnectionsToReset, + maxnoofTNLAddresses + - FROM E1AP-Constants; -- ************************************************************** -- --- RESET +-- RESET -- -- ************************************************************** @@ -203,7 +251,7 @@ Reset ::= SEQUENCE { ... } -ResetIEs E1AP-PROTOCOL-IES ::= { +ResetIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| { ID id-ResetType CRITICALITY reject TYPE ResetType PRESENCE mandatory }, @@ -228,7 +276,7 @@ ResetAll ::= ENUMERATED { UE-associatedLogicalE1-ConnectionListRes ::= SEQUENCE (SIZE(1.. maxnoofIndividualE1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalE1-ConnectionItemRes } } UE-associatedLogicalE1-ConnectionItemRes E1AP-PROTOCOL-IES ::= { - + { ID id-UE-associatedLogicalE1-ConnectionItem CRITICALITY reject TYPE UE-associatedLogicalE1-ConnectionItem PRESENCE mandatory}, ... } @@ -273,7 +321,7 @@ ErrorIndication ::= SEQUENCE { ErrorIndication-IEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY ignore TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE optional}| - { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY ignore TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE optional}| + { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY ignore TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE optional}| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE optional}| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, ... @@ -302,22 +350,25 @@ GNB-CU-UP-E1SetupRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-Name CRITICALITY ignore TYPE GNB-CU-UP-Name PRESENCE optional }| { ID id-CNSupport CRITICALITY reject TYPE CNSupport PRESENCE mandatory }| { ID id-SupportedPLMNs CRITICALITY reject TYPE SupportedPLMNs-List PRESENCE mandatory }| - { ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }, + { ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... -} +} -SupportedPLMNs-List ::= SEQUENCE (SIZE (1..maxnoofSPLMNs)) OF SupportedPLMNs-Item +SupportedPLMNs-List ::= SEQUENCE (SIZE (1..maxnoofSPLMNs)) OF SupportedPLMNs-Item SupportedPLMNs-Item ::= SEQUENCE { pLMN-Identity PLMN-Identity, slice-Support-List Slice-Support-List OPTIONAL, nR-CGI-Support-List NR-CGI-Support-List OPTIONAL, qoS-Parameters-Support-List QoS-Parameters-Support-List OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { SupportedPLMNs-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { SupportedPLMNs-ExtIEs } } OPTIONAL, ... } SupportedPLMNs-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-NPNSupportInfo CRITICALITY reject EXTENSION NPNSupportInfo PRESENCE optional}| + { ID id-ExtendedSliceSupportList CRITICALITY reject EXTENSION ExtendedSliceSupportList PRESENCE optional}, ... } @@ -332,10 +383,10 @@ GNB-CU-UP-E1SetupResponse ::= SEQUENCE { ... } -GNB-CU-UP-E1SetupResponseIEs - E1AP-PROTOCOL-IES ::= { - { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| - { ID id-gNB-CU-CP-Name CRITICALITY ignore TYPE GNB-CU-CP-Name PRESENCE optional }, +GNB-CU-UP-E1SetupResponseIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| + { ID id-gNB-CU-CP-Name CRITICALITY ignore TYPE GNB-CU-CP-Name PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... } @@ -376,10 +427,11 @@ GNB-CU-CP-E1SetupRequest ::= SEQUENCE { } GNB-CU-CP-E1SetupRequestIEs E1AP-PROTOCOL-IES ::= { - { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| - { ID id-gNB-CU-CP-Name CRITICALITY ignore TYPE GNB-CU-CP-Name PRESENCE optional }, + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| + { ID id-gNB-CU-CP-Name CRITICALITY ignore TYPE GNB-CU-CP-Name PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... -} +} -- ************************************************************** -- @@ -392,14 +444,14 @@ GNB-CU-CP-E1SetupResponse ::= SEQUENCE { ... } -GNB-CU-CP-E1SetupResponseIEs - E1AP-PROTOCOL-IES ::= { +GNB-CU-CP-E1SetupResponseIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-gNB-CU-UP-ID CRITICALITY reject TYPE GNB-CU-UP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-Name CRITICALITY ignore TYPE GNB-CU-UP-Name PRESENCE optional }| { ID id-CNSupport CRITICALITY reject TYPE CNSupport PRESENCE mandatory }| { ID id-SupportedPLMNs CRITICALITY reject TYPE SupportedPLMNs-List PRESENCE mandatory }| - { ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }, + { ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... } @@ -445,9 +497,10 @@ GNB-CU-UP-ConfigurationUpdateIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-Name CRITICALITY ignore TYPE GNB-CU-UP-Name PRESENCE optional }| { ID id-SupportedPLMNs CRITICALITY reject TYPE SupportedPLMNs-List PRESENCE optional }| { ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }| - { ID id-GNB-CU-UP-TNLA-To-Remove-List CRITICALITY reject TYPE GNB-CU-UP-TNLA-To-Remove-List PRESENCE optional }, + { ID id-GNB-CU-UP-TNLA-To-Remove-List CRITICALITY reject TYPE GNB-CU-UP-TNLA-To-Remove-List PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... -} +} GNB-CU-UP-TNLA-To-Remove-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-UP-TNLA-To-Remove-Item @@ -462,10 +515,10 @@ GNB-CU-UP-ConfigurationUpdateAcknowledge ::= SEQUENCE { ... } -GNB-CU-UP-ConfigurationUpdateAcknowledgeIEs - E1AP-PROTOCOL-IES ::= { +GNB-CU-UP-ConfigurationUpdateAcknowledgeIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... } @@ -510,12 +563,13 @@ GNB-CU-CP-ConfigurationUpdateIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-Name CRITICALITY ignore TYPE GNB-CU-UP-Name PRESENCE optional }| { ID id-GNB-CU-CP-TNLA-To-Add-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-To-Add-List PRESENCE optional }| { ID id-GNB-CU-CP-TNLA-To-Remove-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-To-Remove-List PRESENCE optional }| - { ID id-GNB-CU-CP-TNLA-To-Update-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-To-Update-List PRESENCE optional }, + { ID id-GNB-CU-CP-TNLA-To-Update-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-To-Update-List PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... -} +} -GNB-CU-CP-TNLA-To-Add-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-To-Add-Item -GNB-CU-CP-TNLA-To-Remove-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-To-Remove-Item +GNB-CU-CP-TNLA-To-Add-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-To-Add-Item +GNB-CU-CP-TNLA-To-Remove-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-To-Remove-Item GNB-CU-CP-TNLA-To-Update-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-To-Update-Item -- ************************************************************** @@ -529,17 +583,17 @@ GNB-CU-CP-ConfigurationUpdateAcknowledge ::= SEQUENCE { ... } -GNB-CU-CP-ConfigurationUpdateAcknowledgeIEs - E1AP-PROTOCOL-IES ::= { +GNB-CU-CP-ConfigurationUpdateAcknowledgeIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| { ID id-GNB-CU-CP-TNLA-Setup-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-Setup-List PRESENCE optional }| - { ID id-GNB-CU-CP-TNLA-Failed-To-Setup-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-Failed-To-Setup-List PRESENCE optional }, + { ID id-GNB-CU-CP-TNLA-Failed-To-Setup-List CRITICALITY ignore TYPE GNB-CU-CP-TNLA-Failed-To-Setup-List PRESENCE optional }| + { ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }, ... } -GNB-CU-CP-TNLA-Setup-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-Setup-Item -GNB-CU-CP-TNLA-Failed-To-Setup-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-Failed-To-Setup-Item +GNB-CU-CP-TNLA-Setup-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-Setup-Item +GNB-CU-CP-TNLA-Failed-To-Setup-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-CP-TNLA-Failed-To-Setup-Item -- ************************************************************** @@ -578,7 +632,7 @@ E1ReleaseRequest ::= SEQUENCE { ... } -E1ReleaseRequestIEs E1AP-PROTOCOL-IES ::= { +E1ReleaseRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, ... @@ -628,9 +682,13 @@ BearerContextSetupRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-BearerContextStatusChange CRITICALITY reject TYPE BearerContextStatusChange PRESENCE optional }| { ID id-System-BearerContextSetupRequest CRITICALITY reject TYPE System-BearerContextSetupRequest PRESENCE mandatory }| { ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional }| - { ID id-GNB-DU-ID CRITICALITY ignore TYPE GNB-DU-ID PRESENCE optional }, + { ID id-GNB-DU-ID CRITICALITY ignore TYPE GNB-DU-ID PRESENCE optional }| + { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }| + { ID id-NPNContextInfo CRITICALITY reject TYPE NPNContextInfo PRESENCE optional}| + { ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional}| + { ID id-CHOInitiation CRITICALITY reject TYPE CHOInitiation PRESENCE optional }, ... -} +} System-BearerContextSetupRequest ::= CHOICE { e-UTRAN-BearerContextSetupRequest ProtocolIE-Container {{EUTRAN-BearerContextSetupRequest}}, @@ -644,7 +702,9 @@ System-BearerContextSetupRequest-ExtIEs E1AP-PROTOCOL-IES::= { EUTRAN-BearerContextSetupRequest E1AP-PROTOCOL-IES ::= { - { ID id-DRB-To-Setup-List-EUTRAN CRITICALITY reject TYPE DRB-To-Setup-List-EUTRAN PRESENCE mandatory }, + { ID id-DRB-To-Setup-List-EUTRAN CRITICALITY reject TYPE DRB-To-Setup-List-EUTRAN PRESENCE mandatory }| + { ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional }| + { ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }, ... } @@ -747,7 +807,7 @@ BearerContextModificationRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-GNB-DU-ID CRITICALITY ignore TYPE GNB-DU-ID PRESENCE optional }| { ID id-ActivityNotificationLevel CRITICALITY ignore TYPE ActivityNotificationLevel PRESENCE optional }, ... -} +} System-BearerContextModificationRequest ::= CHOICE { e-UTRAN-BearerContextModificationRequest ProtocolIE-Container {{EUTRAN-BearerContextModificationRequest}}, @@ -762,7 +822,9 @@ System-BearerContextModificationRequest-ExtIEs E1AP-PROTOCOL-IES ::= { EUTRAN-BearerContextModificationRequest E1AP-PROTOCOL-IES ::= { { ID id-DRB-To-Setup-Mod-List-EUTRAN CRITICALITY reject TYPE DRB-To-Setup-Mod-List-EUTRAN PRESENCE optional }| { ID id-DRB-To-Modify-List-EUTRAN CRITICALITY reject TYPE DRB-To-Modify-List-EUTRAN PRESENCE optional }| - { ID id-DRB-To-Remove-List-EUTRAN CRITICALITY reject TYPE DRB-To-Remove-List-EUTRAN PRESENCE optional }, + { ID id-DRB-To-Remove-List-EUTRAN CRITICALITY reject TYPE DRB-To-Remove-List-EUTRAN PRESENCE optional }| + { ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional }| + { ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }, ... } @@ -807,7 +869,8 @@ EUTRAN-BearerContextModificationResponse E1AP-PROTOCOL-IES ::= { { ID id-DRB-Setup-Mod-List-EUTRAN CRITICALITY ignore TYPE DRB-Setup-Mod-List-EUTRAN PRESENCE optional }| { ID id-DRB-Failed-Mod-List-EUTRAN CRITICALITY ignore TYPE DRB-Failed-Mod-List-EUTRAN PRESENCE optional }| { ID id-DRB-Modified-List-EUTRAN CRITICALITY ignore TYPE DRB-Modified-List-EUTRAN PRESENCE optional }| - { ID id-DRB-Failed-To-Modify-List-EUTRAN CRITICALITY ignore TYPE DRB-Failed-To-Modify-List-EUTRAN PRESENCE optional }, + { ID id-DRB-Failed-To-Modify-List-EUTRAN CRITICALITY ignore TYPE DRB-Failed-To-Modify-List-EUTRAN PRESENCE optional }| + { ID id-RetainabilityMeasurementsInfo CRITICALITY ignore TYPE RetainabilityMeasurementsInfo PRESENCE optional }, ... } @@ -815,7 +878,8 @@ NG-RAN-BearerContextModificationResponse E1AP-PROTOCOL-IES ::= { { ID id-PDU-Session-Resource-Setup-Mod-List CRITICALITY reject TYPE PDU-Session-Resource-Setup-Mod-List PRESENCE optional }| { ID id-PDU-Session-Resource-Failed-Mod-List CRITICALITY reject TYPE PDU-Session-Resource-Failed-Mod-List PRESENCE optional }| { ID id-PDU-Session-Resource-Modified-List CRITICALITY reject TYPE PDU-Session-Resource-Modified-List PRESENCE optional }| - { ID id-PDU-Session-Resource-Failed-To-Modify-List CRITICALITY reject TYPE PDU-Session-Resource-Failed-To-Modify-List PRESENCE optional }, + { ID id-PDU-Session-Resource-Failed-To-Modify-List CRITICALITY reject TYPE PDU-Session-Resource-Failed-To-Modify-List PRESENCE optional }| + { ID id-RetainabilityMeasurementsInfo CRITICALITY ignore TYPE RetainabilityMeasurementsInfo PRESENCE optional }, ... } @@ -859,9 +923,9 @@ BearerContextModificationRequired ::= SEQUENCE { BearerContextModificationRequiredIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| - { ID id-System-BearerContextModificationRequired CRITICALITY reject TYPE System-BearerContextModificationRequired PRESENCE mandatory }, + { ID id-System-BearerContextModificationRequired CRITICALITY reject TYPE System-BearerContextModificationRequired PRESENCE mandatory }, ... -} +} System-BearerContextModificationRequired ::= CHOICE { e-UTRAN-BearerContextModificationRequired ProtocolIE-Container {{EUTRAN-BearerContextModificationRequired}}, @@ -946,9 +1010,9 @@ BearerContextReleaseCommand ::= SEQUENCE { BearerContextReleaseCommandIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| - { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, + { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, ... -} +} -- ************************************************************** -- @@ -965,7 +1029,8 @@ BearerContextReleaseComplete ::= SEQUENCE { BearerContextReleaseCompleteIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| + { ID id-RetainabilityMeasurementsInfo CRITICALITY ignore TYPE RetainabilityMeasurementsInfo PRESENCE optional }, ... } @@ -990,9 +1055,9 @@ BearerContextReleaseRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| { ID id-DRB-Status-List CRITICALITY ignore TYPE DRB-Status-List PRESENCE optional }| - { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, + { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, ... -} +} DRB-Status-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF DRB-Status-Item @@ -1019,7 +1084,7 @@ BearerContextInactivityNotificationIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| { ID id-ActivityInformation CRITICALITY reject TYPE ActivityInformation PRESENCE mandatory }, ... -} +} -- ************************************************************** @@ -1044,7 +1109,7 @@ DLDataNotificationIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| { ID id-PPI CRITICALITY ignore TYPE PPI PRESENCE optional }, ... -} +} -- ************************************************************** @@ -1086,7 +1151,7 @@ DataUsageReport ::= SEQUENCE { DataUsageReportIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| - { ID id-Data-Usage-Report-List CRITICALITY ignore TYPE Data-Usage-Report-List PRESENCE mandatory }, + { ID id-Data-Usage-Report-List CRITICALITY ignore TYPE Data-Usage-Report-List PRESENCE mandatory }, ... } @@ -1113,7 +1178,7 @@ GNB-CU-UP-CounterCheckRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| { ID id-System-GNB-CU-UP-CounterCheckRequest CRITICALITY reject TYPE System-GNB-CU-UP-CounterCheckRequest PRESENCE mandatory }, ... -} +} System-GNB-CU-UP-CounterCheckRequest ::= CHOICE { e-UTRAN-GNB-CU-UP-CounterCheckRequest ProtocolIE-Container {{EUTRAN-GNB-CU-UP-CounterCheckRequest}}, @@ -1155,7 +1220,7 @@ GNB-CU-UP-StatusIndication ::= SEQUENCE { } -GNB-CU-UP-StatusIndicationIEs E1AP-PROTOCOL-IES ::= { +GNB-CU-UP-StatusIndicationIEs E1AP-PROTOCOL-IES ::= { { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| { ID id-GNB-CU-UP-OverloadInformation CRITICALITY reject TYPE GNB-CU-UP-OverloadInformation PRESENCE mandatory }, ... @@ -1179,6 +1244,70 @@ MRDC-DataUsageReportIEs E1AP-PROTOCOL-IES ::= { ... } + +-- ************************************************************** +-- +-- TRACE ELEMENTARY PROCEDURES +-- +-- ************************************************************** + +-- ************************************************************** +-- +-- TRACE START +-- +-- ************************************************************** + +TraceStart ::= SEQUENCE { + protocolIEs ProtocolIE-Container { {TraceStartIEs} }, + ... +} + +TraceStartIEs E1AP-PROTOCOL-IES ::= { + { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE mandatory }, + ... +} + +-- ************************************************************** +-- +-- DEACTIVATE TRACE +-- +-- ************************************************************** + +DeactivateTrace ::= SEQUENCE { + protocolIEs ProtocolIE-Container { {DeactivateTraceIEs} }, + ... +} + +DeactivateTraceIEs E1AP-PROTOCOL-IES ::= { + { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-TraceID CRITICALITY ignore TYPE TraceID PRESENCE mandatory }, + ... +} + +-- ************************************************************** +-- +-- Cell Traffic Trace +-- +-- ************************************************************** + +CellTrafficTrace ::= SEQUENCE { +protocolIEs ProtocolIE-Container { { CellTrafficTraceIEs } }, +... +} + +CellTrafficTraceIEs E1AP-PROTOCOL-IES ::= { + {ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| + {ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| + {ID id-TraceID CRITICALITY ignore TYPE TraceID PRESENCE mandatory}| + {ID id-TraceCollectionEntityIPAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE mandatory }| + {ID id-PrivacyIndicator CRITICALITY ignore TYPE PrivacyIndicator PRESENCE optional}| +{ID id-URIaddress CRITICALITY ignore TYPE URIaddress PRESENCE optional}, + ... +} + -- ************************************************************** -- -- PRIVATE MESSAGE @@ -1195,4 +1324,194 @@ PrivateMessage-IEs E1AP-PRIVATE-IES ::= { ... } +-- ************************************************************** +-- +-- RESOURCE STATUS REQUEST +-- +-- ************************************************************** + +ResourceStatusRequest ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { ResourceStatusRequestIEs } }, + ... +} + +-- WS modification: define a specific type +Measurement-ID ::= INTEGER (1..4095, ...) + +ResourceStatusRequestIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE INTEGER (1..4095, ...) PRESENCE mandatory}| + { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE INTEGER (1..4095, ...) PRESENCE optional}| + { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE optional}| + { ID id-RegistrationRequest CRITICALITY reject TYPE RegistrationRequest PRESENCE mandatory}| + { ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE conditional}| + { ID id-ReportingPeriodicity CRITICALITY reject TYPE ReportingPeriodicity PRESENCE optional}, + ... +} + +-- ************************************************************** +-- +-- RESOURCE STATUS RESPONSE +-- +-- ************************************************************** + + +ResourceStatusResponse ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { ResourceStatusResponseIEs } }, + ... +} + +ResourceStatusResponseIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE INTEGER (1..4095, ...) PRESENCE mandatory}| + { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE INTEGER (1..4095, ...) PRESENCE mandatory}| + { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE mandatory}| + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + ... +} + +-- ************************************************************** +-- +-- RESOURCE STATUS FAILURE +-- +-- ************************************************************** + +ResourceStatusFailure ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { ResourceStatusFailureIEs } }, + ... +} + +ResourceStatusFailureIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE INTEGER (1..4095, ...) PRESENCE mandatory}| + { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE INTEGER (1..4095, ...) PRESENCE optional}| + { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE optional}| + { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}| + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + ... +} + +-- ************************************************************** +-- +-- RESOURCE STATUS UPDATE +-- +-- ************************************************************** + +ResourceStatusUpdate ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { ResourceStatusUpdateIEs } }, + ... +} + +ResourceStatusUpdateIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE INTEGER (1..4095, ...) PRESENCE mandatory}| + { ID id-gNB-CU-CP-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}| +-- WS modification: define a specific type +-- { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE INTEGER (1..4095, ...) PRESENCE optional}| + { ID id-gNB-CU-UP-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE optional}| + { ID id-TNL-AvailableCapacityIndicator CRITICALITY ignore TYPE TNL-AvailableCapacityIndicator PRESENCE optional}| + { ID id-HW-CapacityIndicator CRITICALITY ignore TYPE HW-CapacityIndicator PRESENCE mandatory}, + + ... +} + +-- ************************************************************** +-- +-- IAB UP TNL ADDRESS UPDATE +-- +-- ************************************************************** + +-- ************************************************************** +-- +-- IAB UP TNL Address Update +-- +-- ************************************************************** + +IAB-UPTNLAddressUpdate ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { IAB-UPTNLAddressUpdateIEs} }, + ... +} + +IAB-UPTNLAddressUpdateIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| + { ID id-DLUPTNLAddressToUpdateList CRITICALITY ignore TYPE DLUPTNLAddressToUpdateList PRESENCE optional }, + ... +} + +DLUPTNLAddressToUpdateList ::= SEQUENCE (SIZE(1.. maxnoofTNLAddresses)) OF DLUPTNLAddressToUpdateItem + +-- ************************************************************** +-- +-- IAB UP TNL Address Update Acknowledge +-- +-- ************************************************************** + +IAB-UPTNLAddressUpdateAcknowledge ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { IAB-UPTNLAddressUpdateAcknowledgeIEs} }, + ... +} + +IAB-UPTNLAddressUpdateAcknowledgeIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| + { ID id-ULUPTNLAddressToUpdateList CRITICALITY ignore TYPE ULUPTNLAddressToUpdateList PRESENCE optional }, + ... +} + +ULUPTNLAddressToUpdateList ::= SEQUENCE (SIZE(1.. maxnoofTNLAddresses)) OF ULUPTNLAddressToUpdateItem + + +-- ************************************************************** +-- +-- IAB UP TNL Address Update Failure +-- +-- ************************************************************** + +IAB-UPTNLAddressUpdateFailure ::= SEQUENCE { + protocolIEs ProtocolIE-Container { {IAB-UPTNLAddressUpdateFailureIEs} }, + ... +} + +IAB-UPTNLAddressUpdateFailureIEs E1AP-PROTOCOL-IES ::= { + { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }| + { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| + { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }| + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, + ... +} + +-- ************************************************************** +-- +-- EARLY FORWARDING SN TRANSFER +-- +-- ************************************************************** + +-- ************************************************************** +-- +-- Early Forwarding SN Transfer +-- +-- ************************************************************** + +EarlyForwardingSNTransfer ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { EarlyForwardingSNTransferIEs } }, + ... +} + +EarlyForwardingSNTransferIEs E1AP-PROTOCOL-IES ::= { + { ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }| + { ID id-DRBs-Subject-To-Early-Forwarding-List CRITICALITY reject TYPE DRBs-Subject-To-Early-Forwarding-List PRESENCE mandatory }, + ... +} + END diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn index b52b044cfd..2bb00460c5 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.463 V15.4.0 (2019-07) +-- 3GPP TS 38.463 V16.2.0 (2020-07) -- ************************************************************** -- -- Elementary Procedure definitions @@ -59,7 +59,18 @@ FROM E1AP-CommonDataTypes GNB-CU-UP-CounterCheckRequest, GNB-CU-UP-StatusIndication, MRDC-DataUsageReport, - PrivateMessage + DeactivateTrace, + TraceStart, + PrivateMessage, + ResourceStatusRequest, + ResourceStatusResponse, + ResourceStatusFailure, + ResourceStatusUpdate, + IAB-UPTNLAddressUpdate, + IAB-UPTNLAddressUpdateAcknowledge, + IAB-UPTNLAddressUpdateFailure, + CellTrafficTrace, + EarlyForwardingSNTransfer FROM E1AP-PDU-Contents id-reset, @@ -81,7 +92,14 @@ FROM E1AP-PDU-Contents id-gNB-CU-UP-CounterCheck, id-gNB-CU-UP-StatusIndication, id-mRDC-DataUsageReport, - id-privateMessage + id-DeactivateTrace, + id-TraceStart, + id-privateMessage, + id-resourceStatusReportingInitiation, + id-resourceStatusReporting, + id-iAB-UPTNLAddressUpdate, + id-CellTrafficTrace, + id-earlyForwardingSNTransfer FROM E1AP-Constants; @@ -161,7 +179,9 @@ E1AP-ELEMENTARY-PROCEDURES-CLASS-1 E1AP-ELEMENTARY-PROCEDURE ::= { bearerContextSetup | bearerContextModification | bearerContextModificationRequired | - bearerContextRelease , + bearerContextRelease | + resourceStatusReportingInitiation | + iAB-UPTNLAddressUpdate , ... } @@ -175,7 +195,13 @@ E1AP-ELEMENTARY-PROCEDURES-CLASS-2 E1AP-ELEMENTARY-PROCEDURE ::= { gNB-CU-UP-CounterCheck | gNB-CU-UP-StatusIndication | mRDC-DataUsageReport | - privateMessage , + deactivateTrace | + traceStart | + privateMessage | + privateMessage | + cellTrafficTrace | + resourceStatusReporting | + earlyForwardingSNTransfer , ... } @@ -321,4 +347,50 @@ mRDC-DataUsageReport E1AP-ELEMENTARY-PROCEDURE ::= { CRITICALITY ignore } +deactivateTrace E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE DeactivateTrace + PROCEDURE CODE id-DeactivateTrace + CRITICALITY ignore +} + +traceStart E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE TraceStart + PROCEDURE CODE id-TraceStart + CRITICALITY ignore +} + +resourceStatusReportingInitiation E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE ResourceStatusRequest + SUCCESSFUL OUTCOME ResourceStatusResponse + UNSUCCESSFUL OUTCOME ResourceStatusFailure + PROCEDURE CODE id-resourceStatusReportingInitiation + CRITICALITY reject +} + +resourceStatusReporting E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE ResourceStatusUpdate + PROCEDURE CODE id-resourceStatusReporting + CRITICALITY ignore +} + +iAB-UPTNLAddressUpdate E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE IAB-UPTNLAddressUpdate + SUCCESSFUL OUTCOME IAB-UPTNLAddressUpdateAcknowledge + UNSUCCESSFUL OUTCOME IAB-UPTNLAddressUpdateFailure + PROCEDURE CODE id-iAB-UPTNLAddressUpdate + CRITICALITY reject +} + +cellTrafficTrace E1AP-ELEMENTARY-PROCEDURE ::={ + INITIATING MESSAGE CellTrafficTrace + PROCEDURE CODE id-CellTrafficTrace + CRITICALITY ignore +} + +earlyForwardingSNTransfer E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE EarlyForwardingSNTransfer + PROCEDURE CODE id-earlyForwardingSNTransfer + CRITICALITY ignore +} + END diff --git a/epan/dissectors/asn1/e1ap/e1ap.cnf b/epan/dissectors/asn1/e1ap/e1ap.cnf index 8e62acc3e5..baa858b929 100644 --- a/epan/dissectors/asn1/e1ap/e1ap.cnf +++ b/epan/dissectors/asn1/e1ap/e1ap.cnf @@ -139,6 +139,13 @@ id-gNB-CU-UP-CounterCheck ProcedureCode id-gNB-CU-UP-StatusIndication ProcedureCode id-uLDataNotification ProcedureCode id-mRDC-DataUsageReport ProcedureCode +id-TraceStart ProcedureCode +id-DeactivateTrace ProcedureCode +id-resourceStatusReportingInitiation ProcedureCode +id-resourceStatusReporting ProcedureCode +id-iAB-UPTNLAddressUpdate ProcedureCode +id-CellTrafficTrace ProcedureCode +id-earlyForwardingSNTransfer ProcedureCode # ProtocolIE-ID id-Cause ProtocolIE-ID @@ -222,6 +229,51 @@ id-GNB-DU-ID ProtocolIE-ID id-CommonNetworkInstance ProtocolIE-ID id-NetworkInstance ProtocolIE-ID id-QoSFlowMappingIndication ProtocolIE-ID +id-TraceActivation ProtocolIE-ID +id-TraceID ProtocolIE-ID +id-SubscriberProfileIDforRFP ProtocolIE-ID +id-AdditionalRRMPriorityIndex ProtocolIE-ID +id-RetainabilityMeasurementsInfo ProtocolIE-ID +id-Transport-Layer-Address-Info ProtocolIE-ID +id-QoSMonitoringRequest ProtocolIE-ID +id-PDCP-StatusReportIndication ProtocolIE-ID +id-gNB-CU-CP-Measurement-ID ProtocolIE-ID +id-gNB-CU-UP-Measurement-ID ProtocolIE-ID +id-RegistrationRequest ProtocolIE-ID +id-ReportCharacteristics ProtocolIE-ID +id-ReportingPeriodicity ProtocolIE-ID +id-TNL-AvailableCapacityIndicator ProtocolIE-ID +id-HW-CapacityIndicator ProtocolIE-ID +id-RedundantCommonNetworkInstance ProtocolIE-ID +id-redundant-nG-UL-UP-TNL-Information ProtocolIE-ID +id-redundant-nG-DL-UP-TNL-Information ProtocolIE-ID +id-RedundantQosFlowIndicator ProtocolIE-ID +id-TSCTrafficCharacteristics ProtocolIE-ID +id-CNPacketDelayBudgetDownlink ProtocolIE-ID +id-CNPacketDelayBudgetUplink ProtocolIE-ID +id-ExtendedPacketDelayBudget ProtocolIE-ID +id-AdditionalPDCPduplicationInformation ProtocolIE-ID +id-RedundantPDUSessionInformation ProtocolIE-ID +id-RedundantPDUSessionInformation-used ProtocolIE-ID +id-QoS-Mapping-Information ProtocolIE-ID +id-DLUPTNLAddressToUpdateList ProtocolIE-ID +id-ULUPTNLAddressToUpdateList ProtocolIE-ID +id-NPNSupportInfo ProtocolIE-ID +id-NPNContextInfo ProtocolIE-ID +id-MDTConfiguration ProtocolIE-ID +id-ManagementBasedMDTPLMNList ProtocolIE-ID +id-TraceCollectionEntityIPAddress ProtocolIE-ID +id-PrivacyIndicator ProtocolIE-ID +id-TraceCollectionEntityURI ProtocolIE-ID +id-URIaddress ProtocolIE-ID +id-EHC-Parameters ProtocolIE-ID +id-DRBs-Subject-To-Early-Forwarding-List ProtocolIE-ID +id-DAPSRequestInfo ProtocolIE-ID +id-CHOInitiation ProtocolIE-ID +id-EarlyForwardingCOUNTReq ProtocolIE-ID +id-EarlyForwardingCOUNTInfo ProtocolIE-ID +id-AlternativeQoSParaSetList ProtocolIE-ID +id-ExtendedSliceSupportList ProtocolIE-ID #.END #.REGISTER @@ -301,6 +353,28 @@ GNB-CU-UP-TNLA-To-Remove-List N e1ap.ies id-GNB-CU-UP-TNLA-To-Rem Endpoint-IP-address-and-port N e1ap.ies id-endpoint-IP-Address-and-Port RANUEID N e1ap.ies id-RANUEID GNB-DU-ID N e1ap.ies id-GNB-DU-ID +TraceActivation N e1ap.ies id-TraceActivation +TraceID N e1ap.ies id-TraceID +SubscriberProfileIDforRFP N e1ap.ies id-SubscriberProfileIDforRFP +AdditionalRRMPriorityIndex N e1ap.ies id-AdditionalRRMPriorityIndex +RetainabilityMeasurementsInfo N e1ap.ies id-RetainabilityMeasurementsInfo +Transport-Layer-Address-Info N e1ap.ies id-Transport-Layer-Address-Info +Measurement-ID N e1ap.ies id-gNB-CU-CP-Measurement-ID +Measurement-ID N e1ap.ies id-gNB-CU-UP-Measurement-ID +RegistrationRequest N e1ap.ies id-RegistrationRequest +ReportCharacteristics N e1ap.ies id-ReportCharacteristics +ReportingPeriodicity N e1ap.ies id-ReportingPeriodicity +TNL-AvailableCapacityIndicator N e1ap.ies id-TNL-AvailableCapacityIndicator +HW-CapacityIndicator N e1ap.ies id-HW-CapacityIndicator +DLUPTNLAddressToUpdateList N e1ap.ies id-DLUPTNLAddressToUpdateList +ULUPTNLAddressToUpdateList N e1ap.ies id-ULUPTNLAddressToUpdateList +NPNContextInfo N e1ap.ies id-NPNContextInfo +MDTPLMNList N e1ap.ies id-ManagementBasedMDTPLMNList +TransportLayerAddress N e1ap.ies id-TraceCollectionEntityIPAddress +PrivacyIndicator N e1ap.ies id-PrivacyIndicator +URIaddress N e1ap.ies id-URIaddress +DRBs-Subject-To-Early-Forwarding-List N e1ap.ies id-DRBs-Subject-To-Early-Forwarding-List +CHOInitiation N e1ap.ies id-CHOInitiation #E1AP-PROTOCOL-EXTENSION SNSSAI N e1ap.extension id-SNSSAI @@ -310,6 +384,29 @@ CP-TNL-Information N e1ap.extension id-TNLAssociationT CommonNetworkInstance N e1ap.extension id-CommonNetworkInstance NetworkInstance N e1ap.extension id-NetworkInstance QoS-Flow-Mapping-Indication N e1ap.extension id-QoSFlowMappingIndication +QosMonitoringRequest N e1ap.extension id-QoSMonitoringRequest +PDCP-StatusReportIndication N e1ap.extension id-PDCP-StatusReportIndication +CommonNetworkInstance N e1ap.extension id-RedundantCommonNetworkInstance +UP-TNL-Information N e1ap.extension id-redundant-nG-UL-UP-TNL-Information +UP-TNL-Information N e1ap.extension id-redundant-nG-DL-UP-TNL-Information +RedundantQoSFlowIndicator N e1ap.extension id-RedundantQosFlowIndicator +TSCTrafficCharacteristics N e1ap.extension id-TSCTrafficCharacteristics +ExtendedPacketDelayBudget N e1ap.extension id-CNPacketDelayBudgetDownlink +ExtendedPacketDelayBudget N e1ap.extension id-CNPacketDelayBudgetUplink +ExtendedPacketDelayBudget N e1ap.extension id-ExtendedPacketDelayBudget +AdditionalPDCPduplicationInformation N e1ap.extension id-AdditionalPDCPduplicationInformation +RedundantPDUSessionInformation N e1ap.extension id-RedundantPDUSessionInformation +RedundantPDUSessionInformation N e1ap.extension id-RedundantPDUSessionInformation-used +QoS-Mapping-Information N e1ap.extension id-QoS-Mapping-Information +NPNSupportInfo N e1ap.extension id-NPNSupportInfo +MDT-Configuration N e1ap.extension id-MDTConfiguration +URIaddress N e1ap.extension id-TraceCollectionEntityURI +EHC-Parameters N e1ap.extension id-EHC-Parameters +DAPSRequestInfo N e1ap.extension id-DAPSRequestInfo +EarlyForwardingCOUNTReq N e1ap.extension id-EarlyForwardingCOUNTReq +EarlyForwardingCOUNTInfo N e1ap.extension id-EarlyForwardingCOUNTInfo +AlternativeQoSParaSetList N e1ap.extension id-AlternativeQoSParaSetList +ExtendedSliceSupportList N e1ap.extension id-ExtendedSliceSupportList #E1AP-ELEMENTARY-PROCEDURE Reset N e1ap.proc.imsg id-reset @@ -368,6 +465,24 @@ PrivateMessage N e1ap.proc.imsg id-privateMessage MRDC-DataUsageReport N e1ap.proc.imsg id-mRDC-DataUsageReport +DeactivateTrace N e1ap.proc.imsg id-DeactivateTrace + +TraceStart N e1ap.proc.imsg id-TraceStart + +ResourceStatusRequest N e1ap.proc.imsg id-resourceStatusReportingInitiation +ResourceStatusResponse N e1ap.proc.sout id-resourceStatusReportingInitiation +ResourceStatusFailure N e1ap.proc.uout id-resourceStatusReportingInitiation + +ResourceStatusUpdate N e1ap.proc.imsg id-resourceStatusReporting + +IAB-UPTNLAddressUpdate N e1ap.proc.imsg id-iAB-UPTNLAddressUpdate +IAB-UPTNLAddressUpdateAcknowledge N e1ap.proc.sout id-iAB-UPTNLAddressUpdate +IAB-UPTNLAddressUpdateFailure N e1ap.proc.uout id-iAB-UPTNLAddressUpdate + +CellTrafficTrace N e1ap.proc.imsg id-CellTrafficTrace + +EarlyForwardingSNTransfer N e1ap.proc.imsg id-earlyForwardingSNTransfer + #.FN_BODY PLMN-Identity VAL_PTR = ¶m_tvb tvbuff_t *param_tvb = NULL; %(DEFAULT_BODY)s @@ -475,6 +590,73 @@ MRDC-Data-Usage-Report-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRIN #.TYPE_ATTR MRDC-Data-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +#.TYPE_ATTR +ExtendedPacketDelayBudget DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(e1ap_ExtendedPacketDelayBudget_fmt) + +#.TYPE_ATTR +HW-CapacityIndicator/offeredThroughput DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kbps + +#.FN_BODY InterfacesToTrace VAL_PTR = ¶m_tvb + tvbuff_t *param_tvb = NULL; +%(DEFAULT_BODY)s + if(param_tvb){ + static int * const fields[] = { + &hf_e1ap_InterfacesToTrace_NG_C, + &hf_e1ap_InterfacesToTrace_Xn_C, + &hf_e1ap_InterfacesToTrace_Uu, + &hf_e1ap_InterfacesToTrace_F1_C, + &hf_e1ap_InterfacesToTrace_E1, + &hf_e1ap_InterfacesToTrace_Reserved, + NULL + }; + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_InterfacesToTrace); + proto_tree_add_bitmask_list(subtree, param_tvb, 0, 1, fields, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +M7period DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes + +#.FN_BODY MeasurementsToActivate VAL_PTR=¶m_tvb + tvbuff_t *param_tvb = NULL; +%(DEFAULT_BODY)s + if (param_tvb) { + static int * const fields[] = { + &hf_e1ap_MeasurementsToActivate_Reserved1, + &hf_e1ap_MeasurementsToActivate_M4, + &hf_e1ap_MeasurementsToActivate_Reserved2, + &hf_e1ap_MeasurementsToActivate_M6, + &hf_e1ap_MeasurementsToActivate_M7, + NULL + }; + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_MeasurementsToActivate); + proto_tree_add_bitmask_list(subtree, param_tvb, 0, 1, fields, ENC_BIG_ENDIAN); + } + +#.FN_BODY ReportCharacteristics VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if(parameter_tvb){ + static int * const fields[] = { + &hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic, + &hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic, + &hf_e1ap_ReportCharacteristics_Reserved, + NULL + }; + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_ReportCharacteristics); + proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 5, fields, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds + +#.FN_BODY BurstArrivalTime VAL_PTR = ¶m_tvb + tvbuff_t *param_tvb = NULL; +%(DEFAULT_BODY)s + if (param_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_BurstArrivalTime); + dissect_nr_rrc_ReferenceTime_r16_PDU(param_tvb, actx->pinfo, subtree, NULL); + } + #.FN_HDR Reset col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset"); #.FN_HDR ResetAcknowledge @@ -547,6 +729,28 @@ MRDC-Data-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRIN col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage"); #.FN_HDR MRDC-DataUsageReport col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MRDC-DataUsageReport"); +#.FN_HDR DeactivateTrace + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DeactivateTrace"); +#.FN_HDR TraceStart + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceStart"); +#.FN_HDR ResourceStatusRequest + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusRequest"); +#.FN_HDR ResourceStatusResponse + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusResponse"); +#.FN_HDR ResourceStatusFailure + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusFailure"); +#.FN_HDR ResourceStatusUpdate + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusUpdate"); +#.FN_HDR IAB-UPTNLAddressUpdate + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IAB-UPTNLAddressUpdate"); +#.FN_HDR IAB-UPTNLAddressUpdateAcknowledge + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IAB-UPTNLAddressUpdateAcknowledge"); +#.FN_HDR IAB-UPTNLAddressUpdateFailure + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IAB-UPTNLAddressUpdateFailure"); +#.FN_HDR CellTrafficTrace + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace"); +#.FN_HDR EarlyForwardingSNTransfer + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EarlyForwardingSNTransfer"); #.END # diff --git a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c index 2f570e622c..05ef7dc6db 100644 --- a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c +++ b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c @@ -1,6 +1,6 @@ /* packet-e1ap.c * Routines for E-UTRAN E1 Application Protocol (E1AP) packet dissection - * Copyright 2018-2019, Pascal Quantin <pascal@wireshark.org> + * Copyright 2018-2020, Pascal Quantin <pascal@wireshark.org> * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * References: 3GPP TS 38.463 V15.4.0 (2019-07) + * References: 3GPP TS 38.463 V16.2.0 (2020-07) */ #include "config.h" @@ -23,6 +23,7 @@ #include "packet-per.h" #include "packet-e212.h" #include "packet-ntp.h" +#include "packet-nr-rrc.h" #define PNAME "E1 Application Protocol" #define PSNAME "E1AP" @@ -40,12 +41,30 @@ static int proto_e1ap = -1; static int hf_e1ap_transportLayerAddressIPv4 = -1; static int hf_e1ap_transportLayerAddressIPv6 = -1; +static int hf_e1ap_InterfacesToTrace_NG_C = -1; +static int hf_e1ap_InterfacesToTrace_Xn_C = -1; +static int hf_e1ap_InterfacesToTrace_Uu = -1; +static int hf_e1ap_InterfacesToTrace_F1_C = -1; +static int hf_e1ap_InterfacesToTrace_E1 = -1; +static int hf_e1ap_InterfacesToTrace_Reserved = -1; +static int hf_e1ap_MeasurementsToActivate_Reserved1 = -1; +static int hf_e1ap_MeasurementsToActivate_M4 = -1; +static int hf_e1ap_MeasurementsToActivate_Reserved2 = -1; +static int hf_e1ap_MeasurementsToActivate_M6 = -1; +static int hf_e1ap_MeasurementsToActivate_M7 = -1; +static int hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic = -1; +static int hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic = -1; +static int hf_e1ap_ReportCharacteristics_Reserved = -1; #include "packet-e1ap-hf.c" /* Initialize the subtree pointers */ static gint ett_e1ap = -1; static gint ett_e1ap_PLMN_Identity = -1; static gint ett_e1ap_TransportLayerAddress = -1; +static gint ett_e1ap_InterfacesToTrace = -1; +static gint ett_e1ap_MeasurementsToActivate = -1; +static gint ett_e1ap_ReportCharacteristics = -1; +static gint ett_e1ap_BurstArrivalTime = -1; #include "packet-e1ap-ett.c" enum{ @@ -77,6 +96,11 @@ static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, pro static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +static const true_false_string e1ap_tfs_InterfacesToTrace = { + "Should be traced", + "Should not be traced" +}; + static void e1ap_MaxPacketLossRate_fmt(gchar *s, guint32 v) { @@ -89,6 +113,12 @@ e1ap_PacketDelayBudget_fmt(gchar *s, guint32 v) g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fms (%u)", (float)v/2, v); } +static void +e1ap_ExtendedPacketDelayBudget_fmt(gchar *s, guint32 v) +{ + g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fms (%u)", (float)v/100, v); +} + static e1ap_private_data_t* e1ap_get_private_data(packet_info *pinfo) { @@ -179,6 +209,62 @@ void proto_register_e1ap(void) { { "IPv6 transportLayerAddress", "e1ap.transportLayerAddressIPv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_NG_C, + { "NG-C", "e1ap.InterfacesToTrace.NG_C", + FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x80, + NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_Xn_C, + { "Xn-C", "e1ap.InterfacesToTrace.Xn_C", + FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x40, + NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_Uu, + { "Uu", "e1ap.InterfacesToTrace.Uu", + FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x20, + NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_F1_C, + { "F1-C", "e1ap.InterfacesToTrace.F1_C", + FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x10, + NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_E1, + { "E1", "e1ap.InterfacesToTrace.E1", + FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x08, + NULL, HFILL }}, + { &hf_e1ap_InterfacesToTrace_Reserved, + { "Reserved", "e1ap.InterfacesToTrace.Reserved", + FT_UINT8, BASE_HEX, NULL, 0x07, + NULL, HFILL }}, + { &hf_e1ap_MeasurementsToActivate_Reserved1, + { "Reserved", "e1ap.MeasurementsToActivate.Reserved", + FT_UINT8, BASE_HEX, NULL, 0xe0, + NULL, HFILL }}, + { &hf_e1ap_MeasurementsToActivate_M4, + { "M4", "e1ap.MeasurementsToActivate.M4", + FT_BOOLEAN, 8, TFS(&tfs_activated_deactivated), 0x10, + NULL, HFILL }}, + { &hf_e1ap_MeasurementsToActivate_Reserved2, + { "Reserved", "e1ap.MeasurementsToActivate.Reserved", + FT_UINT8, BASE_HEX, NULL, 0x0c, + NULL, HFILL }}, + { &hf_e1ap_MeasurementsToActivate_M6, + { "M6", "e1ap.MeasurementsToActivate.M6", + FT_BOOLEAN, 8, TFS(&tfs_activated_deactivated), 0x02, + NULL, HFILL }}, + { &hf_e1ap_MeasurementsToActivate_M7, + { "M7", "e1ap.MeasurementsToActivate.M7", + FT_BOOLEAN, 8, TFS(&tfs_activated_deactivated), 0x01, + NULL, HFILL }}, + { &hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic, + { "TNLAvailableCapacityIndPeriodic", "e1ap.ReportCharacteristics.TNLAvailableCapacityIndPeriodic", + FT_BOOLEAN, 40, TFS(&tfs_requested_not_requested), 0x8000000000, + NULL, HFILL }}, + { &hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic, + { "HWCapacityIndPeriodic", "e1ap.ReportCharacteristics.HWCapacityIndPeriodic", + FT_BOOLEAN, 40, TFS(&tfs_requested_not_requested), 0x4000000000, + NULL, HFILL }}, + { &hf_e1ap_ReportCharacteristics_Reserved, + { "Reserved", "e1ap.ReportCharacteristics.Reserved", + FT_UINT40, BASE_HEX, NULL, 0x3ffffffff0, + NULL, HFILL }}, #include "packet-e1ap-hfarr.c" }; @@ -187,6 +273,10 @@ void proto_register_e1ap(void) { &ett_e1ap, &ett_e1ap_PLMN_Identity, &ett_e1ap_TransportLayerAddress, + &ett_e1ap_InterfacesToTrace, + &ett_e1ap_MeasurementsToActivate, + &ett_e1ap_ReportCharacteristics, + &ett_e1ap_BurstArrivalTime, #include "packet-e1ap-ettarr.c" }; |