osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

S1AP: upgrade dissector to v15.0.0 

Change-Id: I2c2a0f8093678769427ff4303ad41a5c97bdd05c
Reviewed-on: https://code.wireshark.org/review/25379
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2018-01-18 22:37:39 +01:00 committed by Anders Broman
parent 0870d4665d
commit ecced16299
10 changed files with 1424 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.5 Common Definitions
-- **************************************************************
--

24
epan/dissectors/asn1/s1ap/S1AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -95,6 +95,7 @@ id-RetrieveUEInformation ProcedureCode ::= 58
id-UEInformationTransfer ProcedureCode ::= 59
id-eNBCPRelocationIndication ProcedureCode ::= 60
id-MMECPRelocationIndication ProcedureCode ::= 61
id-SecondaryRATReport ProcedureCode ::= 62
-- **************************************************************
--
@ -147,6 +148,12 @@ maxEARFCN INTEGER ::= 262143
maxnoofMBSFNAreaMDT INTEGER ::= 8
maxnoofRecommendedCells INTEGER ::= 16
maxnoofRecommendedENBs INTEGER ::= 16
maxnooftimeperiods INTEGER ::= 2
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofTAforQMC INTEGER ::= 8
maxnoofPLMNforQMC INTEGER ::= 16
-- **************************************************************
--
@ -421,5 +428,20 @@ id-EnhancedCoverageRestricted ProtocolIE-ID ::= 251
id-UE-Level-QoS-Parameters ProtocolIE-ID ::= 252
id-DL-CP-SecurityInformation ProtocolIE-ID ::= 253
id-UL-CP-SecurityInformation ProtocolIE-ID ::= 254
id-extended-e-RAB-MaximumBitrateDL ProtocolIE-ID ::= 255
id-extended-e-RAB-MaximumBitrateUL ProtocolIE-ID ::= 256
id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID ::= 257
id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID ::= 258
id-extended-uEaggregateMaximumBitRateDL ProtocolIE-ID ::= 259
id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID ::= 260
id-NRrestriction ProtocolIE-ID ::= 261
id-UEAppLayerMeasConfig ProtocolIE-ID ::= 262
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID ::= 263
id-SecondaryRATusageReportList ProtocolIE-ID ::= 264
id-SecondaryRATusageReportItem ProtocolIE-ID ::= 265
id-HandoverFlag ProtocolIE-ID ::= 266
id-E-RABUsageReportItem ProtocolIE-ID ::= 267
id-SecondaryRATusageDataRequst ProtocolIE-ID ::= 268
id-NRUESecurityCapabilities ProtocolIE-ID ::= 269
END

2
epan/dissectors/asn1/s1ap/S1AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.7 Container Definitions
-- **************************************************************
--

