diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-09 23:37:46 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-10 07:47:48 +0000 |
commit | d6f91a7ca421caa7787c1539bca61f943923fa9c (patch) | |
tree | 46223e64eb893a1e1f1e00255444a3b13dc8f91a /epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn | |
parent | 4a6dde12d6fe6af05b05d4c06b10056f6508711a (diff) |
S1AP: prettify dissection
Change-Id: I2b4339e489d11ade2751cad8874ba220d12fe3db
Reviewed-on: https://code.wireshark.org/review/17615
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn')
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn | 85 |
1 files changed, 45 insertions, 40 deletions
diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn index 94fe190cdc..14e3a0dbfb 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn @@ -6,11 +6,11 @@ -- -- ************************************************************** -S1AP-PDU-Contents { -itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) +S1AP-PDU-Contents { +itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Contents (1) } -DEFINITIONS AUTOMATIC TAGS ::= +DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -21,7 +21,7 @@ BEGIN -- ************************************************************** IMPORTS - + UEAggregateMaximumBitrate, BearerType, Cause, @@ -39,7 +39,7 @@ IMPORTS CriticalityDiagnostics, CSFallbackIndicator, CSG-Id, - CSG-IdList, + CSG-IdList, CSGMembershipStatus, Data-Forwarding-Not-Possible, Direct-Forwarding-Path-Availability, @@ -94,7 +94,7 @@ IMPORTS SupportedTAs, TAI, Target-ToSource-TransparentContainer, - TargetBSS-ToSourceBSS-TransparentContainer, + TargetBSS-ToSourceBSS-TransparentContainer, TargeteNB-ToSourceeNB-TransparentContainer, TargetID, TargetRNC-ToSourceRNC-TransparentContainer, @@ -199,7 +199,7 @@ FROM S1AP-Containers id-EUTRAN-CGI, id-eNBname, id-eNB-StatusTransfer-TransparentContainer, - id-eNB-UE-S1AP-ID, + id-eNB-UE-S1AP-ID, id-GERANtoLTEHOInformationRes, id-GUMMEI-ID, id-GUMMEIType, @@ -263,7 +263,7 @@ FROM S1AP-Containers id-E-RABNotToBeModifiedItemBearerModInd, id-E-RABModifyListBearerModConf, id-E-RABModifyItemBearerModConf, - id-E-RABFailedToModifyListBearerModConf, + id-E-RABFailedToModifyListBearerModConf, id-E-RABToBeReleasedListBearerModConf, id-E-RABToBeReleasedList, id-E-RABReleasedList, @@ -403,7 +403,7 @@ HandoverRequired ::= SEQUENCE { ... } -HandoverRequiredIEs S1AP-PROTOCOL-IES ::= { +HandoverRequiredIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory}| @@ -433,7 +433,7 @@ HandoverCommand ::= SEQUENCE { ... } -HandoverCommandIEs S1AP-PROTOCOL-IES ::= { +HandoverCommandIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory}| @@ -481,7 +481,7 @@ HandoverPreparationFailure ::= SEQUENCE { ... } -HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= { +HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| @@ -567,7 +567,7 @@ HandoverRequestAcknowledge ::= SEQUENCE { ... } -HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= { +HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-E-RABAdmittedList CRITICALITY ignore TYPE E-RABAdmittedList PRESENCE mandatory }| @@ -632,7 +632,7 @@ HandoverFailure ::= SEQUENCE { ... } -HandoverFailureIEs S1AP-PROTOCOL-IES ::= { +HandoverFailureIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, @@ -656,12 +656,12 @@ HandoverNotify ::= SEQUENCE { ... } -HandoverNotifyIEs S1AP-PROTOCOL-IES ::= { +HandoverNotifyIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory}| { ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory}| --- Extension for Release 11 to support BBAI -- +-- Extension for Release 11 to support BBAI -- { ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}| { ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}, ... @@ -684,7 +684,7 @@ PathSwitchRequest ::= SEQUENCE { ... } -PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= { +PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-E-RABToBeSwitchedDLList CRITICALITY reject TYPE E-RABToBeSwitchedDLList PRESENCE mandatory}| { ID id-SourceMME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}| @@ -695,7 +695,7 @@ PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-CellAccessMode CRITICALITY ignore TYPE CellAccessMode PRESENCE optional}| { ID id-SourceMME-GUMMEI CRITICALITY ignore TYPE GUMMEI PRESENCE optional}| { ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}| --- Extension for Release 11 to support BBAI -- +-- Extension for Release 11 to support BBAI -- { ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}| { ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}, ... @@ -731,7 +731,7 @@ PathSwitchRequestAcknowledge ::= SEQUENCE { ... } -PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= { +PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-uEaggregateMaximumBitrate CRITICALITY ignore TYPE UEAggregateMaximumBitrate PRESENCE optional}| @@ -777,7 +777,7 @@ PathSwitchRequestFailure ::= SEQUENCE { ... } -PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= { +PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| @@ -802,7 +802,7 @@ HandoverCancel ::= SEQUENCE { ... } -HandoverCancelIEs S1AP-PROTOCOL-IES ::= { +HandoverCancelIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }, @@ -820,7 +820,7 @@ HandoverCancelAcknowledge ::= SEQUENCE { ... } -HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= { +HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, @@ -1055,7 +1055,7 @@ E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= { { ID id-E-RABReleaseListBearerRelComp CRITICALITY ignore TYPE E-RABReleaseListBearerRelComp PRESENCE optional }| { ID id-E-RABFailedToReleaseList CRITICALITY ignore TYPE E-RABList PRESENCE optional }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| --- Extension for Release 12 to support User Location Information -- +-- Extension for Release 12 to support User Location Information -- { ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }, ... } @@ -1102,7 +1102,7 @@ E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-E-RABReleasedList CRITICALITY ignore TYPE E-RABList PRESENCE mandatory }| --- Extension for Release 12 to support User Location Information -- +-- Extension for Release 12 to support User Location Information -- { ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }, ... } @@ -1350,7 +1350,7 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}| --- Extension for Release 12 to support User Location Information -- +-- Extension for Release 12 to support User Location Information -- { ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional}| -- Extension for Release 13 to support Paging Optimisation { ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}| @@ -1377,7 +1377,7 @@ UEContextModificationRequest ::= SEQUENCE { ... } -UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= { +UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-SecurityKey CRITICALITY reject TYPE SecurityKey PRESENCE optional}| @@ -1402,7 +1402,7 @@ UEContextModificationResponse ::= SEQUENCE { ... } -UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= { +UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, @@ -1419,7 +1419,7 @@ UEContextModificationFailure ::= SEQUENCE { ... } -UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= { +UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }| @@ -1444,7 +1444,7 @@ UERadioCapabilityMatchRequest ::= SEQUENCE { ... } -UERadioCapabilityMatchRequestIEs S1AP-PROTOCOL-IES ::= { +UERadioCapabilityMatchRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional }, @@ -1462,7 +1462,7 @@ UERadioCapabilityMatchResponse ::= SEQUENCE { ... } -UERadioCapabilityMatchResponseIEs S1AP-PROTOCOL-IES ::= { +UERadioCapabilityMatchResponseIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-VoiceSupportMatchIndicator CRITICALITY reject TYPE VoiceSupportMatchIndicator PRESENCE mandatory }| @@ -1523,7 +1523,7 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= { { ID id-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE optional}| { ID id-RelayNode-Indicator CRITICALITY reject TYPE RelayNode-Indicator PRESENCE optional}| { ID id-GUMMEIType CRITICALITY ignore TYPE GUMMEIType PRESENCE optional}| --- Extension for Release 11 to support BBAI -- +-- Extension for Release 11 to support BBAI -- { ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}| { ID id-SIPTO-L-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE optional}| { ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}| @@ -1585,10 +1585,15 @@ RerouteNASRequest ::= SEQUENCE { ... } +-- WS modification, add a definition for S1 Message +S1-Message ::= OCTET STRING + RerouteNASRequest-IEs S1AP-PROTOCOL-IES ::= { { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional}| - { ID id-S1-Message CRITICALITY reject TYPE OCTET STRING PRESENCE mandatory}| +-- WS modification, add a definition for S1 Message +-- { ID id-S1-Message CRITICALITY reject TYPE OCTET STRING PRESENCE mandatory}| + { ID id-S1-Message CRITICALITY reject TYPE S1-Message PRESENCE mandatory}| { ID id-MME-Group-ID CRITICALITY reject TYPE MME-Group-ID PRESENCE mandatory}| { ID id-Additional-GUTI CRITICALITY ignore TYPE Additional-GUTI PRESENCE optional}| { ID id-UE-Usage-Type CRITICALITY ignore TYPE UE-Usage-Type PRESENCE optional}, @@ -1764,7 +1769,7 @@ S1SetupFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- eNB Configuration Update +-- eNB Configuration Update -- -- ************************************************************** @@ -1826,7 +1831,7 @@ ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- MME Configuration Update +-- MME Configuration Update -- -- ************************************************************** @@ -2148,7 +2153,7 @@ LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- Location Report +-- Location Report -- -- ************************************************************** @@ -2183,7 +2188,7 @@ OverloadStart ::= SEQUENCE { ... } -OverloadStartIEs S1AP-PROTOCOL-IES ::= { +OverloadStartIEs S1AP-PROTOCOL-IES ::= { { ID id-OverloadResponse CRITICALITY reject TYPE OverloadResponse PRESENCE mandatory }| { ID id-GUMMEIList CRITICALITY ignore TYPE GUMMEIList PRESENCE optional }| { ID id-TrafficLoadReductionIndication CRITICALITY ignore TYPE TrafficLoadReductionIndication PRESENCE optional }, @@ -2200,13 +2205,13 @@ OverloadStop ::= SEQUENCE { ... } -OverloadStopIEs S1AP-PROTOCOL-IES ::= { +OverloadStopIEs S1AP-PROTOCOL-IES ::= { { ID id-GUMMEIList CRITICALITY ignore TYPE GUMMEIList PRESENCE optional }, ... } -- ************************************************************** -- --- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE +-- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -2222,7 +2227,7 @@ WriteReplaceWarningRequest ::= SEQUENCE { ... } -WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= { +WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| { ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional }| @@ -2386,7 +2391,7 @@ KillRequest ::= SEQUENCE { ... } -KillRequestIEs S1AP-PROTOCOL-IES ::= { +KillRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory}| { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory}| { ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional}| @@ -2557,7 +2562,7 @@ E-RABModificationIndicationIEs S1AP-PROTOCOL-IES ::= { { ID id-E-RABToBeModifiedListBearerModInd CRITICALITY reject TYPE E-RABToBeModifiedListBearerModInd PRESENCE mandatory}| { ID id-E-RABNotToBeModifiedListBearerModInd CRITICALITY reject TYPE E-RABNotToBeModifiedListBearerModInd PRESENCE optional}| { ID id-CSGMembershipInfo CRITICALITY reject TYPE CSGMembershipInfo PRESENCE optional}| --- Extension for Release 11 to support BBAI -- +-- Extension for Release 11 to support BBAI -- { ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}, ... } |