Update to revission V12.2.0 (2014-06)

Remove soft deprecated APIs

Change-Id: I30adcb9f381c77142385c22fcc4a208169b0cf5e
Reviewed-on: https://code.wireshark.org/review/4062
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2014-09-10 16:30:41 +02:00 committed by Anders Broman
parent cc412a6cdf
commit 4567134a56
9 changed files with 899 additions and 194 deletions

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.5 Common Definitions
-- **************************************************************
--
@ -32,6 +32,3 @@ ProtocolIE-ID ::= INTEGER (0..65535)
TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -82,6 +82,7 @@ id-uplinkUEAssociatedLPPaTransport ProcedureCode ::= 45
id-downlinkNonUEAssociatedLPPaTransport ProcedureCode ::= 46
id-uplinkNonUEAssociatedLPPaTransport ProcedureCode ::= 47
id-UERadioCapabilityMatch ProcedureCode ::= 48
id-PWSRestartIndication ProcedureCode ::= 49
-- **************************************************************
--
@ -125,6 +126,9 @@ maxnoofMMECs INTEGER ::= 256
maxnoofCellIDforMDT INTEGER ::= 32
maxnoofTAforMDT INTEGER ::= 8
maxnoofMDTPLMNs INTEGER ::= 16
maxnoofCellsforRestart INTEGER ::= 256
maxnoofRestartTAIs INTEGER ::= 2048
maxnoofRestartEmergencyAreaIDs INTEGER ::= 256
-- **************************************************************
--
@ -227,8 +231,6 @@ id-Unknown-81 ProtocolIE-ID ::= 81
id-Unknown-82 ProtocolIE-ID ::= 82
id-cdma2000HOStatus ProtocolIE-ID ::= 83
id-cdma2000HORequiredIndication ProtocolIE-ID ::= 84
--WS extension
id-Unknown-85 ProtocolIE-ID ::= 85
id-E-UTRAN-Trace-ID ProtocolIE-ID ::= 86
id-RelativeMMECapacity ProtocolIE-ID ::= 87
id-SourceMME-UE-S1AP-ID ProtocolIE-ID ::= 88
@ -325,6 +327,17 @@ id-SignallingBasedMDTPLMNList ProtocolIE-ID ::= 178
id-ULCOUNTValueExtended ProtocolIE-ID ::= 179
id-DLCOUNTValueExtended ProtocolIE-ID ::= 180
id-ReceiveStatusOfULPDCPSDUsExtended ProtocolIE-ID ::= 181
id-ECGIListForRestart ProtocolIE-ID ::= 182
id-SIPTO-Correlation-ID ProtocolIE-ID ::= 183
id-SIPTO-L-GW-TransportLayerAddress ProtocolIE-ID ::= 184
id-TransportInformation ProtocolIE-ID ::= 185
id-LHN-ID ProtocolIE-ID ::= 186
id-AdditionalCSFallbackIndicator ProtocolIE-ID ::= 187
id-TAIListForRestart ProtocolIE-ID ::= 188
id-UserLocationInformation ProtocolIE-ID ::= 189
id-EmergencyAreaIDListForRestart ProtocolIE-ID ::= 190
id-KillAllWarningMessages ProtocolIE-ID ::= 191
id-Masked-IMEISV ProtocolIE-ID ::= 192
id-eNBIndirectX2TransportLayerAddresses ProtocolIE-ID ::= 193
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.7 Container Definitions
-- **************************************************************
--
@ -198,4 +198,3 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
}
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -33,6 +33,7 @@ IMPORTS
id-ULCOUNTValueExtended,
id-DLCOUNTValueExtended,
id-ReceiveStatusOfULPDCPSDUsExtended,
id-eNBIndirectX2TransportLayerAddresses,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -57,7 +58,10 @@ IMPORTS
maxnoofMMECs,
maxnoofTAforMDT,
maxnoofCellIDforMDT,
maxnoofMDTPLMNs
maxnoofMDTPLMNs,
maxnoofCellsforRestart,
maxnoofRestartTAIs,
maxnoofRestartEmergencyAreaIDs
@ -390,6 +394,12 @@ CSFallbackIndicator ::= ENUMERATED {
cs-fallback-high-priority
}
AdditionalCSFallbackIndicator ::= ENUMERATED {
no-restriction,
restriction,
...
}
CSG-Id ::= BIT STRING (SIZE (27))
@ -525,6 +535,8 @@ CompletedCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
EmergencyAreaIDListForRestart ::= SEQUENCE (SIZE(1..maxnoofRestartEmergencyAreaIDs)) OF EmergencyAreaID
ENB-ID ::= CHOICE {
macroENB-ID BIT STRING (SIZE(20)),
homeENB-ID BIT STRING (SIZE(28)),
@ -767,6 +779,8 @@ HFNModified ::= INTEGER (0..131071)
-- I
Masked-IMEISV ::= BIT STRING (SIZE (64))
ImmediateMDT ::= SEQUENCE {
measurementsToActivate MeasurementsToActivate,
m1reportingTrigger M1ReportingTrigger,
@ -796,6 +810,9 @@ InterfacesToTrace ::= BIT STRING (SIZE (8))
-- J
-- K
KillAllWarningMessages ::= ENUMERATED {true}
-- L
@ -843,6 +860,8 @@ L3-Information ::= OCTET STRING
LPPa-PDU ::= OCTET STRING
LHN-ID ::= OCTET STRING(SIZE (32..256))
Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
LoggedMDT ::= SEQUENCE {
@ -1110,7 +1129,8 @@ RIMInformation ::= OCTET STRING
RIMRoutingAddress ::= CHOICE {
gERAN-Cell-ID GERAN-Cell-ID,
...,
targetRNC-ID TargetRNC-ID
targetRNC-ID TargetRNC-ID,
eHRPD-Sector-ID OCTET STRING (SIZE(16))
}
ReportArea ::= ENUMERATED {
@ -1135,6 +1155,8 @@ RRC-Establishment-Cause ::= ENUMERATED {
delay-TolerantAccess
}
ECGIListForRestart ::= SEQUENCE (SIZE(1..maxnoofCellsforRestart)) OF EUTRAN-CGI
Routing-ID ::= INTEGER (0..255)
-- S
@ -1461,6 +1483,12 @@ Time-UE-StayedInCell ::= INTEGER (0..4095)
Time-UE-StayedInCell-EnhancedGranularity ::= INTEGER (0..40950)
TransportInformation ::= SEQUENCE {
transportLayerAddress TransportLayerAddress,
uL-GTP-TEID GTP-TEID,
...
}
TransportLayerAddress ::= BIT STRING (SIZE(1..160, ...))
TraceActivation ::= SEQUENCE {
@ -1509,6 +1537,8 @@ TypeOfError ::= ENUMERATED {
...
}
TAIListForRestart ::= SEQUENCE (SIZE(1..maxnoofRestartTAIs)) OF TAI
-- U
UEAggregateMaximumBitrate ::= SEQUENCE {
@ -1576,6 +1606,17 @@ UESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
UserLocationInformation ::= SEQUENCE {
eutran-cgi EUTRAN-CGI,
tai TAI,
iE-Extensions ProtocolExtensionContainer { { UserLocationInformation-ExtIEs} } OPTIONAL,
...
}
UserLocationInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
-- V
VoiceSupportMatchIndicator ::= ENUMERATED {
@ -1613,7 +1654,9 @@ X2TNLConfigurationInfo ::= SEQUENCE {
X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 10 to transfer the IPsec and U-plane addresses during ANR action --
{ID id-eNBX2ExtendedTransportLayerAddresses CRITICALITY ignore EXTENSION ENBX2ExtTLAs PRESENCE optional},
{ID id-eNBX2ExtendedTransportLayerAddresses CRITICALITY ignore EXTENSION ENBX2ExtTLAs PRESENCE optional}|
-- Extension for Release 12 to transfer the IP addresses of the X2 GW --
{ID id-eNBIndirectX2TransportLayerAddresses CRITICALITY ignore EXTENSION ENBIndirectX2TransportLayerAddresses PRESENCE optional},
...
}
@ -1632,9 +1675,9 @@ ENBX2ExtTLA-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
ENBX2GTPTLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2GTPTLAs)) OF TransportLayerAddress
ENBIndirectX2TransportLayerAddresses ::= SEQUENCE (SIZE(1..maxnoofeNBX2TLAs)) OF TransportLayerAddress
-- Y
-- Z
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -53,6 +53,7 @@ IMPORTS
GUMMEIType,
HandoverRestrictionList,
HandoverType,
Masked-IMEISV,
LAI,
LPPa-PDU,
ManagementBasedMDTAllowed,
@ -125,7 +126,15 @@ IMPORTS
GWContextReleaseIndication,
PrivacyIndicator,
VoiceSupportMatchIndicator,
TunnelInformation
TunnelInformation,
KillAllWarningMessages,
TransportInformation,
LHN-ID,
UserLocationInformation,
AdditionalCSFallbackIndicator,
ECGIListForRestart,
TAIListForRestart,
EmergencyAreaIDListForRestart
@ -176,6 +185,7 @@ FROM S1AP-Containers
id-GUMMEIType,
id-HandoverRestrictionList,
id-HandoverType,
id-Masked-IMEISV,
id-InitialContextSetup,
id-Inter-SystemInformationTransferTypeEDT,
id-Inter-SystemInformationTransferTypeMDT,
@ -302,7 +312,17 @@ FROM S1AP-Containers
id-GWContextReleaseIndication,
id-PrivacyIndicator,
id-VoiceSupportMatchIndicator,
id-Tunnel-Information-for-BBF
id-Tunnel-Information-for-BBF,
id-SIPTO-Correlation-ID,
id-SIPTO-L-GW-TransportLayerAddress,
id-KillAllWarningMessages,
id-TransportInformation,
id-LHN-ID,
id-UserLocationInformation,
id-AdditionalCSFallbackIndicator,
id-ECGIListForRestart,
id-TAIListForRestart,
id-EmergencyAreaIDListForRestart
FROM S1AP-Constants;
@ -438,26 +458,27 @@ HandoverRequest ::= SEQUENCE {
}
HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-uEaggregateMaximumBitrate CRITICALITY reject TYPE UEAggregateMaximumBitrate PRESENCE mandatory }|
{ ID id-E-RABToBeSetupListHOReq CRITICALITY reject TYPE E-RABToBeSetupListHOReq PRESENCE mandatory }|
{ ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE mandatory }|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE mandatory }|
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional }|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
{ ID id-RequestType CRITICALITY ignore TYPE RequestType PRESENCE optional }|
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional }|
{ ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE mandatory }|
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-uEaggregateMaximumBitrate CRITICALITY reject TYPE UEAggregateMaximumBitrate PRESENCE mandatory}|
{ ID id-E-RABToBeSetupListHOReq CRITICALITY reject TYPE E-RABToBeSetupListHOReq PRESENCE mandatory}|
{ ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE mandatory}|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE mandatory}|
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional}|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional}|
{ ID id-RequestType CRITICALITY ignore TYPE RequestType PRESENCE optional}|
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
{ ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE mandatory}|
{ ID id-NASSecurityParameterstoE-UTRAN CRITICALITY reject TYPE NASSecurityParameterstoE-UTRAN PRESENCE conditional
-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" -- }|
{ ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional }|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional }|
{ ID id-GUMMEI-ID CRITICALITY ignore TYPE GUMMEI PRESENCE optional }|
{ ID id-MME-UE-S1AP-ID-2 CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional }|
{ ID id-ManagementBasedMDTAllowed CRITICALITY ignore TYPE ManagementBasedMDTAllowed PRESENCE optional }|
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional },
-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" -- }|
{ ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional}|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}|
{ ID id-GUMMEI-ID CRITICALITY ignore TYPE GUMMEI PRESENCE optional}|
{ ID id-MME-UE-S1AP-ID-2 CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional}|
{ ID id-ManagementBasedMDTAllowed CRITICALITY ignore TYPE ManagementBasedMDTAllowed PRESENCE optional}|
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional}|
{ ID id-Masked-IMEISV CRITICALITY ignore TYPE Masked-IMEISV PRESENCE optional},
...
}
@ -583,12 +604,13 @@ HandoverNotify ::= SEQUENCE {
}
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 }|
{ 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 --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional },
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional},
...
}
@ -610,18 +632,19 @@ PathSwitchRequest ::= SEQUENCE {
}
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 }|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory }|
{ ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory }|
{ ID id-UESecurityCapabilities CRITICALITY ignore TYPE UESecurityCapabilities PRESENCE mandatory }|
{ ID id-CSG-Id CRITICALITY ignore TYPE CSG-Id PRESENCE optional }|
{ 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 }|
{ 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}|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory}|
{ ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory}|
{ ID id-UESecurityCapabilities CRITICALITY ignore TYPE UESecurityCapabilities PRESENCE mandatory}|
{ ID id-CSG-Id CRITICALITY ignore TYPE CSG-Id PRESENCE optional}|
{ 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 --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional },
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional},
...
}
@ -793,7 +816,8 @@ E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional},
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-SIPTO-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional},
...
}
@ -883,6 +907,7 @@ E-RABToBeModifiedItemBearerModReq ::= SEQUENCE {
E-RABToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-TransportInformation CRITICALITY reject EXTENSION TransportInformation PRESENCE optional},
...
}
@ -973,7 +998,9 @@ E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ 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 },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}
@ -1018,7 +1045,9 @@ E-RABReleaseIndication ::= SEQUENCE {
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 },
{ ID id-E-RABReleasedList CRITICALITY ignore TYPE E-RABList PRESENCE mandatory }|
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}
-- **************************************************************
@ -1039,24 +1068,26 @@ InitialContextSetupRequest ::= SEQUENCE {
}
InitialContextSetupRequestIEs 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-uEaggregateMaximumBitrate CRITICALITY reject TYPE UEAggregateMaximumBitrate PRESENCE mandatory }|
{ ID id-E-RABToBeSetupListCtxtSUReq CRITICALITY reject TYPE E-RABToBeSetupListCtxtSUReq PRESENCE mandatory }|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE mandatory }|
{ ID id-SecurityKey CRITICALITY reject TYPE SecurityKey PRESENCE mandatory }|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional }|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional }|
{ ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional }|
{ ID id-CSFallbackIndicator CRITICALITY reject TYPE CSFallbackIndicator PRESENCE optional }|
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional }|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional }|
{ ID id-RegisteredLAI CRITICALITY ignore TYPE LAI PRESENCE optional }|
{ ID id-GUMMEI-ID CRITICALITY ignore TYPE GUMMEI PRESENCE optional }|
{ ID id-MME-UE-S1AP-ID-2 CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional }|
{ ID id-ManagementBasedMDTAllowed CRITICALITY ignore TYPE ManagementBasedMDTAllowed PRESENCE optional }|
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional },
{ 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-uEaggregateMaximumBitrate CRITICALITY reject TYPE UEAggregateMaximumBitrate PRESENCE mandatory}|
{ ID id-E-RABToBeSetupListCtxtSUReq CRITICALITY reject TYPE E-RABToBeSetupListCtxtSUReq PRESENCE mandatory}|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE mandatory}|
{ ID id-SecurityKey CRITICALITY reject TYPE SecurityKey PRESENCE mandatory}|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional}|
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional}|
{ ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional}|
{ ID id-CSFallbackIndicator CRITICALITY reject TYPE CSFallbackIndicator PRESENCE optional}|
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}|
{ ID id-RegisteredLAI CRITICALITY ignore TYPE LAI PRESENCE optional}|
{ ID id-GUMMEI-ID CRITICALITY ignore TYPE GUMMEI PRESENCE optional}|
{ ID id-MME-UE-S1AP-ID-2 CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional}|
{ ID id-ManagementBasedMDTAllowed CRITICALITY ignore TYPE ManagementBasedMDTAllowed PRESENCE optional}|
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional}|
{ ID id-AdditionalCSFallbackIndicator CRITICALITY ignore TYPE AdditionalCSFallbackIndicator PRESENCE conditional}|
{ ID id-Masked-IMEISV CRITICALITY ignore TYPE Masked-IMEISV PRESENCE optional},
...
}
@ -1082,7 +1113,8 @@ E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional },
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-SIPTO-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional},
...
}
@ -1251,7 +1283,9 @@ UEContextReleaseComplete ::= SEQUENCE {
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 },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}
@ -1274,15 +1308,16 @@ UEContextModificationRequest ::= SEQUENCE {
}
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 }|
{ ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional }|
{ ID id-uEaggregateMaximumBitrate CRITICALITY ignore TYPE UEAggregateMaximumBitrate PRESENCE optional }|
{ ID id-CSFallbackIndicator CRITICALITY reject TYPE CSFallbackIndicator PRESENCE optional }|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE optional }|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional }|
{ ID id-RegisteredLAI CRITICALITY ignore TYPE LAI PRESENCE optional },
{ 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}|
{ ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional}|
{ ID id-uEaggregateMaximumBitrate CRITICALITY ignore TYPE UEAggregateMaximumBitrate PRESENCE optional}|
{ ID id-CSFallbackIndicator CRITICALITY reject TYPE CSFallbackIndicator PRESENCE optional}|
{ ID id-UESecurityCapabilities CRITICALITY reject TYPE UESecurityCapabilities PRESENCE optional}|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}|
{ ID id-RegisteredLAI CRITICALITY ignore TYPE LAI PRESENCE optional}|
{ ID id-AdditionalCSFallbackIndicator CRITICALITY ignore TYPE AdditionalCSFallbackIndicator PRESENCE conditional},
...
}
-- **************************************************************
@ -1403,20 +1438,22 @@ InitialUEMessage ::= SEQUENCE {
}
InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory }|
{ ID id-TAI CRITICALITY reject TYPE TAI PRESENCE mandatory }|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory }|
{ ID id-RRC-Establishment-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE mandatory }|
{ ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE optional }|
{ ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional }|
{ ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE optional }|
{ ID id-CellAccessMode CRITICALITY reject TYPE CellAccessMode PRESENCE optional }|
{ 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 }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory}|
{ ID id-TAI CRITICALITY reject TYPE TAI PRESENCE mandatory}|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory}|
{ ID id-RRC-Establishment-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE mandatory}|
{ ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE optional}|
{ ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional}|
{ ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE optional}|
{ ID id-CellAccessMode CRITICALITY reject TYPE CellAccessMode PRESENCE optional}|
{ 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 --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional },
{ 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},
...
}
@ -1433,12 +1470,14 @@ UplinkNASTransport ::= SEQUENCE {
}
UplinkNASTransport-IEs 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-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory }|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory }|
{ ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory }|
{ ID id-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE optional },
{ 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-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory}|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory}|
{ ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory}|
{ ID id-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress 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},
...
}
-- **************************************************************
@ -2247,9 +2286,10 @@ KillRequest ::= SEQUENCE {
}
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 },
{ 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}|
{ ID id-KillAllWarningMessages CRITICALITY reject TYPE KillAllWarningMessages PRESENCE optional},
...
}
@ -2272,6 +2312,25 @@ KillResponseIEs S1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- PWS Restart Indication
--
-- **************************************************************
PWSRestartIndication::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ PWSRestartIndicationIEs}},
...
}
PWSRestartIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-ECGIListForRestart CRITICALITY reject TYPE ECGIListForRestart PRESENCE mandatory}|
{ ID id-Global-ENB-ID CRITICALITY reject TYPE Global-ENB-ID PRESENCE mandatory}|
{ ID id-TAIListForRestart CRITICALITY reject TYPE TAIListForRestart PRESENCE mandatory}|
{ ID id-EmergencyAreaIDListForRestart CRITICALITY reject TYPE EmergencyAreaIDListForRestart PRESENCE optional},
...
}
-- **************************************************************
--
-- LPPA TRANSPORT ELEMENTARY PROCEDURES
@ -2351,5 +2410,3 @@ UplinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
}
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@ -98,7 +98,8 @@ FROM S1AP-CommonDataTypes
WriteReplaceWarningRequest,
WriteReplaceWarningResponse,
ENBConfigurationTransfer,
MMEConfigurationTransfer
MMEConfigurationTransfer,
PWSRestartIndication
FROM S1AP-PDU-Contents
@ -151,7 +152,8 @@ FROM S1AP-PDU-Contents
id-UplinkS1cdma2000tunneling,
id-WriteReplaceWarning,
id-eNBConfigurationTransfer,
id-MMEConfigurationTransfer
id-MMEConfigurationTransfer,
id-PWSRestartIndication
FROM S1AP-Constants;
@ -274,7 +276,8 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
downlinkUEAssociatedLPPaTransport |
uplinkUEAssociatedLPPaTransport |
downlinkNonUEAssociatedLPPaTransport |
uplinkNonUEAssociatedLPPaTransport
uplinkNonUEAssociatedLPPaTransport |
pWSRestartIndication
}
-- **************************************************************
@ -563,6 +566,12 @@ privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY ignore
}
pWSRestartIndication S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE PWSRestartIndication
PROCEDURE CODE id-PWSRestartIndication
CRITICALITY ignore
}
kill S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE KillRequest
SUCCESSFUL OUTCOME KillResponse
@ -601,5 +610,3 @@ uERadioCapabilityMatch S1AP-ELEMENTARY-PROCEDURE ::= {
}
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V11.6.0 (2013-12)
-- 3GPP TS 36.413 V12.2.0 (2014-06)
-- B.2 ASN.1 definition
-- **************************************************************
--
@ -106,7 +106,8 @@ CellLoadReportingResponse::= CHOICE{
eUTRAN EUTRANcellLoadReportingResponse,
uTRAN OCTET STRING,
gERAN OCTET STRING,
...
...,
eHRPD EHRPDSectorLoadReportingResponse
}
CompositeAvailableCapacityGroup ::= OCTET STRING
@ -126,11 +127,14 @@ EUTRANResponse::= SEQUENCE {
...
}
EHRPD-Sector-ID ::= OCTET STRING (SIZE (16))
IRAT-Cell-ID ::= CHOICE{
eUTRAN OCTET STRING,
uTRAN OCTET STRING,
gERAN OCTET STRING,
...
...,
eHRPD EHRPD-Sector-ID
}
RequestedCellList ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF IRAT-Cell-ID
@ -153,7 +157,8 @@ MultiCellLoadReportingResponse-Item ::= CHOICE{
eUTRANResponse EUTRANResponse,
uTRANResponse OCTET STRING,
gERANResponse OCTET STRING,
...
...,
eHRPD EHRPDMultiSectorLoadReportingResponseItem
}
@ -282,6 +287,33 @@ TooEarlyInterRATHOReportReportFromEUTRAN ::= SEQUENCE {
--MobilityInformation ::= BIT STRING (SIZE(32))
--
-- IEs for reporting of eHRPD load
--
EHRPDCapacityValue ::= INTEGER (0..100)
EHRPDSectorCapacityClassValue ::= INTEGER (1..100, ...)
EHRPDSectorLoadReportingResponse ::= SEQUENCE {
dL-EHRPD-CompositeAvailableCapacity EHRPDCompositeAvailableCapacity,
uL-EHRPD-CompositeAvailableCapacity EHRPDCompositeAvailableCapacity,
...
}
EHRPDCompositeAvailableCapacity ::= SEQUENCE {
eHRPDSectorCapacityClassValue EHRPDSectorCapacityClassValue,
eHRPDCapacityValue EHRPDCapacityValue,
...
}
EHRPDMultiSectorLoadReportingResponseItem ::= SEQUENCE {
eHRPD-Sector-ID EHRPD-Sector-ID,
eHRPDSectorLoadReportingResponse EHRPDSectorLoadReportingResponse,
...
}
-- **************************************************************
--
-- Constants
@ -294,3 +326,4 @@ maxnoofCellineNB INTEGER ::= 256
END

View File

@ -194,7 +194,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 3, FALSE, &parameter_tvb);
if(tvb_length(tvb)==0)
if(tvb_reported_length(tvb)==0)
return offset;
if (!parameter_tvb)
@ -213,7 +213,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
if (!parameter_tvb)
return offset;
length = tvb_length(parameter_tvb);
length = tvb_reported_length(parameter_tvb);
is_ascii = TRUE;
for (p_offset=0; p_offset < length; p_offset++){
@ -234,7 +234,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
%(DEFAULT_BODY)s
if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
if ((tvb_reported_length(parameter_tvb)>0)&&(nas_eps_handle))
call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree);
#.FN_BODY LPPa-PDU VAL_PTR = &parameter_tvb
@ -243,7 +243,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
%(DEFAULT_BODY)s
if ((tvb_length(parameter_tvb)>0)&&(lppa_handle))
if ((tvb_reported_length(parameter_tvb)>0)&&(lppa_handle))
call_dissector(lppa_handle, parameter_tvb, %(ACTX)s->pinfo, tree);
#.FN_BODY TransportLayerAddress VAL_PTR = &parameter_tvb
@ -259,7 +259,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
# a) 32 bits in case of IPv4 address according to [6]; and
# b) 128 bits in case of IPv6 address according to [5].
/* Get the length */
tvb_len = tvb_length(parameter_tvb);
tvb_len = tvb_reported_length(parameter_tvb);
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_TransportLayerAddress);
if (tvb_len==4){
/* IPv4 */
@ -338,7 +338,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
Source BSS to Target BSS
Transparent Container 48.018
*/
de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0);
break;
case 3:
/* utrantolte */
@ -392,7 +392,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
Target BSS to Source BSS
Transparent Container 48.018
*/
de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0);
break;
case 3:
@ -496,7 +496,7 @@ if (g_s1ap_dissect_container) {
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RIMInformation);
if ((tvb_length(parameter_tvb)>0)&&(bssgp_handle)){
if ((tvb_reported_length(parameter_tvb)>0)&&(bssgp_handle)){
col_set_fence(%(ACTX)s->pinfo->cinfo, COL_INFO);
call_dissector(bssgp_handle,parameter_tvb,%(ACTX)s->pinfo, subtree);
}
@ -557,6 +557,7 @@ id-uplinkUEAssociatedLPPaTransport ProcedureCode
id-downlinkNonUEAssociatedLPPaTransport ProcedureCode
id-uplinkNonUEAssociatedLPPaTransport ProcedureCode
id-UERadioCapabilityMatch ProcedureCode
id-PWSRestartIndication ProcedureCode
# ProtocolIE-ID
id-MME-UE-S1AP-ID ProtocolIE-ID
@ -724,6 +725,19 @@ id-SignallingBasedMDTPLMNList ProtocolIE-ID
id-ULCOUNTValueExtended ProtocolIE-ID
id-DLCOUNTValueExtended ProtocolIE-ID
id-ReceiveStatusOfULPDCPSDUsExtended ProtocolIE-ID
id-ECGIListForRestart ProtocolIE-ID
id-SIPTO-Correlation-ID ProtocolIE-ID
id-SIPTO-L-GW-TransportLayerAddress ProtocolIE-ID
id-TransportInformation ProtocolIE-ID
id-LHN-ID ProtocolIE-ID
id-AdditionalCSFallbackIndicator ProtocolIE-ID
id-TAIListForRestart ProtocolIE-ID
id-UserLocationInformation ProtocolIE-ID
id-EmergencyAreaIDListForRestart ProtocolIE-ID
id-KillAllWarningMessages ProtocolIE-ID
id-Masked-IMEISV ProtocolIE-ID
id-eNBIndirectX2TransportLayerAddresses ProtocolIE-ID
#.END
#.REGISTER_NEW
@ -874,6 +888,14 @@ VoiceSupportMatchIndicator N s1ap.ies id-VoiceSupportMatchIndicator
GUMMEIType N s1ap.ies id-GUMMEIType
TunnelInformation N s1ap.ies id-Tunnel-Information-for-BBF
MDTPLMNList N s1ap.ies id-ManagementBasedMDTPLMNList
ECGIListForRestart N s1ap.ies id-ECGIListForRestart
TransportLayerAddress N s1ap.ies id-SIPTO-L-GW-TransportLayerAddress
LHN-ID N s1ap.ies id-LHN-ID
AdditionalCSFallbackIndicator N s1ap.ies id-AdditionalCSFallbackIndicator
TAIListForRestart N s1ap.ies id-TAIListForRestart
UserLocationInformation N s1ap.ies id-UserLocationInformation
KillAllWarningMessages N s1ap.ies id-KillAllWarningMessages
Masked-IMEISV N s1ap.ies id-Masked-IMEISV
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -899,6 +921,10 @@ MDTPLMNList N s1ap.extension id-SignallingBasedMDTPLMNList
COUNTValueExtended N s1ap.extension id-ULCOUNTValueExtended
COUNTValueExtended N s1ap.extension id-DLCOUNTValueExtended
ReceiveStatusOfULPDCPSDUsExtended N s1ap.extension id-ReceiveStatusOfULPDCPSDUsExtended
Correlation-ID N s1ap.extension id-SIPTO-Correlation-ID
TransportInformation N s1ap.extension id-TransportInformation
EmergencyAreaIDListForRestart N s1ap.extension id-EmergencyAreaIDListForRestart
ENBIndirectX2TransportLayerAddresses N s1ap.extension id-eNBIndirectX2TransportLayerAddresses
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation
@ -1024,6 +1050,8 @@ UplinkNonUEAssociatedLPPaTransport N s1ap.proc.imsg id-uplinkNonUEAssociatedLPP
UERadioCapabilityMatchRequest N s1ap.proc.imsg id-UERadioCapabilityMatch
UERadioCapabilityMatchResponse N s1ap.proc.sout id-UERadioCapabilityMatch
PWSRestartIndication N s1ap.proc.imsg id-PWSRestartIndication
#.FN_HDR E-RABSetupRequest
col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupRequest ");
#.FN_HDR E-RABSetupResponse

File diff suppressed because it is too large Load Diff