185
epan/dissectors/asn1/s1ap/S1AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -36,6 +36,7 @@ IMPORTS
id-eNBIndirectX2TransportLayerAddresses,
id-Muting-Availability-Indication,
id-Muting-Pattern-Information,
id-NRrestriction,
id-Synchronisation-Information,
id-uE-HistoryInformationFromTheUE,
id-LoggedMBSFNMDT,
@ -49,6 +50,15 @@ IMPORTS
id-M6Configuration,
id-M7Configuration,
id-RAT-Type,
id-extended-e-RAB-MaximumBitrateDL,
id-extended-e-RAB-MaximumBitrateUL,
id-extended-e-RAB-GuaranteedBitrateDL,
id-extended-e-RAB-GuaranteedBitrateUL,
id-extended-uEaggregateMaximumBitRateDL,
id-extended-uEaggregateMaximumBitRateUL,
id-SecondaryRATusageReportItem,
id-E-RABUsageReportItem,
id-UEAppLayerMeasConfig,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -82,7 +92,11 @@ IMPORTS
maxEARFCN,
maxnoofCellsineNB,
maxnoofRecommendedCells,
maxnoofRecommendedENBs
maxnoofRecommendedENBs,
maxnooftimeperiods,
maxnoofCellIDforQMC,
maxnoofTAforQMC,
maxnoofPLMNforQMC
@ -122,6 +136,15 @@ AreaScopeOfMDT ::= CHOICE {
tAIBased TAIBasedMDT
}
AreaScopeOfQMC ::= CHOICE {
cellBased CellBasedQMC,
tABased TABasedQMC,
tAIBased TAIBasedQMC,
pLMNAreaBased PLMNAreaBasedQMC,
...
}
AllocationAndRetentionPriority ::= SEQUENCE {
priorityLevel PriorityLevel,
pre-emptionCapability Pre-emptionCapability,
@ -399,6 +422,18 @@ CellBasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
CellIdListforMDT ::= SEQUENCE (SIZE(1..maxnoofCellIDforMDT)) OF EUTRAN-CGI
CellBasedQMC::= SEQUENCE {
cellIdListforQMC CellIdListforQMC,
iE-Extensions ProtocolExtensionContainer { {CellBasedQMC-ExtIEs} } OPTIONAL,
...
}
CellBasedQMC-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
CellIdListforQMC ::= SEQUENCE (SIZE(1..maxnoofCellIDforQMC)) OF EUTRAN-CGI
Cdma2000PDU ::= OCTET STRING
Cdma2000RATType ::= ENUMERATED {
@ -793,6 +828,26 @@ E-RABLevelQoSParameters ::= SEQUENCE {
...
}
E-RABUsageReportList ::= SEQUENCE (SIZE(1..maxnooftimeperiods)) OF ProtocolIE-SingleContainer { {E-RABUsageReportItemIEs} }
E-RABUsageReportItemIEs S1AP-PROTOCOL-IES ::= {
{ ID id-E-RABUsageReportItem CRITICALITY ignore TYPE E-RABUsageReportItem PRESENCE mandatory },
...
}
E-RABUsageReportItem ::= SEQUENCE {
startTimestamp OCTET STRING (SIZE(4)),
endTimestamp OCTET STRING (SIZE(4)),
usageCountUL INTEGER,
usageCountDL INTEGER,
iE-Extensions ProtocolExtensionContainer { { E-RABUsageReportItem-ExtIEs} } OPTIONAL,
...
}
E-RABUsageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
@ -849,6 +904,8 @@ ExpectedHOInterval ::= ENUMERATED {
...
}
ExtendedBitRate ::= INTEGER (10000000001..4000000000000, ...)
ExtendedRNC-ID ::= INTEGER (4096..65535)
ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
@ -910,8 +967,12 @@ GBR-QosInformation ::= SEQUENCE {
}
GBR-QosInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
-- Extension for maximum bitrate > 10G bps --
{ ID id-extended-e-RAB-MaximumBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-MaximumBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional},
...}
GTP-TEID ::= OCTET STRING (SIZE (4))
@ -941,6 +1002,12 @@ GWContextReleaseIndication ::= ENUMERATED {
-- H
HandoverFlag ::= ENUMERATED {
handoverPreparation,
...
}
HandoverRestrictionList ::= SEQUENCE {
servingPLMN PLMNidentity,
equivalentPLMNs EPLMNs OPTIONAL,
@ -952,6 +1019,7 @@ HandoverRestrictionList ::= SEQUENCE {
}
HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional},
...
}
@ -1327,6 +1395,25 @@ NextPagingAreaScope ::= ENUMERATED {
...
}
NRencryptionAlgorithms ::= BIT STRING (SIZE (16,...))
NRintegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
NRrestriction ::= ENUMERATED {
nRrestricted,
...
}
NRUESecurityCapabilities ::= SEQUENCE {
nRencryptionAlgorithms NRencryptionAlgorithms,
nRintegrityProtectionAlgorithms NRintegrityProtectionAlgorithms,
iE-Extensions ProtocolExtensionContainer { { NRUESecurityCapabilities-ExtIEs} } OPTIONAL,
...
}
NRUESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
NumberofBroadcastRequest ::= INTEGER (0..65535)
NumberOfBroadcasts ::= INTEGER (0..65535)
@ -1423,6 +1510,18 @@ M1PeriodicReporting-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
PLMNidentity ::= TBCD-STRING
PLMNAreaBasedQMC ::= SEQUENCE {
plmnListforQMC PLMNListforQMC,
iE-Extensions ProtocolExtensionContainer { {PLMNAreaBasedQMC-ExtIEs} } OPTIONAL,
...
}
PLMNAreaBasedQMC-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
PLMNListforQMC ::= SEQUENCE (SIZE(1..maxnoofPLMNforQMC)) OF PLMNidentity
Port-Number ::= OCTET STRING (SIZE (2))
Pre-emptionCapability ::= ENUMERATED {
@ -1653,6 +1752,36 @@ SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
SecondaryRATType ::= ENUMERATED {
nR,
...
}
SecondaryRATusageDataRequst ::= ENUMERATED {
requested,
...
}
SecondaryRATusageReportList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {SecondaryRATusageReportItemIEs} }
SecondaryRATusageReportItemIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SecondaryRATusageReportItem CRITICALITY ignore TYPE SecondaryRATusageReportItem PRESENCE mandatory },
...
}
SecondaryRATusageReportItem ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
secondaryRATType SecondaryRATType,
e-RABUsageReportList E-RABUsageReportList,
iE-Extensions ProtocolExtensionContainer { { SecondaryRATusageReportItem-ExtIEs} } OPTIONAL,
...
}
SecondaryRATusageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
SerialNumber ::= BIT STRING (SIZE (16))
SONInformation ::= CHOICE{
@ -1910,6 +2039,30 @@ TABasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
TAListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAC
TABasedQMC ::= SEQUENCE {
tAListforQMC TAListforQMC,
iE-Extensions ProtocolExtensionContainer { {TABasedQMC-ExtIEs} } OPTIONAL,
...
}
TABasedQMC-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
TAListforQMC ::= SEQUENCE (SIZE(1..maxnoofTAforQMC)) OF TAC
TAIBasedQMC ::= SEQUENCE {
tAIListforQMC TAIListforQMC,
iE-Extensions ProtocolExtensionContainer { {TAIBasedQMC-ExtIEs} } OPTIONAL,
...
}
TAIBasedQMC-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
TAIListforQMC ::= SEQUENCE (SIZE(1..maxnoofTAforQMC)) OF TAI
CompletedCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
CompletedCellinTAI-Item ::= SEQUENCE{
@ -2016,7 +2169,9 @@ traceCollectionEntityIPAddress TransportLayerAddress,
TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for Rel-10 to support MDT --
{ ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional },
{ ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional }|
-- Extension for Rel-15 to support QMC –
{ ID id-UEAppLayerMeasConfig CRITICALITY ignore EXTENSION UEAppLayerMeasConfig PRESENCE optional },
...
}
@ -2063,6 +2218,20 @@ UEAggregateMaximumBitrate ::= SEQUENCE {
}
UEAggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for maximum bitrate > 10G bps --
{ ID id-extended-uEaggregateMaximumBitRateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-uEaggregateMaximumBitRateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional},
...
}
UEAppLayerMeasConfig ::= SEQUENCE {
containerForAppLayerMeasConfig OCTET STRING (SIZE(1..1000)),
areaScopeOfQMC AreaScopeOfQMC,
iE-Extensions ProtocolExtensionContainer { {UEAppLayerMeasConfig-ExtIEs} } OPTIONAL,
...
}
UEAppLayerMeasConfig-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
@ -2177,6 +2346,12 @@ UEUserPlaneCIoTSupportIndicator ::= ENUMERATED {
...
}
UE-Application-Layer-Measurement-Capability ::= BIT STRING (SIZE (8))
-- First bit: QoE Measurement
-- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver.
-- V
VoiceSupportMatchIndicator ::= ENUMERATED {

87
epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -163,7 +163,12 @@ IMPORTS
Coverage-Level,
EnhancedCoverageRestricted,
DL-CP-SecurityInformation,
UL-CP-SecurityInformation
UL-CP-SecurityInformation,
SecondaryRATusageDataRequst,
SecondaryRATusageReportList,
HandoverFlag,
NRUESecurityCapabilities,
UE-Application-Layer-Measurement-Capability
@ -397,7 +402,12 @@ FROM S1AP-Containers
id-EnhancedCoverageRestricted,
id-UE-Level-QoS-Parameters,
id-DL-CP-SecurityInformation,
id-UL-CP-SecurityInformation
id-UL-CP-SecurityInformation,
id-SecondaryRATusageDataRequst,
id-SecondaryRATusageReportList,
id-HandoverFlag,
id-NRUESecurityCapabilities,
id-UE-Application-Layer-Measurement-Capability
FROM S1AP-Constants;
@ -559,7 +569,8 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UEUserPlaneCIoTSupportIndicator CRITICALITY ignore TYPE UEUserPlaneCIoTSupportIndicator PRESENCE optional}|
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional},
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
...
}
@ -728,7 +739,8 @@ PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
-- 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}|
{ ID id-RRC-Resume-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE optional },
{ ID id-RRC-Resume-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE optional }|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
...
}
@ -776,7 +788,8 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UEUserPlaneCIoTSupportIndicator CRITICALITY ignore TYPE UEUserPlaneCIoTSupportIndicator PRESENCE optional}|
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional},
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
...
}
@ -976,7 +989,8 @@ E-RABModifyRequestIEs 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 optional }|
{ ID id-E-RABToBeModifiedListBearerModReq CRITICALITY reject TYPE E-RABToBeModifiedListBearerModReq PRESENCE mandatory },
{ ID id-E-RABToBeModifiedListBearerModReq CRITICALITY reject TYPE E-RABToBeModifiedListBearerModReq PRESENCE mandatory }|
{ ID id-SecondaryRATusageDataRequst CRITICALITY ignore TYPE SecondaryRATusageDataRequst PRESENCE optional },
...
}
@ -1019,7 +1033,8 @@ E-RABModifyResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-E-RABModifyListBearerModRes CRITICALITY ignore TYPE E-RABModifyListBearerModRes PRESENCE optional }|
{ ID id-E-RABFailedToModifyList 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 }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -1090,7 +1105,8 @@ E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
{ 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 --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -1137,7 +1153,8 @@ E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
{ 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 --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
-- **************************************************************
@ -1183,7 +1200,8 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UEUserPlaneCIoTSupportIndicator CRITICALITY ignore TYPE UEUserPlaneCIoTSupportIndicator PRESENCE optional}|
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional},
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
...
}
@ -1349,10 +1367,11 @@ UEContextReleaseRequest ::= SEQUENCE {
}
UEContextReleaseRequest-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-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-GWContextReleaseIndication CRITICALITY reject TYPE GWContextReleaseIndication 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-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-GWContextReleaseIndication CRITICALITY reject TYPE GWContextReleaseIndication PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -1393,7 +1412,8 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= {
-- Extension for Release 13 to support Paging Optimisation
{ ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}|
-- Extension for Release 13 to support coverage enhancement paging -
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional},
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -1430,7 +1450,8 @@ UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
{ ID id-SRVCCOperationNotPossible CRITICALITY ignore TYPE SRVCCOperationNotPossible PRESENCE optional}|
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional},
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
...
}
-- **************************************************************
@ -1575,7 +1596,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-UE-Usage-Type CRITICALITY ignore TYPE UE-Usage-Type PRESENCE optional}|
{ ID id-CE-mode-B-SupportIndicator CRITICALITY ignore TYPE CE-mode-B-SupportIndicator PRESENCE optional}|
{ ID id-DCN-ID CRITICALITY ignore TYPE DCN-ID PRESENCE optional}|
{ ID id-Coverage-Level CRITICALITY ignore TYPE Coverage-Level PRESENCE optional},
{ ID id-Coverage-Level CRITICALITY ignore TYPE Coverage-Level PRESENCE optional}|
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional},
...
}
@ -2028,7 +2050,8 @@ UECapabilityInfoIndicationIEs 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 mandatory}|
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional},
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional}|
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional},
...
}
@ -2629,7 +2652,8 @@ E-RABModificationIndicationIEs S1AP-PROTOCOL-IES ::= {
{ 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 --
{ 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-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -2790,7 +2814,8 @@ UEContextSuspendRequestIEs 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-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}|
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional},
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
...
}
@ -3007,4 +3032,24 @@ MMECPRelocationIndicationIEs S1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- Secondary RAT Report
--
-- **************************************************************
SecondaryRATReport ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { SecondaryRATReportIEs} },
...
}
SecondaryRATReportIEs 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-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional}|
{ ID id-HandoverFlag CRITICALITY ignore TYPE HandoverFlag PRESENCE optional},
...
}
END

