diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/asn1/e1ap | |
parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/e1ap')
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-Constants.asn | 44 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-Containers.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-IEs.asn | 415 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn | 80 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn | 13 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/e1ap.cnf | 616 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/packet-e1ap-template.c | 108 | ||||
-rw-r--r-- | epan/dissectors/asn1/e1ap/packet-e1ap-template.h | 8 |
9 files changed, 918 insertions, 370 deletions
diff --git a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn index 76fa9490..e81ce95a 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- Common definitions diff --git a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn index ed364b24..ce1df741 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- Constant definitions @@ -65,7 +65,7 @@ id-MCBearerContextModification ProcedureCode ::= 35 id-MCBearerContextModificationRequired ProcedureCode ::= 36 id-MCBearerContextRelease ProcedureCode ::= 37 id-MCBearerContextReleaseRequest ProcedureCode ::= 38 - +id-MCBearerNotification ProcedureCode ::= 39 -- ************************************************************** @@ -103,6 +103,10 @@ maxnoofMBSAreaSessionIDs INTEGER ::= 256 maxnoofSharedNG-UTerminations INTEGER ::= 8 maxnoofMRBs INTEGER ::= 32 maxnoofMBSSessionIDs INTEGER ::= 512 +maxnoofCellsforMBS INTEGER ::= 512 +maxnoofTAIforMBS INTEGER ::= 512 +maxnoofMBSServiceAreaInformation INTEGER ::= 256 +maxnoofDUs INTEGER ::= 512 -- ************************************************************** @@ -236,7 +240,7 @@ 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 +id-ExtendedSliceSupportList ProtocolIE-ID ::= 125 id-MCG-OfferedGBRQoSFlowInfo ProtocolIE-ID ::= 126 id-Number-of-tunnels ProtocolIE-ID ::= 127 id-DRB-Measurement-Results-Information-List ProtocolIE-ID ::= 128 @@ -298,6 +302,40 @@ id-MCForwardingResourceReleaseIndication ProtocolIE-ID ::= 183 id-PDCP-COUNT-Reset ProtocolIE-ID ::= 184 id-MBSSessionAssociatedInfoNonSupportToSupport ProtocolIE-ID ::= 185 id-VersionID ProtocolIE-ID ::= 186 +id-InactivityInformationRequest ProtocolIE-ID ::= 187 +id-UEInactivityInformation ProtocolIE-ID ::= 188 +id-MBSAreaSessionID ProtocolIE-ID ::= 189 +id-Secondary-PDU-Session-Data-Forwarding-Information ProtocolIE-ID ::= 190 +id-MBSSessionResourceNotification ProtocolIE-ID ::= 191 +id-MCBearerContextInactivityTimer ProtocolIE-ID ::= 192 +id-MCBearerContextStatusChange ProtocolIE-ID ::= 193 +id-MT-SDT-Information ProtocolIE-ID ::= 194 +id-MT-SDT-Information-Request ProtocolIE-ID ::= 195 +id-SDT-data-size-threshold ProtocolIE-ID ::= 196 +id-SDT-data-size-threshold-Crossed ProtocolIE-ID ::= 197 +id-SpecialTriggeringPurpose ProtocolIE-ID ::= 198 +id-AssociatedSessionID ProtocolIE-ID ::= 199 +id-MBS-ServiceArea ProtocolIE-ID ::= 200 +id-PDUSetQoSParameters ProtocolIE-ID ::= 201 +id-N6JitterInformation ProtocolIE-ID ::= 202 +id-ECNMarkingorCongestionInformationReportingRequest ProtocolIE-ID ::= 203 +id-ECNMarkingorCongestionInformationReportingStatus ProtocolIE-ID ::= 204 +id-PDUSetbasedHandlingIndicator ProtocolIE-ID ::= 205 +id-IndirectPathIndication ProtocolIE-ID ::= 206 +id-F1UTunnelNotEstablished ProtocolIE-ID ::= 207 +id-F1U-TNL-InfoToAdd-List ProtocolIE-ID ::= 208 +id-F1U-TNL-InfoAdded-List ProtocolIE-ID ::= 209 +id-F1U-TNL-InfoToAddOrModify-List ProtocolIE-ID ::= 210 +id-F1U-TNL-InfoAddedOrModified-List ProtocolIE-ID ::= 211 +id-F1U-TNL-InfoToRelease-List ProtocolIE-ID ::= 212 +id-BroadcastF1U-ContextReferenceE1 ProtocolIE-ID ::= 213 +id-PSIbasedDiscardTimer ProtocolIE-ID ::= 214 +id-UserPlaneErrorIndicator ProtocolIE-ID ::= 215 +id-MaximumDataBurstVolume ProtocolIE-ID ::= 216 +id-BCBearerContextNGU-TNLInfoatNGRAN-Request ProtocolIE-ID ::= 217 +id-PDCPSNGapReport ProtocolIE-ID ::= 218 +id-UserPlaneFailureIndication ProtocolIE-ID ::= 219 + END diff --git a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn index d7d1392d..0423b219 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- Container definitions diff --git a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn index 536691e6..baeb3522 100644 --- a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn +++ b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- Information Element Definitions @@ -24,6 +24,7 @@ IMPORTS id-QoSFlowMappingIndication, id-TNLAssociationTransportLayerAddressgNBCUUP, id-Cause, + id-BCBearerContextNGU-TNLInfoatNGRAN-Request, id-QoSMonitoringRequest, id-QosMonitoringReportingFrequency, id-QoSMonitoringDisabled, @@ -76,6 +77,30 @@ IMPORTS id-PDCP-COUNT-Reset, id-MBSSessionAssociatedInfoNonSupportToSupport, id-VersionID, + id-MBSAreaSessionID, + id-Secondary-PDU-Session-Data-Forwarding-Information, + id-MBSSessionResourceNotification, + id-MCBearerContextInactivityTimer, + id-MCBearerContextStatusChange, + id-SpecialTriggeringPurpose, + id-F1UTunnelNotEstablished, + id-PDUSetQoSParameters, + id-N6JitterInformation, + id-ECNMarkingorCongestionInformationReportingRequest, + id-ECNMarkingorCongestionInformationReportingStatus, + id-PDUSetbasedHandlingIndicator, + id-IndirectPathIndication, + id-F1U-TNL-InfoToAdd-List, + id-F1U-TNL-InfoAdded-List, + id-F1U-TNL-InfoToAddOrModify-List, + id-F1U-TNL-InfoAddedOrModified-List, + id-F1U-TNL-InfoToRelease-List, + id-BroadcastF1U-ContextReferenceE1, + id-PSIbasedDiscardTimer, + id-UserPlaneErrorIndicator, + id-MaximumDataBurstVolume, + id-PDCPSNGapReport, + id-UserPlaneFailureIndication, maxnoofMBSAreaSessionIDs, maxnoofSharedNG-UTerminations, maxnoofMRBs, @@ -100,7 +125,12 @@ IMPORTS maxnoofDataForwardingTunneltoE-UTRAN, maxnoofExtNRCGI, maxnoofECGI, - maxnoofSMBRValues + maxnoofSMBRValues, + maxnoofCellsforMBS, + maxnoofTAIforMBS, + maxnoofMBSServiceAreaInformation, + maxnoofDUs + FROM E1AP-Constants @@ -167,9 +197,12 @@ AlternativeQoSParaSetItem ::= SEQUENCE { } AlternativeQoSParaSetItem-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-MaximumDataBurstVolume CRITICALITY ignore EXTENSION MaxDataBurstVolume PRESENCE optional }, ... } +AssociatedSessionID ::= OCTET STRING + -- B -- BCBearerContextToSetup @@ -210,6 +243,7 @@ BCMRBSetupConfiguration-Item ::= SEQUENCE { } BCMRBSetupConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-F1U-TNL-InfoToAdd-List CRITICALITY ignore EXTENSION F1U-TNL-InfoToAdd-List PRESENCE optional}, ... } @@ -250,6 +284,7 @@ BCMRBSetupResponseList-Item ::= SEQUENCE { } BCMRBSetupResponseList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-F1U-TNL-InfoAdded-List CRITICALITY ignore EXTENSION F1U-TNL-InfoAdded-List PRESENCE optional}, ... } @@ -289,6 +324,17 @@ BCBearerContextToModify ::= SEQUENCE { } BCBearerContextToModify-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-BCBearerContextNGU-TNLInfoatNGRAN-Request CRITICALITY ignore EXTENSION BCBearerContextNGU-TNLInfoatNGRAN-Request PRESENCE optional}, + ... +} + +BCBearerContextNGU-TNLInfoatNGRAN-Request ::= CHOICE { + locationindependent MBSNGUInformationAtNGRAN-Request, + locationdependent MBSNGUInformationAtNGRAN-Request-List, + choice-extension ProtocolIE-SingleContainer {{ BCBearerContextNGU-TNLInfoatNGRAN-Request-ExtIEs}} +} + +BCBearerContextNGU-TNLInfoatNGRAN-Request-ExtIEs E1AP-PROTOCOL-IES ::= { ... } @@ -305,6 +351,8 @@ BCMRBModifyConfiguration-Item ::= SEQUENCE { } BCMRBModifyConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-F1U-TNL-InfoToAddOrModify-List CRITICALITY ignore EXTENSION F1U-TNL-InfoToAddOrModify-List PRESENCE optional}| + {ID id-F1U-TNL-InfoToRelease-List CRITICALITY ignore EXTENSION F1U-TNL-InfoToRelease-List PRESENCE optional}, ... } @@ -348,9 +396,12 @@ BCMRBSetupModifyResponseList-Item ::= SEQUENCE { } BCMRBSetupModifyResponseList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-F1U-TNL-InfoAddedOrModified-List CRITICALITY ignore EXTENSION F1U-TNL-InfoAddedOrModified-List PRESENCE optional}, ... } +BroadcastF1U-ContextReferenceE1 ::= OCTET STRING (SIZE(4)) + -- BCBearerContextToModifyRequired @@ -391,6 +442,7 @@ BufferSize ::= ENUMERATED { ... } + -- C Cause ::= CHOICE { @@ -600,7 +652,8 @@ Data-Forwarding-Information ::= SEQUENCE { } Data-Forwarding-Information-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-DataForwardingtoNG-RANQoSFlowInformationList CRITICALITY ignore EXTENSION DataForwardingtoNG-RANQoSFlowInformationList PRESENCE optional}, + {ID id-DataForwardingtoNG-RANQoSFlowInformationList CRITICALITY ignore EXTENSION DataForwardingtoNG-RANQoSFlowInformationList PRESENCE optional}| + {ID id-PDUSetbasedHandlingIndicator CRITICALITY ignore EXTENSION PDUSetbasedHandlingIndicator PRESENCE optional}, ... } @@ -685,6 +738,8 @@ DiscardTimer ::= ENUMERATED {ms10, ms20, ms30, ms40, ms50, ms60, ms75, ms100, ms DiscardTimerExtended ::= ENUMERATED {ms0dot5, ms1, ms2, ms4, ms6, ms8,..., ms2000} +PSIbasedDiscardTimer ::= ENUMERATED {ms0, ms2, ms4, ms6, ms8, ms10, ms12, ms14, ms18, ms22, ms26, ms30, ms40, ms50, ms75, ms100, ...} + DLDiscarding ::= SEQUENCE { dLDiscardingCountVal PDCP-Count, iE-Extensions ProtocolExtensionContainer { { DLDiscarding-ExtIEs } } OPTIONAL @@ -1212,7 +1267,8 @@ DRB-To-Setup-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-DAPSRequestInfo CRITICALITY ignore EXTENSION DAPSRequestInfo PRESENCE optional}| {ID id-ignoreMappingRuleIndication CRITICALITY reject EXTENSION IgnoreMappingRuleIndication PRESENCE optional}| {ID id-QoSFlowsDRBRemapping CRITICALITY reject EXTENSION QoS-Flows-DRB-Remapping PRESENCE optional}| - {ID id-SDTindicatorSetup CRITICALITY reject EXTENSION SDTindicatorSetup PRESENCE optional}, + {ID id-SDTindicatorSetup CRITICALITY reject EXTENSION SDTindicatorSetup PRESENCE optional}| + {ID id-SpecialTriggeringPurpose CRITICALITY ignore EXTENSION SpecialTriggeringPurpose PRESENCE optional}, ... } @@ -1235,7 +1291,8 @@ DRB-To-Setup-Mod-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional}| {ID id-ignoreMappingRuleIndication CRITICALITY reject EXTENSION IgnoreMappingRuleIndication PRESENCE optional}| {ID id-DAPSRequestInfo CRITICALITY ignore EXTENSION DAPSRequestInfo PRESENCE optional}| - {ID id-SDTindicatorSetup CRITICALITY reject EXTENSION SDTindicatorSetup PRESENCE optional}, + {ID id-SDTindicatorSetup CRITICALITY reject EXTENSION SDTindicatorSetup PRESENCE optional}| + {ID id-SpecialTriggeringPurpose CRITICALITY ignore EXTENSION SpecialTriggeringPurpose PRESENCE optional}, ... } @@ -1267,7 +1324,9 @@ Dynamic5QIDescriptor ::= SEQUENCE { packetErrorRate PacketErrorRate, fiveQI INTEGER (0..255, ...) OPTIONAL, delayCritical ENUMERATED {delay-critical, non-delay-critical} OPTIONAL, +-- This IE shall be present if the GBR QoS Flow Information IE is present in the QoS Flow Level QoS Parameters IE.-- averagingWindow AveragingWindow OPTIONAL, +-- This IE shall be present if the GBR QoS Flow Information IE is present in the QoS Flow Level QoS Parameters IE.-- maxDataBurstVolume MaxDataBurstVolume OPTIONAL, iE-Extensions ProtocolExtensionContainer { { Dynamic5QIDescriptor-ExtIEs } } OPTIONAL } @@ -1300,6 +1359,21 @@ EarlyForwardingCOUNTInfo-ExtIEs E1AP-PROTOCOL-IES ::= { EarlyForwardingCOUNTReq ::= ENUMERATED { first-dl-count, dl-discarding, ...} +ECNMarkingorCongestionInformationReportingRequest ::= CHOICE { + eCNMarkingatNGRAN ENUMERATED { ul, dl, both, stop, ...}, + eCNMarkingatUPF ENUMERATED { ul, dl, both, stop, ...}, + congestionInformation ENUMERATED { ul, dl, both, stop, ...}, + choice-extension ProtocolIE-SingleContainer {{ECNMarkingorCongestionInformationReportingRequest-ExtIEs}} +} + +ECNMarkingorCongestionInformationReportingRequest-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + + +ECNMarkingorCongestionInformationReportingStatus ::= ENUMERATED { active, not-active, ...} + + EHC-Common-Parameters ::= SEQUENCE { ehc-CID-Length ENUMERATED { bits7, bits15, ...}, iE-Extensions ProtocolExtensionContainer { { EHC-Common-Parameters-ExtIEs } } OPTIONAL @@ -1425,6 +1499,72 @@ FirstDLCount-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +FiveGS-TAC ::= OCTET STRING (SIZE(3)) + +F1U-TNL-InfoAdded-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoAdded-Item + +F1U-TNL-InfoAdded-Item ::= SEQUENCE { + broadcastF1U-ContextReferenceE1 BroadcastF1U-ContextReferenceE1, + bcBearerContextF1U-TNLInfoatCU BCBearerContextF1U-TNLInfoatCU, + iE-Extensions ProtocolExtensionContainer { {F1U-TNL-InfoAdded-Item-ExtIEs} } OPTIONAL, + ... +} + +F1U-TNL-InfoAdded-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +F1U-TNL-InfoToAdd-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToAdd-Item + +F1U-TNL-InfoToAdd-Item ::= SEQUENCE { + broadcastF1U-ContextReferenceE1 BroadcastF1U-ContextReferenceE1, + iE-Extensions ProtocolExtensionContainer { {F1U-TNL-InfoToAdd-Item-ExtIEs} } OPTIONAL, + ... +} + +F1U-TNL-InfoToAdd-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +F1U-TNL-InfoAddedOrModified-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoAddedOrModified-Item + +F1U-TNL-InfoAddedOrModified-Item ::= SEQUENCE { + broadcastF1U-ContextReferenceE1 BroadcastF1U-ContextReferenceE1, + bcBearerContextF1U-TNLInfoatCU BCBearerContextF1U-TNLInfoatCU OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {F1U-TNL-InfoAddedOrModified-Item-ExtIEs} } OPTIONAL, + ... +} + +F1U-TNL-InfoAddedOrModified-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +F1U-TNL-InfoToAddOrModify-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToAddOrModify-Item + +F1U-TNL-InfoToAddOrModify-Item ::= SEQUENCE { + broadcastF1U-ContextReferenceE1 BroadcastF1U-ContextReferenceE1, + bcBearerContextF1U-TNLInfoatDU BCBearerContextF1U-TNLInfoatDU OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {F1U-TNL-InfoToAddOrModify-Item-ExtIEs} } OPTIONAL, + ... +} + +F1U-TNL-InfoToAddOrModify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +F1U-TNL-InfoToRelease-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToRelease-Item + +F1U-TNL-InfoToRelease-Item ::= SEQUENCE { + broadcastF1U-ContextReferenceE1 BroadcastF1U-ContextReferenceE1, + iE-Extensions ProtocolExtensionContainer { {F1U-TNL-InfoToRelease-Item-ExtIEs} } OPTIONAL, + ... +} + +F1U-TNL-InfoToRelease-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + + -- G GlobalMBSSessionID ::= SEQUENCE { @@ -1644,6 +1784,12 @@ HW-CapacityIndicator-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { -- I + +IndirectPathIndication ::= ENUMERATED { + true, + ... +} + IgnoreMappingRuleIndication ::= ENUMERATED { true, ... @@ -1679,8 +1825,11 @@ InterfacesToTrace ::= BIT STRING (SIZE(8)) ImmediateMDT ::= SEQUENCE { measurementsToActivate MeasurementsToActivate, measurementFour M4Configuration OPTIONAL, +-- This IE shall be present if the Measurements to Activate IE has the fourth bit set to “1”.-- measurementSix M6Configuration OPTIONAL, +-- This IE shall be present if the Measurements to Activate IE has the seventh bit set to “1”.-- measurementSeven M7Configuration OPTIONAL, +-- This IE shall be present if the Measurements to Activate IE has the eighth bit set to “1”.-- iE-Extensions ProtocolExtensionContainer { { ImmediateMDT-ExtIEs} } OPTIONAL, ... } @@ -1700,6 +1849,9 @@ IAB-donor-CU-UPPSKInfoItemExtIEs E1AP-PROTOCOL-EXTENSION ::= { } IAB-donor-CU-UPPSK ::= OCTET STRING +InactivityInformationRequest ::= ENUMERATED {true, ...} + + -- J -- K @@ -1750,6 +1902,7 @@ LocationDependentMBSF1UInformationAtDU-Item ::= SEQUENCE { } LocationDependentMBSF1UInformationAtDU-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-F1UTunnelNotEstablished CRITICALITY ignore EXTENSION F1UTunnelNotEstablished PRESENCE optional }, ... } @@ -1809,6 +1962,7 @@ MBSF1UInformationAtDU ::= SEQUENCE { } MBSF1UInformationAtDU-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + { ID id-F1UTunnelNotEstablished CRITICALITY ignore EXTENSION F1UTunnelNotEstablished PRESENCE optional }, ... } @@ -1842,6 +1996,20 @@ MBSNGUInformationAtNGRAN-ExtIEs E1AP-PROTOCOL-IES ::= { ... } +MBSNGUInformationAtNGRAN-Request ::= ENUMERATED {true, ... } + +MBSNGUInformationAtNGRAN-Request-List ::= SEQUENCE (SIZE(1..maxnoofMBSAreaSessionIDs)) OF MBSNGUInformationAtNGRAN-Request-Item + +MBSNGUInformationAtNGRAN-Request-Item ::= SEQUENCE { + mbsAreaSession-ID MBSAreaSessionID, + mbsNGUInformationAtNGRAN-Request MBSNGUInformationAtNGRAN-Request, + iE-Extensions ProtocolExtensionContainer { { MBSNGUInformationAtNGRAN-Request-Item-ExtIEs } } OPTIONAL, + ... +} + +MBSNGUInformationAtNGRAN-Request-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} MBSSessionAssociatedInfoNonSupportToSupport ::= SEQUENCE { ue-Reference-ID GNB-CU-CP-UE-E1AP-ID, @@ -1857,7 +2025,7 @@ MBSSessionAssociatedInfoNonSupportToSupport-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { MBSSessionAssociatedInformation ::= SEQUENCE { mbsSessionAssociatedInformationList MBSSessionAssociatedInformationList, - mbsSessionForwardingAddress TransportLayerAddress, + mbsSessionForwardingAddress UP-TNL-Information, iE-Extensions ProtocolExtensionContainer { {MBSSessionAssociatedInformation-ExtIEs} } OPTIONAL, ... } @@ -1893,6 +2061,38 @@ MBS-Support-Info-ToAdd-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { MBS-Support-Info-ToRemove-List ::= SEQUENCE (SIZE(1..maxnoofMBSSessionIDs)) OF MBS-Support-Info-ToRemove-Item +MBSSessionResourceNotification ::= CHOICE { + mbs-DL-Data-Arrival MBS-DL-Data-Arrival, + inactivity MCBearerContext-Inactivity, + choice-extension ProtocolIE-SingleContainer {{ MBSSessionResourceNotification-ExtIEs}} +} + +MBSSessionResourceNotification-ExtIEs E1AP-PROTOCOL-IES ::= { + ... +} + +MBS-DL-Data-Arrival ::= SEQUENCE { + dlDataArrival ENUMERATED {true, ...}, + ppi PPI OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { MBS-DL-Data-Arrival-ExtIEs} } OPTIONAL, + ... +} + +MBS-DL-Data-Arrival-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + + +MCBearerContext-Inactivity ::= SEQUENCE { + mcBearerContext-Inactivity-Indication ENUMERATED {true, ...}, + iE-Extensions ProtocolExtensionContainer { {MCBearerContext-Inactivity-ExtIEs} } OPTIONAL, + ... +} + +MCBearerContext-Inactivity-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + MBS-Support-Info-ToRemove-Item ::= SEQUENCE { globalMBSSessionID GlobalMBSSessionID, iE-Extensions ProtocolExtensionContainer { { MBS-Support-Info-ToRemove-Item-ExtIEs} } OPTIONAL, @@ -1914,7 +2114,10 @@ MCBearerContextToSetup ::= SEQUENCE { } MCBearerContextToSetup-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-MBSSessionAssociatedInfoNonSupportToSupport CRITICALITY ignore EXTENSION MBSSessionAssociatedInfoNonSupportToSupport PRESENCE optional}, + {ID id-MBSSessionAssociatedInfoNonSupportToSupport CRITICALITY ignore EXTENSION MBSSessionAssociatedInfoNonSupportToSupport PRESENCE optional}| + {ID id-MBSAreaSessionID CRITICALITY ignore EXTENSION MBSAreaSessionID PRESENCE optional}| + {ID id-MCBearerContextInactivityTimer CRITICALITY ignore EXTENSION Inactivity-Timer PRESENCE optional}| + {ID id-MCBearerContextStatusChange CRITICALITY ignore EXTENSION MCBearerContextStatusChange PRESENCE optional}, ... } @@ -1933,6 +2136,8 @@ MCMRBSetupConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +MCBearerContextStatusChange ::= ENUMERATED {suspend, resume, ...} + -- MCBearerContextToSetupResponse @@ -2008,7 +2213,9 @@ MCBearerContextToModify-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-MCForwardingResourceRequest CRITICALITY ignore EXTENSION MCForwardingResourceRequest PRESENCE optional}| {ID id-MCForwardingResourceIndication CRITICALITY ignore EXTENSION MCForwardingResourceIndication PRESENCE optional}| {ID id-MCForwardingResourceRelease CRITICALITY ignore EXTENSION MCForwardingResourceRelease PRESENCE optional}| - {ID id-MBSSessionAssociatedInfoNonSupportToSupport CRITICALITY ignore EXTENSION MBSSessionAssociatedInfoNonSupportToSupport PRESENCE optional}, + {ID id-MBSSessionAssociatedInfoNonSupportToSupport CRITICALITY ignore EXTENSION MBSSessionAssociatedInfoNonSupportToSupport PRESENCE optional}| + {ID id-MCBearerContextInactivityTimer CRITICALITY ignore EXTENSION Inactivity-Timer PRESENCE optional}| + {ID id-MCBearerContextStatusChange CRITICALITY ignore EXTENSION MCBearerContextStatusChange PRESENCE optional}, ... } @@ -2430,6 +2637,71 @@ MDTPLMNList ::= SEQUENCE (SIZE(1..maxnoofMDTPLMNs)) OF PLMN-Identity MDTPLMNModificationList ::= SEQUENCE (SIZE(0..maxnoofMDTPLMNs)) OF PLMN-Identity +MT-SDT-Information ::= SEQUENCE { + mT-SDT-Data-Size MT-SDT-Data-Size, + iE-Extensions ProtocolExtensionContainer { {MT-SDT-Information-ExtIEs} } OPTIONAL +} + +MT-SDT-Information-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +MT-SDT-Information-Request ::= ENUMERATED {true, ...} + +MT-SDT-Data-Size::= INTEGER (1..96000, ...) + + + + +MBS-ServiceArea ::= SEQUENCE { + mBS-ServiceAreaInformationList MBS-ServiceAreaInformationList OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MBS-ServiceArea-ExtIEs} } OPTIONAL, + ... +} + +MBS-ServiceArea-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + + +MBS-ServiceAreaInformation ::= SEQUENCE { + mBS-ServiceAreaCellList MBS-ServiceAreaCellList OPTIONAL, + mBS-ServiceAreaTAIList MBS-ServiceAreaTAIList OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MBS-ServiceAreaInformation-ExtIEs} } OPTIONAL, + ... +} + +MBS-ServiceAreaInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +MBS-ServiceAreaCellList ::= SEQUENCE (SIZE(1.. maxnoofCellsforMBS)) OF NR-CGI + +MBS-ServiceAreaTAIList ::= SEQUENCE (SIZE(1.. maxnoofTAIforMBS)) OF MBS-ServiceAreaTAIList-Item +MBS-ServiceAreaTAIList-Item ::= SEQUENCE { + plmn-ID PLMN-Identity, + fiveGS-TAC FiveGS-TAC, + iE-Extensions ProtocolExtensionContainer { {MBS-ServiceAreaTAIList-Item-ExtIEs} } OPTIONAL, + ... +} + +MBS-ServiceAreaTAIList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + + +MBS-ServiceAreaInformationList ::= SEQUENCE (SIZE(1..maxnoofMBSServiceAreaInformation)) OF MBS-ServiceAreaInformationItem + +MBS-ServiceAreaInformationItem ::= SEQUENCE { + mBS-AreaSessionID MBSAreaSessionID, + mBS-ServiceAreaInformation MBS-ServiceAreaInformation, + iE-Extensions ProtocolExtensionContainer { { MBS-ServiceAreaInformationItem-ExtIEs} } OPTIONAL, + ... +} +MBS-ServiceAreaInformationItem-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- N NetworkInstance ::= INTEGER (1..256, ...) @@ -2547,6 +2819,19 @@ Extended-NR-CGI-Support-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } +N6JitterInformation ::= SEQUENCE { + n6JitterLowerBound INTEGER (-127..127), + n6JitterUpperBound INTEGER (-127..127), + iE-Extensions ProtocolExtensionContainer { { N6JitterInformationExtIEs } } OPTIONAL, + ... +} + +N6JitterInformationExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + + + -- O OutOfOrderDelivery ::= ENUMERATED { @@ -2596,10 +2881,14 @@ PDCP-Configuration-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { { ID id-AdditionalPDCPduplicationInformation CRITICALITY ignore EXTENSION AdditionalPDCPduplicationInformation PRESENCE optional }| { ID id-EHC-Parameters CRITICALITY ignore EXTENSION EHC-Parameters PRESENCE optional}| { ID id-UDC-Parameters CRITICALITY ignore EXTENSION UDC-Parameters PRESENCE optional}| - { ID id-DiscardTimerExtended CRITICALITY reject EXTENSION DiscardTimerExtended PRESENCE optional}, + { ID id-DiscardTimerExtended CRITICALITY reject EXTENSION DiscardTimerExtended PRESENCE optional}| + { ID id-PSIbasedDiscardTimer CRITICALITY ignore EXTENSION PSIbasedDiscardTimer PRESENCE optional}| + { ID id-PDCPSNGapReport CRITICALITY ignore EXTENSION PDCPSNGapReport PRESENCE optional}, ... } +PDCPSNGapReport ::= ENUMERATED {true, ...} + PDCP-COUNT-Reset ::= ENUMERATED { true, ... @@ -2655,9 +2944,9 @@ PDCP-SN-Size ::= ENUMERATED { s-12, s-18, ..., -s-7, -s-15, -s-16 + s-7, + s-15, + s-16 } PDCP-SN-Status-Information ::= SEQUENCE { @@ -2863,7 +3152,9 @@ PDU-Session-Resource-To-Modify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {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-DataForwardingtoE-UTRANInformationList CRITICALITY ignore EXTENSION DataForwardingtoE-UTRANInformationList PRESENCE optional }| - {ID id-SecurityIndicationModify CRITICALITY ignore EXTENSION SecurityIndication PRESENCE optional }, + {ID id-SecurityIndicationModify CRITICALITY ignore EXTENSION SecurityIndication PRESENCE optional }| + {ID id-Secondary-PDU-Session-Data-Forwarding-Information CRITICALITY ignore EXTENSION Data-Forwarding-Information PRESENCE optional }| + {ID id-UserPlaneFailureIndication CRITICALITY ignore EXTENSION UserPlaneFailureIndication PRESENCE optional }, ... } @@ -2876,7 +3167,8 @@ PDU-Session-Resource-To-Remove-Item ::= SEQUENCE { } PDU-Session-Resource-To-Remove-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-Cause CRITICALITY ignore EXTENSION Cause PRESENCE optional}, + {ID id-Cause CRITICALITY ignore EXTENSION Cause PRESENCE optional}| + {ID id-UserPlaneErrorIndicator CRITICALITY ignore EXTENSION UserPlaneErrorIndicator PRESENCE optional}, ... } @@ -2902,7 +3194,8 @@ PDU-Session-Resource-To-Setup-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { { 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 }, + { ID id-RedundantPDUSessionInformation CRITICALITY ignore EXTENSION RedundantPDUSessionInformation PRESENCE optional }| + {ID id-SpecialTriggeringPurpose CRITICALITY ignore EXTENSION SpecialTriggeringPurpose PRESENCE optional}, ... } @@ -2926,7 +3219,8 @@ 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-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-RedundantCommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional }| + {ID id-SpecialTriggeringPurpose CRITICALITY ignore EXTENSION SpecialTriggeringPurpose PRESENCE optional}, ... } @@ -2952,6 +3246,8 @@ PDU-Session-Type ::= ENUMERATED { ... } +PDUSetbasedHandlingIndicator ::= ENUMERATED {supported, ...} + PLMN-Identity ::= OCTET STRING (SIZE(3)) PortNumber ::= BIT STRING (SIZE(16)) @@ -2976,6 +3272,27 @@ PrivacyIndicator ::= ENUMERATED { ... } +PDUSetQoSParameters ::= SEQUENCE { + ulPDUSetQoSInformation PDUSetQoSInformation OPTIONAL, + dlPDUSetQoSInformation PDUSetQoSInformation OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { PDUSetQoSParameters-ExtIEs } } OPTIONAL +} + +PDUSetQoSParameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... + } + +PDUSetQoSInformation ::= SEQUENCE { + pduSetDelayBudget ExtendedPacketDelayBudget OPTIONAL, + pduSetErrorRate PacketErrorRate OPTIONAL, + pduSetIntegratedHandlingInformation ENUMERATED {true, false, ...} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { PDUSetQoSInformation-ExtIEs } } OPTIONAL +} + +PDUSetQoSInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + -- Q QCI ::= INTEGER (0..255) @@ -3002,7 +3319,8 @@ QoS-Flow-Item ::= SEQUENCE { QoS-Flow-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-QoSFlowMappingIndication CRITICALITY ignore EXTENSION QoS-Flow-Mapping-Indication PRESENCE optional}| - {ID id-DataForwardingSourceIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}, + {ID id-DataForwardingSourceIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}| + {ID id-ECNMarkingorCongestionInformationReportingStatus CRITICALITY ignore EXTENSION ECNMarkingorCongestionInformationReportingStatus PRESENCE optional}, ... } @@ -3062,7 +3380,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}, + {ID id-TSCTrafficCharacteristics CRITICALITY ignore EXTENSION TSCTrafficCharacteristics PRESENCE optional}| + {ID id-ECNMarkingorCongestionInformationReportingRequest CRITICALITY ignore EXTENSION ECNMarkingorCongestionInformationReportingRequest PRESENCE optional}, ... } @@ -3083,7 +3402,8 @@ QoSFlowLevelQoSParameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { {ID id-MCG-OfferedGBRQoSFlowInfo CRITICALITY ignore EXTENSION GBR-QoSFlowInformation PRESENCE optional}| {ID id-QosMonitoringReportingFrequency CRITICALITY ignore EXTENSION QosMonitoringReportingFrequency PRESENCE optional}| {ID id-QoSMonitoringDisabled CRITICALITY ignore EXTENSION QosMonitoringDisabled PRESENCE optional}| - {ID id-DataForwardingSourceIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}, + {ID id-DataForwardingSourceIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}| + {ID id-PDUSetQoSParameters CRITICALITY ignore EXTENSION PDUSetQoSParameters PRESENCE optional}, ... } @@ -3218,6 +3538,10 @@ ROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { -- S +SDT-data-size-threshold ::= INTEGER (1.. 192000, ...) + +SDT-data-size-threshold-Crossed ::= ENUMERATED {true, ...} + SCGActivationStatus ::= ENUMERATED { scg-activated, scg-deactivated, ...} SecurityAlgorithm ::= SEQUENCE { @@ -3235,6 +3559,7 @@ SecurityIndication ::= SEQUENCE { integrityProtectionIndication IntegrityProtectionIndication, confidentialityProtectionIndication ConfidentialityProtectionIndication, maximumIPdatarate MaximumIPdatarate OPTIONAL, +-- This IE shall be present if the Integrity Protection Indication IE within the Security Indication IE is set to “required” or “preferred”.-- iE-Extensions ProtocolExtensionContainer { {SecurityIndication-ExtIEs} } OPTIONAL, ... } @@ -3321,6 +3646,16 @@ SubscriberProfileIDforRFP ::= INTEGER (1..256, ...) SurvivalTime ::= INTEGER (0..1920000, ...) +SpecialTriggeringPurpose ::= ENUMERATED { + indirect-data-forwarding, + ... +} + +F1UTunnelNotEstablished::= ENUMERATED { + true, + ... +} + -- T TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...} @@ -3346,8 +3681,8 @@ TNL-AvailableCapacityIndicator-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { } TSCTrafficCharacteristics ::= SEQUENCE { - tSCTrafficCharacteristicsUL TSCTrafficInformation OPTIONAL, - tSCTrafficCharacteristicsDL TSCTrafficInformation OPTIONAL, + tSCTrafficCharacteristicsUL TSCAssistanceInformation OPTIONAL, + tSCTrafficCharacteristicsDL TSCAssistanceInformation OPTIONAL, iE-Extensions ProtocolExtensionContainer { { TSCTrafficCharacteristics-ExtIEs } } OPTIONAL } @@ -3355,14 +3690,15 @@ TSCTrafficCharacteristics-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { ... } -TSCTrafficInformation ::= SEQUENCE { +TSCAssistanceInformation ::= SEQUENCE { periodicity Periodicity, burstArrivalTime BurstArrivalTime OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { TSCTrafficInformation-ExtIEs } } OPTIONAL + iE-Extensions ProtocolExtensionContainer { { TSCAssistanceInformation-ExtIEs } } OPTIONAL } -TSCTrafficInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-SurvivalTime CRITICALITY ignore EXTENSION SurvivalTime PRESENCE optional}, +TSCAssistanceInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + {ID id-SurvivalTime CRITICALITY ignore EXTENSION SurvivalTime PRESENCE optional}| + {ID id-N6JitterInformation CRITICALITY ignore EXTENSION N6JitterInformation PRESENCE optional}, ... } @@ -3533,7 +3869,8 @@ UP-Parameters-Item ::= SEQUENCE { } UP-Parameters-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { - {ID id-QoS-Mapping-Information CRITICALITY reject EXTENSION QoS-Mapping-Information PRESENCE optional}, + {ID id-QoS-Mapping-Information CRITICALITY reject EXTENSION QoS-Mapping-Information PRESENCE optional}| + {ID id-IndirectPathIndication CRITICALITY ignore EXTENSION IndirectPathIndication PRESENCE optional}, ... } @@ -3570,6 +3907,32 @@ UplinkOnlyROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { URIaddress ::= VisibleString +UserPlaneErrorIndicator ::= ENUMERATED { + gTP-U-error-indication-received, + ... +} + +UEInactivityInformation ::= INTEGER (1..7200, ...) + +UserPlaneFailureIndication ::= SEQUENCE { + userPlaneFailureType UserPlaneFailureType, + nG-DL-UP-TNL-Information UP-TNL-Information, + nG-UL-UP-TNL-Information UP-TNL-Information, + + iE-Extensions ProtocolExtensionContainer { { UserPlaneFailureIndication-ExtIEs} } OPTIONAL, + ... +} + +UserPlaneFailureIndication-ExtIEs E1AP-PROTOCOL-EXTENSION ::= { + ... +} + +UserPlaneFailureType ::= ENUMERATED { + gtp-u-error-indication-received, + up-path-failure, + ... +} + -- V -- W diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn index 33514e0e..f953aa25 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 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- PDU definitions for E1AP @@ -21,6 +21,7 @@ BEGIN IMPORTS + AssociatedSessionID, Cause, CriticalityDiagnostics, GNB-CU-CP-MBS-E1AP-ID, @@ -55,7 +56,6 @@ 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, @@ -137,9 +137,19 @@ IMPORTS MCBearerContextToModifyRequired, MCBearerContextToModifyConfirm, MBSMulticastF1UContextDescriptor, + MBS-ServiceArea, GNB-CU-UP-MBS-Support-Info, SDTContinueROHC, - MDTPLMNModificationList + MDTPLMNModificationList, + InactivityInformationRequest, + UEInactivityInformation, + MBSSessionResourceNotification, + MT-SDT-Information, + MT-SDT-Information-Request, + SDT-data-size-threshold, + SDT-data-size-threshold-Crossed + + FROM E1AP-IEs @@ -155,6 +165,7 @@ FROM E1AP-IEs FROM E1AP-Containers + id-AssociatedSessionID, id-Cause, id-CriticalityDiagnostics, id-gNB-CU-CP-UE-E1AP-ID, @@ -281,7 +292,14 @@ FROM E1AP-Containers id-gNB-CU-UP-MBS-Support-Info, id-SDTContinueROHC, id-ManagementBasedMDTPLMNModificationList, - + id-MBS-ServiceArea, + id-InactivityInformationRequest, + id-UEInactivityInformation, + id-MBSSessionResourceNotification, + id-MT-SDT-Information, + id-MT-SDT-Information-Request, + id-SDT-data-size-threshold, + id-SDT-data-size-threshold-Crossed, maxnoofErrors, maxnoofSPLMNs, maxnoofDRBs, @@ -766,7 +784,9 @@ BearerContextSetupRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY ignore TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE optional }| { ID id-MDTPollutedMeasurementIndicator CRITICALITY ignore TYPE MDTPollutedMeasurementIndicator PRESENCE optional }| { ID id-UESliceMaximumBitRateList CRITICALITY ignore TYPE UESliceMaximumBitRateList PRESENCE optional }| - { ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional }, + { ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional }| + { ID id-MT-SDT-Information-Request CRITICALITY ignore TYPE MT-SDT-Information-Request PRESENCE optional }| + { ID id-SDT-data-size-threshold CRITICALITY ignore TYPE SDT-data-size-threshold PRESENCE optional }, ... } @@ -891,7 +911,10 @@ BearerContextModificationRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-UESliceMaximumBitRateList CRITICALITY ignore TYPE UESliceMaximumBitRateList PRESENCE optional }| { ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional }| { ID id-SDTContinueROHC CRITICALITY reject TYPE SDTContinueROHC PRESENCE optional }| - { ID id-ManagementBasedMDTPLMNModificationList CRITICALITY ignore TYPE MDTPLMNModificationList PRESENCE optional}, + { ID id-ManagementBasedMDTPLMNModificationList CRITICALITY ignore TYPE MDTPLMNModificationList PRESENCE optional}| + { ID id-InactivityInformationRequest CRITICALITY ignore TYPE InactivityInformationRequest PRESENCE optional}| + { ID id-MT-SDT-Information-Request CRITICALITY ignore TYPE MT-SDT-Information-Request PRESENCE optional }| + { ID id-SDT-data-size-threshold CRITICALITY ignore TYPE SDT-data-size-threshold PRESENCE optional }, ... } @@ -938,7 +961,8 @@ BearerContextModificationResponseIEs 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-BearerContextModificationResponse CRITICALITY ignore TYPE System-BearerContextModificationResponse PRESENCE optional }| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| + { ID id-UEInactivityInformation CRITICALITY ignore TYPE UEInactivityInformation PRESENCE optional}, ... } @@ -1196,7 +1220,9 @@ DLDataNotificationIEs 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-PPI CRITICALITY ignore TYPE PPI PRESENCE optional }| - { ID id-PDU-Session-To-Notify-List CRITICALITY ignore TYPE PDU-Session-To-Notify-List PRESENCE optional }, + { ID id-PDU-Session-To-Notify-List CRITICALITY ignore TYPE PDU-Session-To-Notify-List PRESENCE optional }| + { ID id-MT-SDT-Information CRITICALITY ignore TYPE MT-SDT-Information PRESENCE optional }| + { ID id-SDT-data-size-threshold-Crossed CRITICALITY ignore TYPE SDT-data-size-threshold-Crossed PRESENCE optional }, ... } @@ -1204,7 +1230,7 @@ DLDataNotificationIEs E1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- UL Data Notification +-- UL DATA NOTIFICATION -- -- ************************************************************** @@ -1401,8 +1427,8 @@ DeactivateTraceIEs E1AP-PROTOCOL-IES ::= { -- ************************************************************** CellTrafficTrace ::= SEQUENCE { -protocolIEs ProtocolIE-Container { { CellTrafficTraceIEs } }, -... + protocolIEs ProtocolIE-Container { { CellTrafficTraceIEs } }, + ... } CellTrafficTraceIEs E1AP-PROTOCOL-IES ::= { @@ -1411,7 +1437,7 @@ CellTrafficTraceIEs E1AP-PROTOCOL-IES ::= { {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}, + {ID id-URIaddress CRITICALITY ignore TYPE URIaddress PRESENCE optional}, ... } @@ -1453,9 +1479,11 @@ ResourceStatusRequestIEs E1AP-PROTOCOL-IES ::= { -- 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}| +-- This IE shall be present if the Registration Request IE is set to the value “stop” -- { 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}, + { ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE conditional} +-- This IE shall be present if the Registration Request IE is set to the value "start". --| + { ID id-ReportingPeriodicity CRITICALITY ignore TYPE ReportingPeriodicity PRESENCE optional}, ... } @@ -1666,7 +1694,9 @@ BCBearerContextSetupRequest ::= SEQUENCE { BCBearerContextSetupRequestIEs E1AP-PROTOCOL-IES ::= { { ID id-GNB-CU-CP-MBS-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-MBS-E1AP-ID PRESENCE mandatory }| { ID id-GlobalMBSSessionID CRITICALITY reject TYPE GlobalMBSSessionID PRESENCE mandatory }| - { ID id-BCBearerContextToSetup CRITICALITY reject TYPE BCBearerContextToSetup PRESENCE mandatory }, + { ID id-BCBearerContextToSetup CRITICALITY reject TYPE BCBearerContextToSetup PRESENCE mandatory }| + { ID id-AssociatedSessionID CRITICALITY ignore TYPE AssociatedSessionID PRESENCE optional }| + { ID id-MBS-ServiceArea CRITICALITY ignore TYPE MBS-ServiceArea PRESENCE optional }, ... } @@ -2025,7 +2055,7 @@ MCBearerContextModificationRequired ::= SEQUENCE { MCBearerContextModificationRequiredIEs E1AP-PROTOCOL-IES ::= { { ID id-GNB-CU-CP-MBS-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-MBS-E1AP-ID PRESENCE mandatory }| { ID id-GNB-CU-UP-MBS-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-MBS-E1AP-ID PRESENCE mandatory }| - { ID id-MCBearerContextToModifyRequired CRITICALITY ignore TYPE MCBearerContextToModifyRequired PRESENCE mandatory }, + { ID id-MCBearerContextToModifyRequired CRITICALITY reject TYPE MCBearerContextToModifyRequired PRESENCE mandatory }, ... } @@ -2114,5 +2144,23 @@ MCBearerContextReleaseRequestIEs E1AP-PROTOCOL-IES ::= { ... } +-- ************************************************************** +-- +-- MC BEARER NOTIFICATION +-- +-- ************************************************************** + +MCBearerNotification ::= SEQUENCE { + protocolIEs ProtocolIE-Container { { MCBearerNotificationIEs } }, + ... +} + +MCBearerNotificationIEs E1AP-PROTOCOL-IES ::= { + { ID id-GNB-CU-CP-MBS-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-MBS-E1AP-ID PRESENCE mandatory }| + { ID id-GNB-CU-UP-MBS-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-MBS-E1AP-ID PRESENCE mandatory }| + { ID id-MBSSessionResourceNotification CRITICALITY ignore TYPE MBSSessionResourceNotification PRESENCE mandatory }, + ... +} + END diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn index ce104d1e..37e7e53b 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 37.483 V17.5.0 (2023-06) +-- 3GPP TS 37.483 V18.2.0 (2024-06) -- ************************************************************** -- -- Elementary Procedure definitions @@ -77,6 +77,7 @@ FROM E1AP-CommonDataTypes MCBearerContextModificationFailure, MCBearerContextModificationRequired, MCBearerContextModificationConfirm, + MCBearerNotification, MCBearerContextReleaseCommand, MCBearerContextReleaseComplete, MCBearerContextReleaseRequest, @@ -134,6 +135,7 @@ FROM E1AP-PDU-Contents id-MCBearerContextSetup, id-MCBearerContextModification, id-MCBearerContextModificationRequired, + id-MCBearerNotification, id-MCBearerContextRelease, id-MCBearerContextReleaseRequest @@ -248,7 +250,8 @@ E1AP-ELEMENTARY-PROCEDURES-CLASS-2 E1AP-ELEMENTARY-PROCEDURE ::= { gNB-CU-CPMeasurementResultsInformation | iABPSKNotification | bCBearerContextReleaseRequest | - mCBearerContextReleaseRequest , + mCBearerContextReleaseRequest | + mCBearerNotification , ... } @@ -511,6 +514,12 @@ mCBearerContextModificationRequired E1AP-ELEMENTARY-PROCEDURE ::= { CRITICALITY reject } +mCBearerNotification E1AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE MCBearerNotification + PROCEDURE CODE id-MCBearerNotification + CRITICALITY reject +} + mCBearerContextRelease E1AP-ELEMENTARY-PROCEDURE ::= { INITIATING MESSAGE MCBearerContextReleaseCommand SUCCESSFUL OUTCOME MCBearerContextReleaseComplete diff --git a/epan/dissectors/asn1/e1ap/e1ap.cnf b/epan/dissectors/asn1/e1ap/e1ap.cnf index 3517db2c..3d8b2bd2 100644 --- a/epan/dissectors/asn1/e1ap/e1ap.cnf +++ b/epan/dissectors/asn1/e1ap/e1ap.cnf @@ -158,195 +158,230 @@ id-MCBearerContextModification ProcedureCode id-MCBearerContextModificationRequired ProcedureCode id-MCBearerContextRelease ProcedureCode id-MCBearerContextReleaseRequest ProcedureCode +id-MCBearerNotification ProcedureCode # ProtocolIE-ID -id-Cause ProtocolIE-ID -id-CriticalityDiagnostics ProtocolIE-ID -id-gNB-CU-CP-UE-E1AP-ID ProtocolIE-ID -id-gNB-CU-UP-UE-E1AP-ID ProtocolIE-ID -id-ResetType ProtocolIE-ID -id-UE-associatedLogicalE1-ConnectionItem ProtocolIE-ID -id-UE-associatedLogicalE1-ConnectionListResAck ProtocolIE-ID -id-gNB-CU-UP-ID ProtocolIE-ID -id-gNB-CU-UP-Name ProtocolIE-ID -id-gNB-CU-CP-Name ProtocolIE-ID -id-CNSupport ProtocolIE-ID -id-SupportedPLMNs ProtocolIE-ID -id-TimeToWait ProtocolIE-ID -id-SecurityInformation ProtocolIE-ID -id-UEDLAggregateMaximumBitRate ProtocolIE-ID -id-System-BearerContextSetupRequest ProtocolIE-ID -id-System-BearerContextSetupResponse ProtocolIE-ID -id-BearerContextStatusChange ProtocolIE-ID -id-System-BearerContextModificationRequest ProtocolIE-ID -id-System-BearerContextModificationResponse ProtocolIE-ID -id-System-BearerContextModificationConfirm ProtocolIE-ID -id-System-BearerContextModificationRequired ProtocolIE-ID -id-DRB-Status-List ProtocolIE-ID -id-ActivityNotificationLevel ProtocolIE-ID -id-ActivityInformation ProtocolIE-ID -id-Data-Usage-Report-List ProtocolIE-ID -id-New-UL-TNL-Information-Required ProtocolIE-ID -id-GNB-CU-CP-TNLA-To-Add-List ProtocolIE-ID -id-GNB-CU-CP-TNLA-To-Remove-List ProtocolIE-ID -id-GNB-CU-CP-TNLA-To-Update-List ProtocolIE-ID -id-GNB-CU-CP-TNLA-Setup-List ProtocolIE-ID -id-GNB-CU-CP-TNLA-Failed-To-Setup-List ProtocolIE-ID -id-DRB-To-Setup-List-EUTRAN ProtocolIE-ID -id-DRB-To-Modify-List-EUTRAN ProtocolIE-ID -id-DRB-To-Remove-List-EUTRAN ProtocolIE-ID -id-DRB-Required-To-Modify-List-EUTRAN ProtocolIE-ID -id-DRB-Required-To-Remove-List-EUTRAN ProtocolIE-ID -id-DRB-Setup-List-EUTRAN ProtocolIE-ID -id-DRB-Failed-List-EUTRAN ProtocolIE-ID -id-DRB-Modified-List-EUTRAN ProtocolIE-ID -id-DRB-Failed-To-Modify-List-EUTRAN ProtocolIE-ID -id-DRB-Confirm-Modified-List-EUTRAN ProtocolIE-ID -id-PDU-Session-Resource-To-Setup-List ProtocolIE-ID -id-PDU-Session-Resource-To-Modify-List ProtocolIE-ID -id-PDU-Session-Resource-To-Remove-List ProtocolIE-ID -id-PDU-Session-Resource-Required-To-Modify-List ProtocolIE-ID -id-PDU-Session-Resource-Setup-List ProtocolIE-ID -id-PDU-Session-Resource-Failed-List ProtocolIE-ID -id-PDU-Session-Resource-Modified-List ProtocolIE-ID -id-PDU-Session-Resource-Failed-To-Modify-List ProtocolIE-ID -id-PDU-Session-Resource-Confirm-Modified-List ProtocolIE-ID -id-DRB-To-Setup-Mod-List-EUTRAN ProtocolIE-ID -id-DRB-Setup-Mod-List-EUTRAN ProtocolIE-ID -id-DRB-Failed-Mod-List-EUTRAN ProtocolIE-ID -id-PDU-Session-Resource-Setup-Mod-List ProtocolIE-ID -id-PDU-Session-Resource-Failed-Mod-List ProtocolIE-ID -id-PDU-Session-Resource-To-Setup-Mod-List ProtocolIE-ID -id-TransactionID ProtocolIE-ID -id-Serving-PLMN ProtocolIE-ID -id-UE-Inactivity-Timer ProtocolIE-ID -id-System-GNB-CU-UP-CounterCheckRequest ProtocolIE-ID -id-DRBs-Subject-To-Counter-Check-List-EUTRAN ProtocolIE-ID -id-DRBs-Subject-To-Counter-Check-List-NG-RAN ProtocolIE-ID -id-PPI ProtocolIE-ID -id-gNB-CU-UP-Capacity ProtocolIE-ID -id-GNB-CU-UP-OverloadInformation ProtocolIE-ID -id-UEDLMaximumIntegrityProtectedDataRate ProtocolIE-ID -id-PDU-Session-To-Notify-List ProtocolIE-ID -id-PDU-Session-Resource-Data-Usage-List ProtocolIE-ID -id-SNSSAI ProtocolIE-ID -id-DataDiscardRequired ProtocolIE-ID -id-OldQoSFlowMap-ULendmarkerexpected ProtocolIE-ID -id-DRB-QoS ProtocolIE-ID -id-GNB-CU-UP-TNLA-To-Remove-List ProtocolIE-ID -id-endpoint-IP-Address-and-Port ProtocolIE-ID -id-TNLAssociationTransportLayerAddressgNBCUUP ProtocolIE-ID -id-RANUEID ProtocolIE-ID -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 -id-MCG-OfferedGBRQoSFlowInfo ProtocolIE-ID -id-Number-of-tunnels ProtocolIE-ID -id-DRB-Measurement-Results-Information-List ProtocolIE-ID -id-Extended-GNB-CU-CP-Name ProtocolIE-ID -id-Extended-GNB-CU-UP-Name ProtocolIE-ID -id-DataForwardingtoE-UTRANInformationList ProtocolIE-ID -id-QosMonitoringReportingFrequency ProtocolIE-ID -id-QoSMonitoringDisabled ProtocolIE-ID -id-AdditionalHandoverInfo ProtocolIE-ID -id-Extended-NR-CGI-Support-List ProtocolIE-ID -id-DataForwardingtoNG-RANQoSFlowInformationList ProtocolIE-ID -id-MaxCIDEHCDL ProtocolIE-ID -id-ignoreMappingRuleIndication ProtocolIE-ID -id-DirectForwardingPathAvailability ProtocolIE-ID -id-EarlyDataForwardingIndicator ProtocolIE-ID -id-QoSFlowsDRBRemapping ProtocolIE-ID -id-DataForwardingSourceIPAddress ProtocolIE-ID -id-SecurityIndicationModify ProtocolIE-ID -id-IAB-Donor-CU-UPPSKInfo ProtocolIE-ID -id-ECGI-Support-List ProtocolIE-ID -id-MDTPollutedMeasurementIndicator ProtocolIE-ID -id-M4ReportAmount ProtocolIE-ID -id-M6ReportAmount ProtocolIE-ID -id-M7ReportAmount ProtocolIE-ID -id-UESliceMaximumBitRateList ProtocolIE-ID -id-PDUSession-PairID ProtocolIE-ID -id-SurvivalTime ProtocolIE-ID -id-UDC-Parameters ProtocolIE-ID -id-SCGActivationStatus ProtocolIE-ID -id-GNB-CU-CP-MBS-E1AP-ID ProtocolIE-ID -id-GNB-CU-UP-MBS-E1AP-ID ProtocolIE-ID -id-GlobalMBSSessionID ProtocolIE-ID -id-BCBearerContextToSetup ProtocolIE-ID -id-BCBearerContextToSetupResponse ProtocolIE-ID -id-BCBearerContextToModify ProtocolIE-ID -id-BCBearerContextToModifyResponse ProtocolIE-ID -id-BCBearerContextToModifyRequired ProtocolIE-ID -id-BCBearerContextToModifyConfirm ProtocolIE-ID -id-MCBearerContextToSetup ProtocolIE-ID -id-MCBearerContextToSetupResponse ProtocolIE-ID -id-MCBearerContextToModify ProtocolIE-ID -id-MCBearerContextToModifyResponse ProtocolIE-ID -id-MCBearerContextToModifyRequired ProtocolIE-ID -id-MCBearerContextToModifyConfirm ProtocolIE-ID -id-MBSMulticastF1UContextDescriptor ProtocolIE-ID -id-gNB-CU-UP-MBS-Support-Info ProtocolIE-ID -id-SecurityIndication ProtocolIE-ID -id-SecurityResult ProtocolIE-ID -id-SDTContinueROHC ProtocolIE-ID -id-SDTindicatorSetup ProtocolIE-ID -id-SDTindicatorMod ProtocolIE-ID -id-DiscardTimerExtended ProtocolIE-ID -id-ManagementBasedMDTPLMNModificationList ProtocolIE-ID -id-MCForwardingResourceRequest ProtocolIE-ID -id-MCForwardingResourceIndication ProtocolIE-ID -id-MCForwardingResourceResponse ProtocolIE-ID -id-MCForwardingResourceRelease ProtocolIE-ID -id-MCForwardingResourceReleaseIndication ProtocolIE-ID -id-PDCP-COUNT-Reset ProtocolIE-ID -id-MBSSessionAssociatedInfoNonSupportToSupport ProtocolIE-ID -id-VersionID ProtocolIE-ID +id-Cause ProtocolIE-ID +id-CriticalityDiagnostics ProtocolIE-ID +id-gNB-CU-CP-UE-E1AP-ID ProtocolIE-ID +id-gNB-CU-UP-UE-E1AP-ID ProtocolIE-ID +id-ResetType ProtocolIE-ID +id-UE-associatedLogicalE1-ConnectionItem ProtocolIE-ID +id-UE-associatedLogicalE1-ConnectionListResAck ProtocolIE-ID +id-gNB-CU-UP-ID ProtocolIE-ID +id-gNB-CU-UP-Name ProtocolIE-ID +id-gNB-CU-CP-Name ProtocolIE-ID +id-CNSupport ProtocolIE-ID +id-SupportedPLMNs ProtocolIE-ID +id-TimeToWait ProtocolIE-ID +id-SecurityInformation ProtocolIE-ID +id-UEDLAggregateMaximumBitRate ProtocolIE-ID +id-System-BearerContextSetupRequest ProtocolIE-ID +id-System-BearerContextSetupResponse ProtocolIE-ID +id-BearerContextStatusChange ProtocolIE-ID +id-System-BearerContextModificationRequest ProtocolIE-ID +id-System-BearerContextModificationResponse ProtocolIE-ID +id-System-BearerContextModificationConfirm ProtocolIE-ID +id-System-BearerContextModificationRequired ProtocolIE-ID +id-DRB-Status-List ProtocolIE-ID +id-ActivityNotificationLevel ProtocolIE-ID +id-ActivityInformation ProtocolIE-ID +id-Data-Usage-Report-List ProtocolIE-ID +id-New-UL-TNL-Information-Required ProtocolIE-ID +id-GNB-CU-CP-TNLA-To-Add-List ProtocolIE-ID +id-GNB-CU-CP-TNLA-To-Remove-List ProtocolIE-ID +id-GNB-CU-CP-TNLA-To-Update-List ProtocolIE-ID +id-GNB-CU-CP-TNLA-Setup-List ProtocolIE-ID +id-GNB-CU-CP-TNLA-Failed-To-Setup-List ProtocolIE-ID +id-DRB-To-Setup-List-EUTRAN ProtocolIE-ID +id-DRB-To-Modify-List-EUTRAN ProtocolIE-ID +id-DRB-To-Remove-List-EUTRAN ProtocolIE-ID +id-DRB-Required-To-Modify-List-EUTRAN ProtocolIE-ID +id-DRB-Required-To-Remove-List-EUTRAN ProtocolIE-ID +id-DRB-Setup-List-EUTRAN ProtocolIE-ID +id-DRB-Failed-List-EUTRAN ProtocolIE-ID +id-DRB-Modified-List-EUTRAN ProtocolIE-ID +id-DRB-Failed-To-Modify-List-EUTRAN ProtocolIE-ID +id-DRB-Confirm-Modified-List-EUTRAN ProtocolIE-ID +id-PDU-Session-Resource-To-Setup-List ProtocolIE-ID +id-PDU-Session-Resource-To-Modify-List ProtocolIE-ID +id-PDU-Session-Resource-To-Remove-List ProtocolIE-ID +id-PDU-Session-Resource-Required-To-Modify-List ProtocolIE-ID +id-PDU-Session-Resource-Setup-List ProtocolIE-ID +id-PDU-Session-Resource-Failed-List ProtocolIE-ID +id-PDU-Session-Resource-Modified-List ProtocolIE-ID +id-PDU-Session-Resource-Failed-To-Modify-List ProtocolIE-ID +id-PDU-Session-Resource-Confirm-Modified-List ProtocolIE-ID +id-DRB-To-Setup-Mod-List-EUTRAN ProtocolIE-ID +id-DRB-Setup-Mod-List-EUTRAN ProtocolIE-ID +id-DRB-Failed-Mod-List-EUTRAN ProtocolIE-ID +id-PDU-Session-Resource-Setup-Mod-List ProtocolIE-ID +id-PDU-Session-Resource-Failed-Mod-List ProtocolIE-ID +id-PDU-Session-Resource-To-Setup-Mod-List ProtocolIE-ID +id-TransactionID ProtocolIE-ID +id-Serving-PLMN ProtocolIE-ID +id-UE-Inactivity-Timer ProtocolIE-ID +id-System-GNB-CU-UP-CounterCheckRequest ProtocolIE-ID +id-DRBs-Subject-To-Counter-Check-List-EUTRAN ProtocolIE-ID +id-DRBs-Subject-To-Counter-Check-List-NG-RAN ProtocolIE-ID +id-PPI ProtocolIE-ID +id-gNB-CU-UP-Capacity ProtocolIE-ID +id-GNB-CU-UP-OverloadInformation ProtocolIE-ID +id-UEDLMaximumIntegrityProtectedDataRate ProtocolIE-ID +id-PDU-Session-To-Notify-List ProtocolIE-ID +id-PDU-Session-Resource-Data-Usage-List ProtocolIE-ID +id-SNSSAI ProtocolIE-ID +id-DataDiscardRequired ProtocolIE-ID +id-OldQoSFlowMap-ULendmarkerexpected ProtocolIE-ID +id-DRB-QoS ProtocolIE-ID +id-GNB-CU-UP-TNLA-To-Remove-List ProtocolIE-ID +id-endpoint-IP-Address-and-Port ProtocolIE-ID +id-TNLAssociationTransportLayerAddressgNBCUUP ProtocolIE-ID +id-RANUEID ProtocolIE-ID +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 +id-MCG-OfferedGBRQoSFlowInfo ProtocolIE-ID +id-Number-of-tunnels ProtocolIE-ID +id-DRB-Measurement-Results-Information-List ProtocolIE-ID +id-Extended-GNB-CU-CP-Name ProtocolIE-ID +id-Extended-GNB-CU-UP-Name ProtocolIE-ID +id-DataForwardingtoE-UTRANInformationList ProtocolIE-ID +id-QosMonitoringReportingFrequency ProtocolIE-ID +id-QoSMonitoringDisabled ProtocolIE-ID +id-AdditionalHandoverInfo ProtocolIE-ID +id-Extended-NR-CGI-Support-List ProtocolIE-ID +id-DataForwardingtoNG-RANQoSFlowInformationList ProtocolIE-ID +id-MaxCIDEHCDL ProtocolIE-ID +id-ignoreMappingRuleIndication ProtocolIE-ID +id-DirectForwardingPathAvailability ProtocolIE-ID +id-EarlyDataForwardingIndicator ProtocolIE-ID +id-QoSFlowsDRBRemapping ProtocolIE-ID +id-DataForwardingSourceIPAddress ProtocolIE-ID +id-SecurityIndicationModify ProtocolIE-ID +id-IAB-Donor-CU-UPPSKInfo ProtocolIE-ID +id-ECGI-Support-List ProtocolIE-ID +id-MDTPollutedMeasurementIndicator ProtocolIE-ID +id-M4ReportAmount ProtocolIE-ID +id-M6ReportAmount ProtocolIE-ID +id-M7ReportAmount ProtocolIE-ID +id-UESliceMaximumBitRateList ProtocolIE-ID +id-PDUSession-PairID ProtocolIE-ID +id-SurvivalTime ProtocolIE-ID +id-UDC-Parameters ProtocolIE-ID +id-SCGActivationStatus ProtocolIE-ID +id-GNB-CU-CP-MBS-E1AP-ID ProtocolIE-ID +id-GNB-CU-UP-MBS-E1AP-ID ProtocolIE-ID +id-GlobalMBSSessionID ProtocolIE-ID +id-BCBearerContextToSetup ProtocolIE-ID +id-BCBearerContextToSetupResponse ProtocolIE-ID +id-BCBearerContextToModify ProtocolIE-ID +id-BCBearerContextToModifyResponse ProtocolIE-ID +id-BCBearerContextToModifyRequired ProtocolIE-ID +id-BCBearerContextToModifyConfirm ProtocolIE-ID +id-MCBearerContextToSetup ProtocolIE-ID +id-MCBearerContextToSetupResponse ProtocolIE-ID +id-MCBearerContextToModify ProtocolIE-ID +id-MCBearerContextToModifyResponse ProtocolIE-ID +id-MCBearerContextToModifyRequired ProtocolIE-ID +id-MCBearerContextToModifyConfirm ProtocolIE-ID +id-MBSMulticastF1UContextDescriptor ProtocolIE-ID +id-gNB-CU-UP-MBS-Support-Info ProtocolIE-ID +id-SecurityIndication ProtocolIE-ID +id-SecurityResult ProtocolIE-ID +id-SDTContinueROHC ProtocolIE-ID +id-SDTindicatorSetup ProtocolIE-ID +id-SDTindicatorMod ProtocolIE-ID +id-DiscardTimerExtended ProtocolIE-ID +id-ManagementBasedMDTPLMNModificationList ProtocolIE-ID +id-MCForwardingResourceRequest ProtocolIE-ID +id-MCForwardingResourceIndication ProtocolIE-ID +id-MCForwardingResourceResponse ProtocolIE-ID +id-MCForwardingResourceRelease ProtocolIE-ID +id-MCForwardingResourceReleaseIndication ProtocolIE-ID +id-PDCP-COUNT-Reset ProtocolIE-ID +id-MBSSessionAssociatedInfoNonSupportToSupport ProtocolIE-ID +id-VersionID ProtocolIE-ID +id-InactivityInformationRequest ProtocolIE-ID +id-UEInactivityInformation ProtocolIE-ID +id-MBSAreaSessionID ProtocolIE-ID +id-Secondary-PDU-Session-Data-Forwarding-Information ProtocolIE-ID +id-MBSSessionResourceNotification ProtocolIE-ID +id-MCBearerContextInactivityTimer ProtocolIE-ID +id-MCBearerContextStatusChange ProtocolIE-ID +id-MT-SDT-Information ProtocolIE-ID +id-MT-SDT-Information-Request ProtocolIE-ID +id-SDT-data-size-threshold ProtocolIE-ID +id-SDT-data-size-threshold-Crossed ProtocolIE-ID +id-SpecialTriggeringPurpose ProtocolIE-ID +id-AssociatedSessionID ProtocolIE-ID +id-MBS-ServiceArea ProtocolIE-ID +id-PDUSetQoSParameters ProtocolIE-ID +id-N6JitterInformation ProtocolIE-ID +id-ECNMarkingorCongestionInformationReportingRequest ProtocolIE-ID +id-ECNMarkingorCongestionInformationReportingStatus ProtocolIE-ID +id-PDUSetbasedHandlingIndicator ProtocolIE-ID +id-IndirectPathIndication ProtocolIE-ID +id-F1UTunnelNotEstablished ProtocolIE-ID +id-F1U-TNL-InfoToAdd-List ProtocolIE-ID +id-F1U-TNL-InfoAdded-List ProtocolIE-ID +id-F1U-TNL-InfoToAddOrModify-List ProtocolIE-ID +id-F1U-TNL-InfoAddedOrModified-List ProtocolIE-ID +id-F1U-TNL-InfoToRelease-List ProtocolIE-ID +id-BroadcastF1U-ContextReferenceE1 ProtocolIE-ID +id-PSIbasedDiscardTimer ProtocolIE-ID +id-UserPlaneErrorIndicator ProtocolIE-ID +id-MaximumDataBurstVolume ProtocolIE-ID +id-BCBearerContextNGU-TNLInfoatNGRAN-Request ProtocolIE-ID +id-PDCPSNGapReport ProtocolIE-ID +id-UserPlaneFailureIndication ProtocolIE-ID + #.END @@ -477,71 +512,103 @@ MBSMulticastF1UContextDescriptor N e1ap.ies id-MBSMulticastF1UContex GNB-CU-UP-MBS-Support-Info N e1ap.ies id-gNB-CU-UP-MBS-Support-Info SDTContinueROHC N e1ap.ies id-SDTContinueROHC MDTPLMNModificationList N e1ap.ies id-ManagementBasedMDTPLMNModificationList +InactivityInformationRequest N e1ap.ies id-InactivityInformationRequest +UEInactivityInformation N e1ap.ies id-UEInactivityInformation +MBSSessionResourceNotification N e1ap.ies id-MBSSessionResourceNotification +MT-SDT-Information N e1ap.ies id-MT-SDT-Information +MT-SDT-Information-Request N e1ap.ies id-MT-SDT-Information-Request +SDT-data-size-threshold N e1ap.ies id-SDT-data-size-threshold +SDT-data-size-threshold-Crossed N e1ap.ies id-SDT-data-size-threshold-Crossed +AssociatedSessionID N e1ap.ies id-AssociatedSessionID +MBS-ServiceArea N e1ap.ies id-MBS-ServiceArea #E1AP-PROTOCOL-EXTENSION -SNSSAI N e1ap.extension id-SNSSAI -QoS-Flow-List N e1ap.extension id-OldQoSFlowMap-ULendmarkerexpected -QoSFlowLevelQoSParameters N e1ap.extension id-DRB-QoS -CP-TNL-Information N e1ap.extension id-TNLAssociationTransportLayerAddressgNBCUUP -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 -GBR-QoSFlowInformation N e1ap.extension id-MCG-OfferedGBRQoSFlowInfo -Number-of-tunnels N e1ap.extension id-Number-of-tunnels -DataForwardingtoE-UTRANInformationList N e1ap.extension id-DataForwardingtoE-UTRANInformationList -QosMonitoringReportingFrequency N e1ap.extension id-QosMonitoringReportingFrequency -QosMonitoringDisabled N e1ap.extension id-QoSMonitoringDisabled -Extended-NR-CGI-Support-List N e1ap.extension id-Extended-NR-CGI-Support-List -DataForwardingtoNG-RANQoSFlowInformationList N e1ap.extension id-DataForwardingtoNG-RANQoSFlowInformationList -MaxCIDEHCDL N e1ap.extension id-MaxCIDEHCDL -IgnoreMappingRuleIndication N e1ap.extension id-ignoreMappingRuleIndication -EarlyDataForwardingIndicator N e1ap.extension id-EarlyDataForwardingIndicator -QoS-Flows-DRB-Remapping N e1ap.extension id-QoSFlowsDRBRemapping -TransportLayerAddress N e1ap.extension id-DataForwardingSourceIPAddress -SecurityIndication N e1ap.extension id-SecurityIndicationModify -ECGI-Support-List N e1ap.extension id-ECGI-Support-List -M4ReportAmount N e1ap.extension id-M4ReportAmount -M6ReportAmount N e1ap.extension id-M6ReportAmount -M7ReportAmount N e1ap.extension id-M7ReportAmount -PDUSession-PairID N e1ap.extension id-PDUSession-PairID -SurvivalTime N e1ap.extension id-SurvivalTime -UDC-Parameters N e1ap.extension id-UDC-Parameters -SecurityIndication N e1ap.extension id-SecurityIndication -SecurityResult N e1ap.extension id-SecurityResult -SDTindicatorSetup N e1ap.extension id-SDTindicatorSetup -SDTindicatorMod N e1ap.extension id-SDTindicatorMod -DiscardTimerExtended N e1ap.extension id-DiscardTimerExtended -MCForwardingResourceRequest N e1ap.extension id-MCForwardingResourceRequest -MCForwardingResourceIndication N e1ap.extension id-MCForwardingResourceIndication -MCForwardingResourceResponse N e1ap.extension id-MCForwardingResourceResponse -MCForwardingResourceRelease N e1ap.extension id-MCForwardingResourceRelease -MCForwardingResourceReleaseIndication N e1ap.extension id-MCForwardingResourceReleaseIndication -PDCP-COUNT-Reset N e1ap.extension id-PDCP-COUNT-Reset -MBSSessionAssociatedInfoNonSupportToSupport N e1ap.extension id-MBSSessionAssociatedInfoNonSupportToSupport -VersionID N e1ap.extension id-VersionID +SNSSAI N e1ap.extension id-SNSSAI +QoS-Flow-List N e1ap.extension id-OldQoSFlowMap-ULendmarkerexpected +QoSFlowLevelQoSParameters N e1ap.extension id-DRB-QoS +CP-TNL-Information N e1ap.extension id-TNLAssociationTransportLayerAddressgNBCUUP +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 +GBR-QoSFlowInformation N e1ap.extension id-MCG-OfferedGBRQoSFlowInfo +Number-of-tunnels N e1ap.extension id-Number-of-tunnels +DataForwardingtoE-UTRANInformationList N e1ap.extension id-DataForwardingtoE-UTRANInformationList +QosMonitoringReportingFrequency N e1ap.extension id-QosMonitoringReportingFrequency +QosMonitoringDisabled N e1ap.extension id-QoSMonitoringDisabled +Extended-NR-CGI-Support-List N e1ap.extension id-Extended-NR-CGI-Support-List +DataForwardingtoNG-RANQoSFlowInformationList N e1ap.extension id-DataForwardingtoNG-RANQoSFlowInformationList +MaxCIDEHCDL N e1ap.extension id-MaxCIDEHCDL +IgnoreMappingRuleIndication N e1ap.extension id-ignoreMappingRuleIndication +EarlyDataForwardingIndicator N e1ap.extension id-EarlyDataForwardingIndicator +QoS-Flows-DRB-Remapping N e1ap.extension id-QoSFlowsDRBRemapping +TransportLayerAddress N e1ap.extension id-DataForwardingSourceIPAddress +SecurityIndication N e1ap.extension id-SecurityIndicationModify +ECGI-Support-List N e1ap.extension id-ECGI-Support-List +M4ReportAmount N e1ap.extension id-M4ReportAmount +M6ReportAmount N e1ap.extension id-M6ReportAmount +M7ReportAmount N e1ap.extension id-M7ReportAmount +PDUSession-PairID N e1ap.extension id-PDUSession-PairID +SurvivalTime N e1ap.extension id-SurvivalTime +UDC-Parameters N e1ap.extension id-UDC-Parameters +SecurityIndication N e1ap.extension id-SecurityIndication +SecurityResult N e1ap.extension id-SecurityResult +SDTindicatorSetup N e1ap.extension id-SDTindicatorSetup +SDTindicatorMod N e1ap.extension id-SDTindicatorMod +DiscardTimerExtended N e1ap.extension id-DiscardTimerExtended +MCForwardingResourceRequest N e1ap.extension id-MCForwardingResourceRequest +MCForwardingResourceIndication N e1ap.extension id-MCForwardingResourceIndication +MCForwardingResourceResponse N e1ap.extension id-MCForwardingResourceResponse +MCForwardingResourceRelease N e1ap.extension id-MCForwardingResourceRelease +MCForwardingResourceReleaseIndication N e1ap.extension id-MCForwardingResourceReleaseIndication +PDCP-COUNT-Reset N e1ap.extension id-PDCP-COUNT-Reset +MBSSessionAssociatedInfoNonSupportToSupport N e1ap.extension id-MBSSessionAssociatedInfoNonSupportToSupport +VersionID N e1ap.extension id-VersionID +MBSAreaSessionID N e1ap.extension id-MBSAreaSessionID +Data-Forwarding-Information N e1ap.extension id-Secondary-PDU-Session-Data-Forwarding-Information +Inactivity-Timer N e1ap.extension id-MCBearerContextInactivityTimer +MCBearerContextStatusChange N e1ap.extension id-MCBearerContextStatusChange +SpecialTriggeringPurpose N e1ap.extension id-SpecialTriggeringPurpose +PDUSetQoSParameters N e1ap.extension id-PDUSetQoSParameters +N6JitterInformation N e1ap.extension id-N6JitterInformation +ECNMarkingorCongestionInformationReportingRequest N e1ap.extension id-ECNMarkingorCongestionInformationReportingRequest +ECNMarkingorCongestionInformationReportingStatus N e1ap.extension id-ECNMarkingorCongestionInformationReportingStatus +PDUSetbasedHandlingIndicator N e1ap.extension id-PDUSetbasedHandlingIndicator +IndirectPathIndication N e1ap.extension id-IndirectPathIndication +F1UTunnelNotEstablished N e1ap.extension id-F1UTunnelNotEstablished +F1U-TNL-InfoToAdd-List N e1ap.extension id-F1U-TNL-InfoToAdd-List +F1U-TNL-InfoAdded-List N e1ap.extension id-F1U-TNL-InfoAdded-List +F1U-TNL-InfoToAddOrModify-List N e1ap.extension id-F1U-TNL-InfoToAddOrModify-List +F1U-TNL-InfoAddedOrModified-List N e1ap.extension id-F1U-TNL-InfoAddedOrModified-List +F1U-TNL-InfoToRelease-List N e1ap.extension id-F1U-TNL-InfoToRelease-List +PSIbasedDiscardTimer N e1ap.extension id-PSIbasedDiscardTimer +UserPlaneErrorIndicator N e1ap.extension id-UserPlaneErrorIndicator +MaxDataBurstVolume N e1ap.extension id-MaximumDataBurstVolume +BCBearerContextNGU-TNLInfoatNGRAN-Request N e1ap.extension id-BCBearerContextNGU-TNLInfoatNGRAN-Request +PDCPSNGapReport N e1ap.extension id-PDCPSNGapReport +UserPlaneFailureIndication N e1ap.extension id-UserPlaneFailureIndication #E1AP-ELEMENTARY-PROCEDURE Reset N e1ap.proc.imsg id-reset @@ -649,6 +716,8 @@ MCBearerContextModificationFailure N e1ap.proc.uout id-MCBearerContextModi MCBearerContextModificationRequired N e1ap.proc.imsg id-MCBearerContextModificationRequired MCBearerContextModificationConfirm N e1ap.proc.sout id-MCBearerContextModificationRequired +MCBearerNotification N e1ap.proc.imsg id-MCBearerNotification + MCBearerContextReleaseCommand N e1ap.proc.imsg id-MCBearerContextRelease MCBearerContextReleaseComplete N e1ap.proc.sout id-MCBearerContextRelease @@ -662,7 +731,7 @@ MCBearerContextReleaseRequest N e1ap.proc.imsg id-MCBearerContextRele %(DEFAULT_BODY)s if (param_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_PLMN_Identity); - dissect_e212_mcc_mnc(param_tvb, actx->pinfo, subtree, 0, number_type, FALSE); + dissect_e212_mcc_mnc(param_tvb, actx->pinfo, subtree, 0, number_type, false); } #.FN_BODY NR-CGI @@ -681,7 +750,7 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC } #.TYPE_ATTR -BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec +BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_bit_sec) #.FN_BODY DRB-Usage-Report-Item/startTimeStamp VAL_PTR = ×tamp_tvb tvbuff_t *timestamp_tvb = NULL; @@ -702,10 +771,10 @@ BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec } #.TYPE_ATTR -DRB-Usage-Report-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +DRB-Usage-Report-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_octet_octets) #.TYPE_ATTR -DRB-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +DRB-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_octet_octets) #.TYPE_ATTR MaxPacketLossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(e1ap_MaxPacketLossRate_fmt) @@ -714,20 +783,20 @@ MaxPacketLossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(e1ap_MaxPacketLossRate PacketDelayBudget DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(e1ap_PacketDelayBudget_uL_D1_Result_fmt) #.TYPE_ATTR -AveragingWindow DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds +AveragingWindow DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) #.TYPE_ATTR -MaxDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_bytes +MaxDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_byte_bytes) #.TYPE_ATTR -Inactivity-Timer DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +Inactivity-Timer DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY TransportLayerAddress VAL_PTR = ¶m_tvb tvbuff_t *param_tvb = NULL; %(DEFAULT_BODY)s if (param_tvb) { proto_tree *subtree; - gint tvb_len; + int tvb_len; tvb_len = tvb_reported_length(param_tvb); subtree = proto_item_add_subtree(actx->created_item, ett_e1ap_TransportLayerAddress); @@ -764,16 +833,16 @@ Inactivity-Timer DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds } #.TYPE_ATTR -MRDC-Data-Usage-Report-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +MRDC-Data-Usage-Report-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_octet_octets) #.TYPE_ATTR -MRDC-Data-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +MRDC-Data-Usage-Report-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&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 +HW-CapacityIndicator/offeredThroughput DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kbps) #.FN_BODY InterfacesToTrace VAL_PTR = ¶m_tvb tvbuff_t *param_tvb = NULL; @@ -793,7 +862,7 @@ HW-CapacityIndicator/offeredThroughput DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS } #.TYPE_ATTR -M7period DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes +M7period DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_minutes) #.FN_BODY MeasurementsToActivate VAL_PTR=¶m_tvb tvbuff_t *param_tvb = NULL; @@ -826,7 +895,7 @@ M7period DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes } #.TYPE_ATTR -Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds +Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_microseconds) #.FN_BODY BurstArrivalTime VAL_PTR = ¶m_tvb tvbuff_t *param_tvb = NULL; @@ -840,10 +909,25 @@ Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds DRB-Measurement-Results-Information-Item/uL-D1-Result DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(e1ap_PacketDelayBudget_uL_D1_Result_fmt) #.TYPE_ATTR -QosMonitoringReportingFrequency DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +QosMonitoringReportingFrequency DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) + +#.TYPE_ATTR +SurvivalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_microseconds) + +#.TYPE_ATTR +UEInactivityInformation DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) + +#.TYPE_ATTR +MT-SDT-Data-Size DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_byte_bytes) + +#.TYPE_ATTR +N6JitterInformation/n6JitterLowerBound DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(e1ap_N6Jitter_fmt) + +#.TYPE_ATTR +N6JitterInformation/n6JitterUpperBound DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(e1ap_N6Jitter_fmt) #.TYPE_ATTR -SurvivalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds +SDT-data-size-threshold DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_byte_bytes) #.FN_HDR Reset col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset"); @@ -981,6 +1065,8 @@ SurvivalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MCBearerContextModificationRequired"); #.FN_HDR MCBearerContextModificationConfirm col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MCBearerContextModificationConfirm"); +#.FN_HDR MCBearerNotification + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MCBearerNotification"); #.FN_HDR MCBearerContextReleaseCommand col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MCBearerContextReleaseCommand"); #.FN_HDR MCBearerContextReleaseComplete diff --git a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c index f51884a2..6ac4e789 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-2023, Pascal Quantin <pascal@wireshark.org> + * Copyright 2018-2024, 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 37.483 V17.5.0 (2023-06) + * References: 3GPP TS 37.483 V18.2.0 (2024-06) */ #include "config.h" @@ -18,6 +18,9 @@ #include <epan/asn1.h> #include <epan/sctpppids.h> #include <epan/proto_data.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> +#include <wsutil/array.h> #include "packet-e1ap.h" #include "packet-per.h" @@ -38,35 +41,35 @@ void proto_reg_handoff_e1ap(void); #include "packet-e1ap-val.h" /* Initialize the protocol and registered fields */ -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; -static int hf_e1ap_tcp_pdu_len = -1; +static int proto_e1ap; + +static int hf_e1ap_transportLayerAddressIPv4; +static int hf_e1ap_transportLayerAddressIPv6; +static int hf_e1ap_InterfacesToTrace_NG_C; +static int hf_e1ap_InterfacesToTrace_Xn_C; +static int hf_e1ap_InterfacesToTrace_Uu; +static int hf_e1ap_InterfacesToTrace_F1_C; +static int hf_e1ap_InterfacesToTrace_E1; +static int hf_e1ap_InterfacesToTrace_Reserved; +static int hf_e1ap_MeasurementsToActivate_Reserved1; +static int hf_e1ap_MeasurementsToActivate_M4; +static int hf_e1ap_MeasurementsToActivate_Reserved2; +static int hf_e1ap_MeasurementsToActivate_M6; +static int hf_e1ap_MeasurementsToActivate_M7; +static int hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic; +static int hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic; +static int hf_e1ap_ReportCharacteristics_Reserved; +static int hf_e1ap_tcp_pdu_len; #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; +static int ett_e1ap; +static int ett_e1ap_PLMN_Identity; +static int ett_e1ap_TransportLayerAddress; +static int ett_e1ap_InterfacesToTrace; +static int ett_e1ap_MeasurementsToActivate; +static int ett_e1ap_ReportCharacteristics; +static int ett_e1ap_BurstArrivalTime; #include "packet-e1ap-ett.c" enum{ @@ -76,9 +79,9 @@ enum{ }; typedef struct { - guint32 message_type; - guint32 procedure_code; - guint32 protocol_ie_id; + uint32_t message_type; + uint32_t procedure_code; + uint32_t protocol_ie_id; const char *obj_id; e212_number_type_t number_type; } e1ap_private_data_t; @@ -100,29 +103,30 @@ 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) +e1ap_MaxPacketLossRate_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1f%% (%u)", (float)v/10, v); } static void -e1ap_PacketDelayBudget_uL_D1_Result_fmt(gchar *s, guint32 v) +e1ap_PacketDelayBudget_uL_D1_Result_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fms (%u)", (float)v/2, v); } static void -e1ap_ExtendedPacketDelayBudget_fmt(gchar *s, guint32 v) +e1ap_ExtendedPacketDelayBudget_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.2fms (%u)", (float)v/100, v); } +static void +e1ap_N6Jitter_fmt(char *s, uint32_t v) +{ + snprintf(s, ITEM_LABEL_LENGTH, "%.1fms (%d)", (float)v/2, (int32_t)v); +} + static e1ap_private_data_t* e1ap_get_private_data(packet_info *pinfo) { @@ -145,7 +149,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto e1ap_ctx.ProcedureCode = e1ap_data->procedure_code; e1ap_ctx.ProtocolIE_ID = e1ap_data->protocol_ie_id; - return (dissector_try_uint_new(e1ap_ies_dissector_table, e1ap_data->protocol_ie_id, tvb, pinfo, tree, FALSE, &e1ap_ctx)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(e1ap_ies_dissector_table, e1ap_data->protocol_ie_id, tvb, pinfo, tree, false, &e1ap_ctx)) ? tvb_captured_length(tvb) : 0; } static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -157,28 +161,28 @@ static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_in e1ap_ctx.ProcedureCode = e1ap_data->procedure_code; e1ap_ctx.ProtocolIE_ID = e1ap_data->protocol_ie_id; - return (dissector_try_uint_new(e1ap_extension_dissector_table, e1ap_data->protocol_ie_id, tvb, pinfo, tree, FALSE, &e1ap_ctx)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(e1ap_extension_dissector_table, e1ap_data->protocol_ie_id, tvb, pinfo, tree, false, &e1ap_ctx)) ? tvb_captured_length(tvb) : 0; } static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { e1ap_private_data_t *e1ap_data = e1ap_get_private_data(pinfo); - return (dissector_try_uint_new(e1ap_proc_imsg_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(e1ap_proc_imsg_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0; } static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { e1ap_private_data_t *e1ap_data = e1ap_get_private_data(pinfo); - return (dissector_try_uint_new(e1ap_proc_sout_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(e1ap_proc_sout_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0; } static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { e1ap_private_data_t *e1ap_data = e1ap_get_private_data(pinfo); - return (dissector_try_uint_new(e1ap_proc_uout_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(e1ap_proc_uout_dissector_table, e1ap_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0; } @@ -200,7 +204,7 @@ dissect_e1ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ return tvb_captured_length(tvb); } -static guint +static unsigned get_e1ap_tcp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) { @@ -221,7 +225,7 @@ dissect_e1ap_tcp_pdu(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* static int dissect_e1ap_tcp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data) { - tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, + tcp_dissect_pdus(tvb, pinfo, tree, true, 4, get_e1ap_tcp_pdu_len, dissect_e1ap_tcp_pdu, data); return tvb_captured_length(tvb); } @@ -241,23 +245,23 @@ void proto_register_e1ap(void) { NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_NG_C, { "NG-C", "e1ap.InterfacesToTrace.NG_C", - FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x80, NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_Xn_C, { "Xn-C", "e1ap.InterfacesToTrace.Xn_C", - FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x40, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x40, NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_Uu, { "Uu", "e1ap.InterfacesToTrace.Uu", - FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x20, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x20, NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_F1_C, { "F1-C", "e1ap.InterfacesToTrace.F1_C", - FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x10, NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_E1, { "E1", "e1ap.InterfacesToTrace.E1", - FT_BOOLEAN, 8, TFS(&e1ap_tfs_InterfacesToTrace), 0x08, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x08, NULL, HFILL }}, { &hf_e1ap_InterfacesToTrace_Reserved, { "Reserved", "e1ap.InterfacesToTrace.Reserved", @@ -303,7 +307,7 @@ void proto_register_e1ap(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_e1ap, &ett_e1ap_PLMN_Identity, &ett_e1ap_TransportLayerAddress, diff --git a/epan/dissectors/asn1/e1ap/packet-e1ap-template.h b/epan/dissectors/asn1/e1ap/packet-e1ap-template.h index 40dbbc77..60753991 100644 --- a/epan/dissectors/asn1/e1ap/packet-e1ap-template.h +++ b/epan/dissectors/asn1/e1ap/packet-e1ap-template.h @@ -12,10 +12,10 @@ #define PACKET_E1AP_H typedef struct { - guint32 message_type; - guint32 ProcedureCode; - guint32 ProtocolIE_ID; - guint32 ProtocolExtensionID; + uint32_t message_type; + uint32_t ProcedureCode; + uint32_t ProtocolIE_ID; + uint32_t ProtocolExtensionID; } e1ap_ctx_t; |