17
epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@ -116,7 +116,8 @@ FROM S1AP-CommonDataTypes
RetrieveUEInformation,
UEInformationTransfer,
ENBCPRelocationIndication,
MMECPRelocationIndication
MMECPRelocationIndication,
SecondaryRATReport
FROM S1AP-PDU-Contents
@ -182,7 +183,8 @@ FROM S1AP-PDU-Contents
id-RetrieveUEInformation,
id-UEInformationTransfer,
id-eNBCPRelocationIndication,
id-MMECPRelocationIndication
id-MMECPRelocationIndication,
id-SecondaryRATReport
FROM S1AP-Constants;
@ -320,7 +322,8 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
retrieveUEInformation |
uEInformationTransfer |
eNBCPRelocationIndication |
mMECPRelocationIndication
mMECPRelocationIndication |
secondaryRATReport
}
-- **************************************************************
@ -729,5 +732,11 @@ mMECPRelocationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
secondaryRATReport S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SecondaryRATReport
PROCEDURE CODE id-SecondaryRATReport
CRITICALITY ignore
}
END

2
epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V14.4.0 (2017-09)
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- B.2 ASN.1 definition
-- **************************************************************
--

59
epan/dissectors/asn1/s1ap/packet-s1ap-template.c
View File

@ -22,7 +22,7 @@
*
* Based on the RANAP dissector
*
* References: 3GPP TS 36.413 V14.4.0 (2017-09)
* References: 3GPP TS 36.413 V15.0.0 (2017-12)
*/
#include "config.h"
@ -49,6 +49,7 @@
#include "packet-gsm_map.h"
#include "packet-cell_broadcast.h"
#include "packet-gsm_a_common.h"
#include "packet-ntp.h"
#define PNAME "S1 Application Protocol"
#define PSNAME "S1AP"
@ -104,6 +105,16 @@ static int hf_s1ap_measurementsToActivate_M7 = -1;
static int hf_s1ap_MDT_Location_Info_GNSS = -1;
static int hf_s1ap_MDT_Location_Info_E_CID = -1;
static int hf_s1ap_MDT_Location_Info_Reserved = -1;
static int hf_s1ap_NRencryptionAlgorithms_NEA1 = -1;
static int hf_s1ap_NRencryptionAlgorithms_NEA2 = -1;
static int hf_s1ap_NRencryptionAlgorithms_NEA3 = -1;
static int hf_s1ap_NRencryptionAlgorithms_Reserved = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA1 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA2 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA3 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_Reserved = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved = -1;
#include "packet-s1ap-hf.c"
/* Initialize the subtree pointers */
@ -136,6 +147,9 @@ static int ett_s1ap_MeasurementsToActivate = -1;
static int ett_s1ap_MDT_Location_Info = -1;
static int ett_s1ap_IMSI = -1;
static int ett_s1ap_NASSecurityParameters = -1;
static int ett_s1ap_NRencryptionAlgorithms = -1;
static int ett_s1ap_NRintegrityProtectionAlgorithms = -1;
static int ett_s1ap_UE_Application_Layer_Measurement_Capability = -1;
#include "packet-s1ap-ett.c"
static expert_field ei_s1ap_number_pages_le15 = EI_INIT;
@ -615,6 +629,46 @@ void proto_register_s1ap(void) {
{ "Reserved", "s1ap.MDT_Location_Info.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x3f,
NULL, HFILL }},
{ &hf_s1ap_NRencryptionAlgorithms_NEA1,
{ "128-NEA1", "s1ap.NRencryptionAlgorithms.NEA1",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x8000,
NULL, HFILL }},
{ &hf_s1ap_NRencryptionAlgorithms_NEA2,
{ "128-NEA2", "s1ap.NRencryptionAlgorithms.NEA2",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x4000,
NULL, HFILL }},
{ &hf_s1ap_NRencryptionAlgorithms_NEA3,
{ "128-NEA3", "s1ap.NRencryptionAlgorithms.NEA3",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x2000,
NULL, HFILL }},
{ &hf_s1ap_NRencryptionAlgorithms_Reserved,
{ "Reserved", "s1ap.NRencryptionAlgorithms.Reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{ &hf_s1ap_NRintegrityProtectionAlgorithms_NIA1,
{ "128-NIA1", "s1ap.NRintegrityProtectionAlgorithms.NIA1",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x8000,
NULL, HFILL }},
{ &hf_s1ap_NRintegrityProtectionAlgorithms_NIA2,
{ "128-NIA2", "s1ap.NRintegrityProtectionAlgorithms.NIA2",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x4000,
NULL, HFILL }},
{ &hf_s1ap_NRintegrityProtectionAlgorithms_NIA3,
{ "128-NIA3", "s1ap.NRintegrityProtectionAlgorithms.NIA3",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x2000,
NULL, HFILL }},
{ &hf_s1ap_NRintegrityProtectionAlgorithms_Reserved,
{ "Reserved", "s1ap.NRintegrityProtectionAlgorithms.Reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement,
{ "QoE Measurement", "s1ap.UE_Application_Layer_Measurement_Capability.QoE_Measurement",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved,
{ "Reserved", "s1ap.UE_Application_Layer_Measurement_Capability.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x7f,
NULL, HFILL }},
#include "packet-s1ap-hfarr.c"
};
@ -649,6 +703,9 @@ void proto_register_s1ap(void) {
&ett_s1ap_MDT_Location_Info,
&ett_s1ap_IMSI,
&ett_s1ap_NASSecurityParameters,
&ett_s1ap_NRencryptionAlgorithms,
&ett_s1ap_NRintegrityProtectionAlgorithms,
&ett_s1ap_UE_Application_Layer_Measurement_Capability,
#include "packet-s1ap-ettarr.c"
};

105
epan/dissectors/asn1/s1ap/s1ap.cnf
View File

@ -958,6 +958,76 @@ ExpectedActivityPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ExpectedIdlePeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY E-RABUsageReportItem/startTimestamp VAL_PTR = &timestamp_tvb
tvbuff_t *timestamp_tvb = NULL;
%(DEFAULT_BODY)s
#.FN_FTR E-RABUsageReportItem/startTimestamp
if (timestamp_tvb) {
proto_item_append_text(actx->created_item, " (%s)", tvb_ntp_fmt_ts_sec(timestamp_tvb, 0));
}
#.FN_BODY E-RABUsageReportItem/endTimestamp VAL_PTR = &timestamp_tvb
tvbuff_t *timestamp_tvb = NULL;
%(DEFAULT_BODY)s
#.FN_FTR E-RABUsageReportItem/endTimestamp
if (timestamp_tvb) {
proto_item_append_text(actx->created_item, " (%s)", tvb_ntp_fmt_ts_sec(timestamp_tvb, 0));
}
#.TYPE_ATTR
E-RABUsageReportItem/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets
#.TYPE_ATTR
E-RABUsageReportItem/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets
#.TYPE_ATTR
ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
#.FN_BODY NRencryptionAlgorithms VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb) {
const gint *fields[] = {
&hf_s1ap_NRencryptionAlgorithms_NEA1,
&hf_s1ap_NRencryptionAlgorithms_NEA2,
&hf_s1ap_NRencryptionAlgorithms_NEA3,
&hf_s1ap_NRencryptionAlgorithms_Reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_NRencryptionAlgorithms);
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 2, fields, ENC_BIG_ENDIAN);
}
#.FN_BODY NRintegrityProtectionAlgorithms VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb) {
const gint *fields[] = {
&hf_s1ap_NRintegrityProtectionAlgorithms_NIA1,
&hf_s1ap_NRintegrityProtectionAlgorithms_NIA2,
&hf_s1ap_NRintegrityProtectionAlgorithms_NIA3,
&hf_s1ap_NRintegrityProtectionAlgorithms_Reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_NRintegrityProtectionAlgorithms);
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 2, fields, ENC_BIG_ENDIAN);
}
#.FN_BODY UE-Application-Layer-Measurement-Capability VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if(parameter_tvb){
const gint *fields[] = {
&hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement,
&hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UE_Application_Layer_Measurement_Capability);
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
TAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX
#.FN_BODY TAC VAL_PTR = &parameter_tvb HF_INDEX = -1
@ -1149,6 +1219,7 @@ id-RetrieveUEInformation ProcedureCode
id-UEInformationTransfer ProcedureCode
id-eNBCPRelocationIndication ProcedureCode
id-MMECPRelocationIndication ProcedureCode
id-SecondaryRATReport ProcedureCode
# ProtocolIE-ID
id-MME-UE-S1AP-ID ProtocolIE-ID
@ -1388,6 +1459,21 @@ id-EnhancedCoverageRestricted ProtocolIE-ID
id-UE-Level-QoS-Parameters ProtocolIE-ID
id-DL-CP-SecurityInformation ProtocolIE-ID
id-UL-CP-SecurityInformation ProtocolIE-ID
id-extended-e-RAB-MaximumBitrateDL ProtocolIE-ID
id-extended-e-RAB-MaximumBitrateUL ProtocolIE-ID
id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID
id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID
id-extended-uEaggregateMaximumBitRateDL ProtocolIE-ID
id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID
id-NRrestriction ProtocolIE-ID
id-UEAppLayerMeasConfig ProtocolIE-ID
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID
id-SecondaryRATusageReportList ProtocolIE-ID
id-SecondaryRATusageReportItem ProtocolIE-ID
id-HandoverFlag ProtocolIE-ID
id-E-RABUsageReportItem ProtocolIE-ID
id-SecondaryRATusageDataRequst ProtocolIE-ID
id-NRUESecurityCapabilities ProtocolIE-ID
#.END
#.REGISTER
@ -1593,6 +1679,13 @@ ServedDCNs N s1ap.ies id-ServedDCNs
DL-CP-SecurityInformation N s1ap.ies id-DL-CP-SecurityInformation
E-RABLevelQoSParameters N s1ap.ies id-UE-Level-QoS-Parameters
UL-CP-SecurityInformation N s1ap.ies id-UL-CP-SecurityInformation
E-RABUsageReportItem N s1ap.ies id-E-RABUsageReportItem
SecondaryRATusageReportItem N s1ap.ies id-SecondaryRATusageReportItem
NRUESecurityCapabilities N s1ap.ies id-NRUESecurityCapabilities
SecondaryRATusageDataRequst N s1ap.ies id-SecondaryRATusageDataRequst
SecondaryRATusageReportList N s1ap.ies id-SecondaryRATusageReportList
UE-Application-Layer-Measurement-Capability N s1ap.ies id-UE-Application-Layer-Measurement-Capability
HandoverFlag N s1ap.ies id-HandoverFlag
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -1635,6 +1728,14 @@ M6Configuration N s1ap.extension id-M6Configuration
M7Configuration N s1ap.extension id-M7Configuration
RAT-Type N s1ap.extension id-RAT-Type
BearerType N s1ap.extension id-BearerType
ExtendedBitRate N s1ap.extension id-extended-e-RAB-MaximumBitrateDL
ExtendedBitRate N s1ap.extension id-extended-e-RAB-MaximumBitrateUL
ExtendedBitRate N s1ap.extension id-extended-e-RAB-GuaranteedBitrateDL
ExtendedBitRate N s1ap.extension id-extended-e-RAB-GuaranteedBitrateUL
NRrestriction N s1ap.extension id-NRrestriction
UEAppLayerMeasConfig N s1ap.extension id-UEAppLayerMeasConfig
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateDL
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateUL
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation
@ -1791,6 +1892,8 @@ ENBCPRelocationIndication N s1ap.proc.imsg id-eNBCPRelocationIndic
MMECPRelocationIndication N s1ap.proc.imsg id-MMECPRelocationIndication
SecondaryRATReport N s1ap.proc.imsg id-SecondaryRATReport
#.FN_HDR HandoverRequired
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequired");
@ -1976,6 +2079,8 @@ MMECPRelocationIndication N s1ap.proc.imsg id-MMECPRelocationIndic
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBCPRelocationIndication");
#.FN_HDR MMECPRelocationIndication
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MMECPRelocationIndication");
#.FN_HDR SecondaryRATReport
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATReport");
#.END
# Whenever a Cause appears, look up the reason and show it in the Info column

1087
epan/dissectors/packet-s1ap.c
View File

File diff suppressed because it is too large Load Diff