osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

S1AP: upgrade dissector to v16.2.0 

Change-Id: Ifa71f952f5aca11f99ae751d1c1404a2af95e3a5
Reviewed-on: https://code.wireshark.org/review/38204
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Tomáš Kukosa <keksa@email.cz>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2020-08-20 11:46:09 +02:00
parent 4e595577f3
commit abd6f143c7
13 changed files with 3152 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -45,12 +45,16 @@ T-StatusProhibit
WLAN-backhaulRate-r12
#.EXPORTS
CellsToAddModListNR-r15_PDU
HandoverCommand_PDU
HandoverPreparationInformation_PDU
HandoverPreparationInformation-NB_PDU
MeasResultSCG-FailureMRDC-r15_PDU
MeasResultList3EUTRA-r15_PDU
MeasurementReport_PDU
MTC-SSB-NR-r15_PDU
QuantityConfigNR-r15_PDU
RLF-Report-NB-r16_PDU
RLF-Report-r9_PDU
RLF-Report-v9e0_PDU
RRCConnectionReconfigurationComplete_PDU
@ -60,6 +64,9 @@ SidelinkUEInformation-r12_PDU
SL-Parameters-v1430_PDU
SL-Parameters-v1530_PDU
SL-Parameters-v1540_PDU
SS-RSSI-Measurement-r15_PDU
SSB-ToMeasure-r15_PDU
ThresholdListNR-r15_PDU
UEAssistanceInformation-r11_PDU
UECapabilityEnquiry_PDU
UEPagingCoverageInformation_PDU
@ -75,12 +82,16 @@ VisitedCellInfoList-r12_PDU
#.END
#.PDU
CellsToAddModListNR-r15
HandoverCommand
HandoverPreparationInformation
HandoverPreparationInformation-NB
MTC-SSB-NR-r15
MeasResultSCG-FailureMRDC-r15
MeasResultList3EUTRA-r15
MeasurementReport
QuantityConfigNR-r15
RLF-Report-NB-r16
RLF-Report-r9
RLF-Report-v9e0
RRCConnectionReconfiguration @rrc_conn_reconf
@ -91,6 +102,9 @@ SidelinkUEInformation-r12
SL-Parameters-v1430
SL-Parameters-v1530
SL-Parameters-v1540
SS-RSSI-Measurement-r15
SSB-ToMeasure-r15
ThresholdListNR-r15
UEAssistanceInformation-r11
UECapabilityEnquiry
UEPagingCoverageInformation @ue_paging_coverage_info

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.5 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -96,6 +96,10 @@ id-UEInformationTransfer ProcedureCode ::= 59
id-eNBCPRelocationIndication ProcedureCode ::= 60
id-MMECPRelocationIndication ProcedureCode ::= 61
id-SecondaryRATDataUsageReport ProcedureCode ::= 62
id-UERadioCapabilityIDMapping ProcedureCode ::= 63
id-HandoverSuccess ProcedureCode ::= 64
id-eNBEarlyStatusTransfer ProcedureCode ::= 65
id-MMEEarlyStatusTransfer ProcedureCode ::= 66
-- **************************************************************
--
@ -155,7 +159,10 @@ maxnoofPLMNforQMC INTEGER ::= 16
maxnoofBluetoothName INTEGER ::= 4
maxnoofWLANName INTEGER ::= 4
maxnoofConnectedengNBs INTEGER ::= 256
maxnoofPC5QoSFlows INTEGER ::= 2048
maxnooffrequencies INTEGER ::= 64
maxNARFCN INTEGER ::= 32
maxRS-IndexCellQual INTEGER ::= 16
-- **************************************************************
@ -477,5 +484,31 @@ id-EN-DCSONConfigurationTransfer-MCT ProtocolIE-ID ::= 295
id-IMSvoiceEPSfallbackfrom5G ProtocolIE-ID ::= 296
id-TimeSinceSecondaryNodeRelease ProtocolIE-ID ::= 297
id-RequestTypeAdditionalInfo ProtocolIE-ID ::= 298
id-AdditionalRRMPriorityIndex ProtocolIE-ID ::= 299
id-ContextatSource ProtocolIE-ID ::= 300
id-IAB-Authorized ProtocolIE-ID ::= 301
id-IAB-Node-Indication ProtocolIE-ID ::= 302
id-IAB-Supported ProtocolIE-ID ::= 303
id-DataSize ProtocolIE-ID ::= 304
id-Ethernet-Type ProtocolIE-ID ::= 305
id-NRV2XServicesAuthorized ProtocolIE-ID ::= 306
id-NRUESidelinkAggregateMaximumBitrate ProtocolIE-ID ::= 307
id-PC5QoSParameters ProtocolIE-ID ::= 308
id-IntersystemSONConfigurationTransferMCT ProtocolIE-ID ::= 309
id-IntersystemSONConfigurationTransferECT ProtocolIE-ID ::= 310
id-IntersystemMeasurementConfiguration ProtocolIE-ID ::= 311
id-SourceNodeID ProtocolIE-ID ::= 312
id-NB-IoT-RLF-Report-Container ProtocolIE-ID ::= 313
id-UERadioCapabilityID ProtocolIE-ID ::= 314
id-UERadioCapability-NR-Format ProtocolIE-ID ::= 315
id-MDTConfigurationNR ProtocolIE-ID ::= 316
id-DAPSRequestInfo ProtocolIE-ID ::= 317
id-DAPSResponseInfoList ProtocolIE-ID ::= 318
id-DAPSResponseInfoItem ProtocolIE-ID ::= 319
id-NotifySourceeNB ProtocolIE-ID ::= 320
id-eNB-EarlyStatusTransfer-TransparentContainer ProtocolIE-ID ::= 321
id-Bearers-SubjectToEarlyStatusTransfer-Item ProtocolIE-ID ::= 322
id-WUS-Assistance-Information ProtocolIE-ID ::= 323
id-NB-IoT-PagingDRX ProtocolIE-ID ::= 324
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.7 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -17,6 +17,7 @@ BEGIN
IMPORTS
id-E-RABInformationListItem,
id-E-RABItem,
id-GUMMEIType,
id-Bearers-SubjectToStatusTransfer-Item,
id-Time-Synchronisation-Info,
id-x2TNLConfigurationInfo,
@ -71,6 +72,16 @@ IMPORTS
id-PSCellInformation,
id-IMSvoiceEPSfallbackfrom5G,
id-RequestTypeAdditionalInfo,
id-AdditionalRRMPriorityIndex,
id-ContextatSource,
id-IntersystemMeasurementConfiguration,
id-SourceNodeID,
id-NB-IoT-RLF-Report-Container,
id-MDTConfigurationNR,
id-DAPSRequestInfo,
id-DAPSResponseInfoList,
id-DAPSResponseInfoItem,
id-Bearers-SubjectToEarlyStatusTransfer-Item,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -111,7 +122,11 @@ IMPORTS
maxnoofPLMNforQMC,
maxnoofBluetoothName,
maxnoofWLANName,
maxnoofConnectedengNBs
maxnoofConnectedengNBs,
maxnoofPC5QoSFlows,
maxnooffrequencies,
maxNARFCN,
maxRS-IndexCellQual
@ -144,6 +159,8 @@ Additional-GUTI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
AdditionalRRMPriorityIndex ::= BIT STRING (SIZE(32))
AerialUEsubscriptionInformation ::= ENUMERATED {
allowed,
not-allowed,
@ -239,6 +256,24 @@ Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
Bearers-SubjectToEarlyStatusTransferList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToEarlyStatusTransfer-ItemIEs } }
Bearers-SubjectToEarlyStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
{ ID id-Bearers-SubjectToEarlyStatusTransfer-Item CRITICALITY ignore TYPE Bearers-SubjectToEarlyStatusTransfer-Item PRESENCE mandatory},
...
}
Bearers-SubjectToEarlyStatusTransfer-Item ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
dLCOUNT-PDCP-SNlength DLCOUNT-PDCP-SNlength,
iE-Extensions ProtocolExtensionContainer { {Bearers-SubjectToEarlyStatusTransfer-ItemExtIEs} } OPTIONAL,
...
}
Bearers-SubjectToEarlyStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
BearerType ::= ENUMERATED {
non-IP,
...
@ -584,6 +619,17 @@ ConnectedengNBItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
ContextatSource ::= SEQUENCE {
sourceNG-RAN-node-ID Global-RAN-NODE-ID,
rAN-UE-NGAP-ID RAN-UE-NGAP-ID,
iE-Extensions ProtocolExtensionContainer { {ContextatSource-ExtIEs} } OPTIONAL,
...
}
ContextatSource-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
Correlation-ID ::= OCTET STRING (SIZE (4))
CSFallbackIndicator ::= ENUMERATED {
@ -686,8 +732,49 @@ CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- D
DAPSRequestInfo ::= SEQUENCE {
dAPSIndicator ENUMERATED {dAPS-HO-required, ...},
iE-Extensions ProtocolExtensionContainer { {DAPSRequestInfo-ExtIEs} } OPTIONAL,
...
}
DAPSRequestInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
DAPSResponseInfoList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { { DAPSResponseInfoListIEs } }
DAPSResponseInfoListIEs S1AP-PROTOCOL-IES ::= {
{ ID id-DAPSResponseInfoItem CRITICALITY ignore TYPE DAPSResponseInfoItem PRESENCE mandatory},
...
}
DAPSResponseInfoItem ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
dAPSResponseInfo DAPSResponseInfo,
iE-Extensions ProtocolExtensionContainer { {DAPSResponseInfoItem-ExtIEs} } OPTIONAL,
...
}
DAPSResponseInfoItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
DAPSResponseInfo ::= SEQUENCE {
dapsresponseindicator ENUMERATED {dAPS-HO-accepted,dAPS-HO-not-accepted,...},
iE-Extensions ProtocolExtensionContainer { { DAPSResponseInfo-ExtIEs} } OPTIONAL,
...
}
DAPSResponseInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
DataCodingScheme ::= BIT STRING (SIZE (8))
DataSize ::= INTEGER(1..4095, ...)
DCN-ID ::= INTEGER (0..65535)
ServedDCNs ::= SEQUENCE (SIZE(0..maxnoofDCNs)) OF ServedDCNsItem
@ -720,6 +807,13 @@ DL-Forwarding ::= ENUMERATED {
DL-NAS-MAC ::= BIT STRING (SIZE (16))
DLCOUNT-PDCP-SNlength ::= CHOICE {
dLCOUNTValuePDCP-SNlength12 COUNTvalue,
dLCOUNTValuePDCP-SNlength15 COUNTValueExtended,
dLCOUNTValuePDCP-SNlength18 COUNTvaluePDCP-SNlength18,
...
}
Direct-Forwarding-Path-Availability ::= ENUMERATED {
directPathAvailable,
...
@ -794,6 +888,16 @@ ECGI-List ::= SEQUENCE (SIZE(1..maxnoofCellsineNB)) OF EUTRAN-CGI
EmergencyAreaIDListForRestart ::= SEQUENCE (SIZE(1..maxnoofRestartEmergencyAreaIDs)) OF EmergencyAreaID
ENB-EarlyStatusTransfer-TransparentContainer ::= SEQUENCE {
bearers-SubjectToEarlyStatusTransferList Bearers-SubjectToEarlyStatusTransferList,
iE-Extensions ProtocolExtensionContainer { {ENB-EarlyStatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
...
}
ENB-EarlyStatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
ENB-ID ::= CHOICE {
macroENB-ID BIT STRING (SIZE(20)),
homeENB-ID BIT STRING (SIZE(28)),
@ -966,6 +1070,7 @@ E-RABInformationListItem ::= SEQUENCE {
}
E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-DAPSRequestInfo CRITICALITY ignore EXTENSION DAPSRequestInfo PRESENCE optional },
...
}
@ -1023,6 +1128,10 @@ E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
Ethernet-Type ::= ENUMERATED {
true,
...
}
EUTRAN-CGI ::= SEQUENCE {
pLMNidentity PLMNidentity,
@ -1098,6 +1207,8 @@ FiveGSTAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
FiveQI ::= INTEGER (0..255, ...)
ForbiddenInterRATs ::= ENUMERATED {
all,
geran,
@ -1275,11 +1386,70 @@ IntendedNumberOfPagingAttempts ::= INTEGER (1..16, ...)
InterfacesToTrace ::= BIT STRING (SIZE (8))
IntersystemMeasurementConfiguration ::= SEQUENCE {
rSRP INTEGER (0.. 127) OPTIONAL,
rSRQ INTEGER (0.. 127) OPTIONAL,
sINR INTEGER (0.. 127) OPTIONAL,
interSystemMeasurementParameters InterSystemMeasurementParameters,
iE-Extensions ProtocolExtensionContainer { { IntersystemMeasurementConfiguration-ExtIEs} } OPTIONAL,
...
}
IntersystemMeasurementConfiguration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
InterSystemMeasurementParameters ::= SEQUENCE {
measurementDuration INTEGER (1..100),
interSystemMeasurementList InterSystemMeasurementList OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { InterSystemMeasurementParameters-ExtIEs} } OPTIONAL,
...
}
InterSystemMeasurementParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
InterSystemMeasurementList ::= SEQUENCE (SIZE(1.. maxnooffrequencies)) OF InterSystemMeasurementItem
InterSystemMeasurementItem ::= SEQUENCE {
freqBandIndicatorNR INTEGER (1..1024),
sSBfrequencies INTEGER (0..maxNARFCN),
subcarrierSpacingSSB ENUMERATED {kHz15, kHz30, kHz60, kHz120, kHz240, ...},
maxRSIndexCellQual INTEGER (1..maxRS-IndexCellQual) OPTIONAL,
sMTC OCTET STRING OPTIONAL,
threshRS-Index-r15 OCTET STRING OPTIONAL,
sSBToMeasure OCTET STRING OPTIONAL,
sSRSSIMeasurement OCTET STRING OPTIONAL,
quantityConfigNR-R15 OCTET STRING OPTIONAL,
blackCellsToAddModList OCTET STRING OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { InterSystemMeasurementItem-ExtIEs} } OPTIONAL
}
InterSystemMeasurementItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
IntersystemSONConfigurationTransfer ::= OCTET STRING
IMSvoiceEPSfallbackfrom5G ::= ENUMERATED {
true,
...
}
IAB-Authorized ::= ENUMERATED {
authorized,
not-authorized,
...
}
IAB-Node-Indication ::= ENUMERATED {
true,
...
}
IAB-Supported ::= ENUMERATED {
true,
...
}
-- J
-- K
@ -1561,6 +1731,8 @@ MutingPatternInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
MDT-ConfigurationNR ::= OCTET STRING
-- N
NAS-PDU ::= OCTET STRING
@ -1577,6 +1749,8 @@ NB-IoT-DefaultPagingDRX ::= ENUMERATED {
...
}
NB-IoT-PagingDRX ::= ENUMERATED { v32, v64, v128, v256, v512, v1024,...}
NB-IoT-Paging-eDRXInformation ::= SEQUENCE {
nB-IoT-paging-eDRX-Cycle NB-IoT-Paging-eDRX-Cycle,
nB-IoT-pagingTimeWindow NB-IoT-PagingTimeWindow OPTIONAL,
@ -1592,6 +1766,8 @@ NB-IoT-Paging-eDRX-Cycle ::= ENUMERATED{hf2, hf4, hf6, hf8, hf10, hf12, hf14, hf
NB-IoT-PagingTimeWindow ::= ENUMERATED{s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, ...}
NB-IoT-RLF-Report-Container ::= OCTET STRING
NB-IoT-UEIdentityIndexValue ::= BIT STRING (SIZE (12))
NextPagingAreaScope ::= ENUMERATED {
@ -1600,6 +1776,10 @@ NextPagingAreaScope ::= ENUMERATED {
...
}
NotifySourceeNB ::= ENUMERATED {
notifySource,
...
}
NRCellIdentity ::= BIT STRING (SIZE(36))
@ -1643,6 +1823,28 @@ NumberofBroadcastRequest ::= INTEGER (0..65535)
NumberOfBroadcasts ::= INTEGER (0..65535)
NRV2XServicesAuthorized ::= SEQUENCE {
vehicleUE VehicleUE OPTIONAL,
pedestrianUE PedestrianUE OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {NRV2XServicesAuthorized-ExtIEs} } OPTIONAL,
...
}
NRV2XServicesAuthorized-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
NRUESidelinkAggregateMaximumBitrate ::= SEQUENCE {
uEaggregateMaximumBitRateDL BitRate,
uEaggregateMaximumBitRateUL BitRate,
iE-Extensions ProtocolExtensionContainer { {NRUESidelinkAggregateMaximumBitrate-ExtIEs} } OPTIONAL,
...
}
NRUESidelinkAggregateMaximumBitrate-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
-- O
OldBSS-ToNewBSS-Information ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
@ -1718,6 +1920,44 @@ PagingPriority ::= ENUMERATED {
...
}
PagingProbabilityInformation ::= ENUMERATED {p00, p05, p10, p15, p20, p25, p30, p35, p40, p45, p50, p55, p60, p65, p70, p75, p80, p85, p90, p95, p100, ...}
PC5QoSParameters ::= SEQUENCE {
pc5QoSFlowList PC5QoSFlowList,
pc5LinkAggregatedBitRates BitRate OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PC5QoSParameters-ExtIEs} } OPTIONAL,
...
}
PC5QoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
PC5QoSFlowList ::= SEQUENCE (SIZE(1..maxnoofPC5QoSFlows)) OF PC5QoSFlowItem
PC5QoSFlowItem::= SEQUENCE {
pQI FiveQI,
pc5FlowBitRates PC5FlowBitRates OPTIONAL,
range Range OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PC5QoSFlowItem-ExtIEs} } OPTIONAL,
...
}
PC5QoSFlowItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
PC5FlowBitRates ::= SEQUENCE {
guaranteedFlowBitRate BitRate,
maximumFlowBitRate BitRate,
iE-Extensions ProtocolExtensionContainer { { PC5FlowBitRates-ExtIEs} } OPTIONAL,
...
}
PC5FlowBitRates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
PDCP-SN ::= INTEGER (0..4095)
PDCP-SNExtended ::= INTEGER (0..32767)
@ -1819,6 +2059,10 @@ QCI ::= INTEGER (0..255)
-- R
RAN-UE-NGAP-ID ::= INTEGER (0..4294967295)
Range ::= ENUMERATED {m50, m80, m180, m200, m350, m400, m500, m700, m1000, ...}
ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384))
@ -1958,6 +2202,7 @@ RLFReportInformation ::= SEQUENCE {
}
RLFReportInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ID id-NB-IoT-RLF-Report-Container CRITICALITY ignore EXTENSION NB-IoT-RLF-Report-Container PRESENCE optional},
...
}
@ -2142,6 +2387,17 @@ SRVCCHOIndication ::= ENUMERATED {
...
}
SourceNodeID ::= CHOICE {
sourceNgRanNode-ID SourceNgRanNode-ID,
sourceNodeID-Extension SourceNodeID-Extension
}
SourceNodeID-Extension ::= ProtocolIE-SingleContainer {{ SourceNodeID-ExtensionIE }}
SourceNodeID-ExtensionIE S1AP-PROTOCOL-IES ::= {
...
}
SourceeNB-ToTargeteNB-TransparentContainer ::= SEQUENCE {
rRC-Container RRC-Container,
e-RABInformationList E-RABInformationList OPTIONAL,
@ -2153,12 +2409,26 @@ SourceeNB-ToTargeteNB-TransparentContainer ::= SEQUENCE {
}
SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ID id-MobilityInformation CRITICALITY ignore EXTENSION MobilityInformation PRESENCE optional}|
{ID id-uE-HistoryInformationFromTheUE CRITICALITY ignore EXTENSION UE-HistoryInformationFromTheUE PRESENCE optional}|
{ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional},
{ID id-MobilityInformation CRITICALITY ignore EXTENSION MobilityInformation PRESENCE optional}|
{ID id-uE-HistoryInformationFromTheUE CRITICALITY ignore EXTENSION UE-HistoryInformationFromTheUE PRESENCE optional}|
{ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional}|
{ID id-AdditionalRRMPriorityIndex CRITICALITY ignore EXTENSION AdditionalRRMPriorityIndex PRESENCE optional}|
{ID id-ContextatSource CRITICALITY ignore EXTENSION ContextatSource PRESENCE optional}|
{ID id-IntersystemMeasurementConfiguration CRITICALITY ignore EXTENSION IntersystemMeasurementConfiguration PRESENCE optional}|
{ID id-SourceNodeID CRITICALITY ignore EXTENSION SourceNodeID PRESENCE optional},
...
}
SourceNgRanNode-ID ::= SEQUENCE {
global-RAN-NODE-ID Global-RAN-NODE-ID,
selected-TAI FiveGSTAI,
iE-Extensions ProtocolExtensionContainer { { SourceNgRanNode-ID-ExtIEs} } OPTIONAL,
...
}
SourceNgRanNode-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
SourceRNC-ToTargetRNC-TransparentContainer ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
@ -2177,6 +2447,7 @@ ServedGUMMEIsItem ::= SEQUENCE {
}
ServedGUMMEIsItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ID id-GUMMEIType CRITICALITY ignore EXTENSION GUMMEIType PRESENCE optional},
...
}
@ -2457,6 +2728,7 @@ TargeteNB-ToSourceeNB-TransparentContainer ::= SEQUENCE {
}
TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-DAPSResponseInfoList CRITICALITY reject EXTENSION DAPSResponseInfoList PRESENCE optional},
...
}
@ -2516,7 +2788,8 @@ TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for Rel-10 to support MDT --
{ 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 },
{ ID id-UEAppLayerMeasConfig CRITICALITY ignore EXTENSION UEAppLayerMeasConfig PRESENCE optional }|
{ ID id-MDTConfigurationNR CRITICALITY ignore EXTENSION MDT-ConfigurationNR PRESENCE optional },
...
}
@ -2636,6 +2909,8 @@ UERadioCapability ::= OCTET STRING
UERadioCapabilityForPaging ::= OCTET STRING
UERadioCapabilityID ::= OCTET STRING
UE-RLF-Report-Container ::= OCTET STRING
-- This IE is a transparent container and shall be encoded as the rlf-Report-r9 field contained in the UEInformationResponse message as defined in TS 36.331 [16]
@ -2779,6 +3054,16 @@ WLANMeasConfig::= ENUMERATED {setup,...}
WLANName ::= OCTET STRING (SIZE (1..32))
WUS-Assistance-Information ::= SEQUENCE {
pagingProbabilityInformation PagingProbabilityInformation,
iE-Extensions ProtocolExtensionContainer { { WUS-Assistance-Information-ExtIEs } } OPTIONAL,
...
}
WUS-Assistance-Information-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
-- X

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -185,7 +185,22 @@ IMPORTS
NR-CGI,
ConnectedengNBList,
EN-DCSONConfigurationTransfer,
TimeSinceSecondaryNodeRelease
TimeSinceSecondaryNodeRelease,
AdditionalRRMPriorityIndex,
IAB-Authorized,
IAB-Node-Indication,
IAB-Supported,
DataSize,
Ethernet-Type,
NRV2XServicesAuthorized,
NRUESidelinkAggregateMaximumBitrate,
PC5QoSParameters,
IntersystemSONConfigurationTransfer,
UERadioCapabilityID,
NotifySourceeNB,
ENB-EarlyStatusTransfer-TransparentContainer,
WUS-Assistance-Information,
NB-IoT-PagingDRX
@ -364,6 +379,8 @@ FROM S1AP-Containers
id-BroadcastCancelledAreaList,
id-RRC-Establishment-Cause,
id-TraceCollectionEntityIPAddress,
id-AdditionalRRMPriorityIndex,
id-MDTConfigurationNR,
maxnoofTAIs,
maxnoofErrors,
maxnoofE-RABs,
@ -443,7 +460,23 @@ FROM S1AP-Containers
id-ConnectedengNBToRemoveList,
id-EN-DCSONConfigurationTransfer-ECT,
id-EN-DCSONConfigurationTransfer-MCT,
id-TimeSinceSecondaryNodeRelease
id-TimeSinceSecondaryNodeRelease,
id-IAB-Authorized,
id-IAB-Node-Indication,
id-IAB-Supported,
id-DataSize,
id-Ethernet-Type,
id-NRV2XServicesAuthorized,
id-NRUESidelinkAggregateMaximumBitrate,
id-PC5QoSParameters,
id-IntersystemSONConfigurationTransferMCT,
id-IntersystemSONConfigurationTransferECT,
id-UERadioCapabilityID,
id-UERadioCapability-NR-Format,
id-NotifySourceeNB,
id-eNB-EarlyStatusTransfer-TransparentContainer,
id-WUS-Assistance-Information,
id-NB-IoT-PagingDRX
@ -611,8 +644,13 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }|
{ ID id-IAB-Authorized CRITICALITY reject TYPE IAB-Authorized PRESENCE optional}|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-NRUESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional}, ...
}
E-RABToBeSetupListHOReq ::= E-RAB-IE-ContainerList { {E-RABToBeSetupItemHOReqIEs} }
@ -633,7 +671,8 @@ E-RABToBeSetupItemHOReq ::= SEQUENCE {
E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Data-Forwarding-Not-Possible CRITICALITY ignore EXTENSION Data-Forwarding-Not-Possible PRESENCE optional}|
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional},
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
...
}
@ -746,7 +785,8 @@ HandoverNotifyIEs 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-PSCellInformation CRITICALITY ignore TYPE PSCellInformation PRESENCE optional },
{ ID id-PSCellInformation CRITICALITY ignore TYPE PSCellInformation PRESENCE optional }|
{ ID id-NotifySourceeNB CRITICALITY ignore TYPE NotifySourceeNB PRESENCE optional},
...
}
@ -837,7 +877,12 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional},
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional}|
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-NRUESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional},
...
}
@ -922,6 +967,77 @@ HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- HANDOVER SUCCESS ELEMENTARY PROCEDURE
--
-- **************************************************************
-- **************************************************************
--
-- Handover Success
--
-- **************************************************************
HandoverSuccess ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { HandoverSuccessIEs} },
...
}
HandoverSuccessIEs 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},
...
}
-- **************************************************************
--
-- eNB EARLY STATUS TRANSFER ELEMENTARY PROCEDURE
--
-- **************************************************************
-- **************************************************************
--
-- eNB Early Status Transfer
--
-- **************************************************************
ENBEarlyStatusTransfer ::= SEQUENCE {
protocolIEs ProtocolIE-Container { {ENBEarlyStatusTransferIEs} },
...
}
ENBEarlyStatusTransferIEs 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-eNB-EarlyStatusTransfer-TransparentContainer CRITICALITY reject TYPE ENB-EarlyStatusTransfer-TransparentContainer PRESENCE mandatory},
...
}
-- **************************************************************
--
-- MME EARLY STATUS TRANSFER ELEMENTARY PROCEDURE
--
-- **************************************************************
-- **************************************************************
--
-- MME Early Status Transfer
--
-- **************************************************************
MMEEarlyStatusTransfer ::= SEQUENCE {
protocolIEs ProtocolIE-Container { {MMEEarlyStatusTransferIEs} },
...
}
MMEEarlyStatusTransferIEs 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-eNB-EarlyStatusTransfer-TransparentContainer CRITICALITY reject TYPE ENB-EarlyStatusTransfer-TransparentContainer PRESENCE mandatory},
...
}
-- **************************************************************
--
-- E-RAB SETUP ELEMENTARY PROCEDURE
@ -968,7 +1084,8 @@ E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-SIPTO-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional},
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
...
}
@ -1253,7 +1370,13 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }|
{ ID id-IAB-Authorized CRITICALITY ignore TYPE IAB-Authorized PRESENCE optional}|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-NRUESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional},
...
}
@ -1281,7 +1404,8 @@ E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-SIPTO-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional},
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
...
}
@ -1381,7 +1505,10 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
{ ID id-NB-IoT-Paging-eDRXInformation CRITICALITY ignore TYPE NB-IoT-Paging-eDRXInformation PRESENCE optional}|
{ ID id-NB-IoT-UEIdentityIndexValue CRITICALITY ignore TYPE NB-IoT-UEIdentityIndexValue PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-DataSize CRITICALITY ignore TYPE DataSize PRESENCE optional}|
{ ID id-WUS-Assistance-Information CRITICALITY ignore TYPE WUS-Assistance-Information PRESENCE optional}|
{ ID id-NB-IoT-PagingDRX CRITICALITY ignore TYPE NB-IoT-PagingDRX PRESENCE optional},
...
}
@ -1491,23 +1618,29 @@ 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-AdditionalCSFallbackIndicator CRITICALITY ignore TYPE AdditionalCSFallbackIndicator PRESENCE conditional}|
{ ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}|
{ 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-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation 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}|
{ ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}|
{ 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-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional}|
{ ID id-IAB-Authorized CRITICALITY ignore TYPE IAB-Authorized PRESENCE optional}|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-NRUESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional},
...
}
-- **************************************************************
@ -1566,7 +1699,8 @@ UERadioCapabilityMatchRequest ::= SEQUENCE {
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 },
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional },
...
}
@ -1621,7 +1755,9 @@ DownlinkNASTransport-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-UECapabilityInfoRequest CRITICALITY ignore TYPE UECapabilityInfoRequest PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional}|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional},
...
}
@ -1660,8 +1796,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-DCN-ID CRITICALITY ignore TYPE DCN-ID 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}|
{ ID id-EDT-Session CRITICALITY ignore TYPE EDT-Session PRESENCE optional},
{ ID id-EDT-Session CRITICALITY ignore TYPE EDT-Session PRESENCE optional}|
{ ID id-IAB-Node-Indication CRITICALITY reject TYPE IAB-Node-Indication PRESENCE optional},
...
}
@ -1841,7 +1977,8 @@ ErrorIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE optional }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-S-TMSI CRITICALITY ignore TYPE S-TMSI PRESENCE optional },
...
}
@ -1893,7 +2030,8 @@ S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MMERelaySupportIndicator CRITICALITY ignore TYPE MMERelaySupportIndicator PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-UE-RetentionInformation CRITICALITY ignore TYPE UE-RetentionInformation PRESENCE optional}|
{ ID id-ServedDCNs CRITICALITY ignore TYPE ServedDCNs PRESENCE optional},
{ ID id-ServedDCNs CRITICALITY ignore TYPE ServedDCNs PRESENCE optional}|
{ ID id-IAB-Supported CRITICALITY ignore TYPE IAB-Supported PRESENCE optional},
...
}
@ -2121,7 +2259,8 @@ UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE mandatory}|
{ 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}|
{ ID id-LTE-M-Indication CRITICALITY ignore TYPE LTE-M-Indication PRESENCE optional},
{ ID id-LTE-M-Indication CRITICALITY ignore TYPE LTE-M-Indication PRESENCE optional}|
{ ID id-UERadioCapability-NR-Format CRITICALITY ignore TYPE UERadioCapability PRESENCE optional},
...
}
@ -2488,7 +2627,8 @@ ENBConfigurationTransfer ::= SEQUENCE {
ENBConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SONConfigurationTransferECT CRITICALITY ignore TYPE SONConfigurationTransfer PRESENCE optional }|
{ ID id-EN-DCSONConfigurationTransfer-ECT CRITICALITY ignore TYPE EN-DCSONConfigurationTransfer PRESENCE optional },
{ ID id-EN-DCSONConfigurationTransfer-ECT CRITICALITY ignore TYPE EN-DCSONConfigurationTransfer PRESENCE optional }|
{ ID id-IntersystemSONConfigurationTransferECT CRITICALITY ignore TYPE IntersystemSONConfigurationTransfer PRESENCE optional },
...
}
@ -2511,7 +2651,8 @@ MMEConfigurationTransfer ::= SEQUENCE {
MMEConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SONConfigurationTransferMCT CRITICALITY ignore TYPE SONConfigurationTransfer PRESENCE optional }|
{ ID id-EN-DCSONConfigurationTransfer-MCT CRITICALITY ignore TYPE EN-DCSONConfigurationTransfer PRESENCE optional },
{ ID id-EN-DCSONConfigurationTransfer-MCT CRITICALITY ignore TYPE EN-DCSONConfigurationTransfer PRESENCE optional }|
{ ID id-IntersystemSONConfigurationTransferMCT CRITICALITY ignore TYPE IntersystemSONConfigurationTransfer PRESENCE optional },
...
}
@ -2727,7 +2868,8 @@ E-RABModificationIndicationIEs S1AP-PROTOCOL-IES ::= {
{ 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-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional }|
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}
@ -3034,7 +3176,9 @@ ConnectionEstablishmentIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-DL-CP-SecurityInformation CRITICALITY ignore TYPE DL-CP-SecurityInformation PRESENCE optional }|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-UE-Level-QoS-Parameters CRITICALITY ignore TYPE E-RABLevelQoSParameters PRESENCE optional}
,
...
}
@ -3136,4 +3280,45 @@ SecondaryRATDataUsageReportIEs S1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- UE RADIO CAPABILITY ID MAPPING PROCEDURE
--
-- **************************************************************
-- **************************************************************
--
-- UE Radio Capability ID Mapping Request
--
-- **************************************************************
UERadioCapabilityIDMappingRequest::= SEQUENCE {
protocolIEs ProtocolIE-Container { { UERadioCapabilityIDMappingRequestIEs} },
...
}
UERadioCapabilityIDMappingRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE mandatory },
...
}
-- **************************************************************
--
-- UE Radio Capability ID Mapping Response
--
-- **************************************************************
UERadioCapabilityIDMappingResponse ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { UERadioCapabilityIDMappingResponseIEs} },
...
}
UERadioCapabilityIDMappingResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE mandatory }|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@ -117,7 +117,12 @@ FROM S1AP-CommonDataTypes
UEInformationTransfer,
ENBCPRelocationIndication,
MMECPRelocationIndication,
SecondaryRATDataUsageReport
SecondaryRATDataUsageReport,
UERadioCapabilityIDMappingRequest,
UERadioCapabilityIDMappingResponse,
HandoverSuccess,
ENBEarlyStatusTransfer,
MMEEarlyStatusTransfer
FROM S1AP-PDU-Contents
@ -184,7 +189,11 @@ FROM S1AP-PDU-Contents
id-UEInformationTransfer,
id-eNBCPRelocationIndication,
id-MMECPRelocationIndication,
id-SecondaryRATDataUsageReport
id-SecondaryRATDataUsageReport,
id-UERadioCapabilityIDMapping,
id-HandoverSuccess,
id-eNBEarlyStatusTransfer,
id-MMEEarlyStatusTransfer
FROM S1AP-Constants;
@ -277,7 +286,8 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
e-RABModificationIndication |
uEContextModificationIndication |
uEContextSuspend |
uEContextResume
uEContextResume |
uERadioCapabilityIDMapping
}
S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
@ -323,7 +333,10 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
uEInformationTransfer |
eNBCPRelocationIndication |
mMECPRelocationIndication |
secondaryRATDataUsageReport
secondaryRATDataUsageReport |
handoverSuccess |
eNBEarlyStatusTransfer |
mMEEarlyStatusTransfer
}
-- **************************************************************
@ -738,5 +751,29 @@ secondaryRATDataUsageReport S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY ignore
}
uERadioCapabilityIDMapping S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE UERadioCapabilityIDMappingRequest
SUCCESSFUL OUTCOME UERadioCapabilityIDMappingResponse
PROCEDURE CODE id-UERadioCapabilityIDMapping
CRITICALITY reject
}
handoverSuccess S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE HandoverSuccess
PROCEDURE CODE id-HandoverSuccess
CRITICALITY ignore
}
eNBEarlyStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE ENBEarlyStatusTransfer
PROCEDURE CODE id-eNBEarlyStatusTransfer
CRITICALITY reject
}
mMEEarlyStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE MMEEarlyStatusTransfer
PROCEDURE CODE id-MMEEarlyStatusTransfer
CRITICALITY ignore
}
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.8.0 (2019-12)
-- 3GPP TS 36.413 V16.2.0 (2020-07)
-- B.2 ASN.1 definition
-- **************************************************************
--

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

@ -10,7 +10,7 @@
*
* Based on the RANAP dissector
*
* References: 3GPP TS 36.413 V15.8.0 (2019-12)
* References: 3GPP TS 36.413 V16.2.0 (2020-07)
*/
#include "config.h"
@ -58,6 +58,7 @@ static dissector_handle_t lppa_handle;
static dissector_handle_t bssgp_handle;
static dissector_handle_t lte_rrc_ue_radio_access_cap_info_handle;
static dissector_handle_t lte_rrc_ue_radio_access_cap_info_nb_handle;
static dissector_handle_t nr_rrc_ue_radio_access_cap_info_handle;
static dissector_handle_t lte_rrc_ue_radio_paging_info_handle;
static dissector_handle_t lte_rrc_ue_radio_paging_info_nb_handle;
@ -150,6 +151,13 @@ 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;
static int ett_s1ap_sMTC = -1;
static int ett_s1ap_threshRS_Index_r15 = -1;
static int ett_s1ap_sSBToMeasure = -1;
static int ett_s1ap_sSRSSIMeasurement = -1;
static int ett_s1ap_quantityConfigNR_R15 = -1;
static int ett_s1ap_blackCellsToAddModList = -1;
static int ett_s1ap_NB_IoT_RLF_Report_Container = -1;
#include "packet-s1ap-ett.c"
static expert_field ei_s1ap_number_pages_le15 = EI_INIT;
@ -323,6 +331,24 @@ s1ap_Packet_LossRate_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f %% (%u)", (float)v/10, v);
}
static void
s1ap_threshold_nr_rsrp_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", (gint32)v-156, v);
}
static void
s1ap_threshold_nr_rsrq_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-43, v);
}
static void
s1ap_threshold_nr_sinr_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-23, v);
}
static struct s1ap_private_data*
s1ap_get_private_data(packet_info *pinfo)
{
@ -472,10 +498,11 @@ proto_reg_handoff_s1ap(void)
bssgp_handle = find_dissector_add_dependency("bssgp", proto_s1ap);
lte_rrc_ue_radio_access_cap_info_handle = find_dissector_add_dependency("lte-rrc.ue_radio_access_cap_info", proto_s1ap);
lte_rrc_ue_radio_access_cap_info_nb_handle = find_dissector_add_dependency("lte-rrc.ue_radio_access_cap_info.nb", proto_s1ap);
nr_rrc_ue_radio_access_cap_info_handle = find_dissector_add_dependency("nr-rrc.ue_radio_access_cap_info", proto_s1ap);
lte_rrc_ue_radio_paging_info_handle = find_dissector_add_dependency("lte-rrc.ue_radio_paging_info", proto_s1ap);
lte_rrc_ue_radio_paging_info_nb_handle = find_dissector_add_dependency("lte-rrc.ue_radio_paging_info.nb", proto_s1ap);
dissector_add_for_decode_as("sctp.port", s1ap_handle);
dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID, s1ap_handle);
dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID, s1ap_handle);
Initialized=TRUE;
#include "packet-s1ap-dis-tab.c"
} else {
@ -726,6 +753,13 @@ void proto_register_s1ap(void) {
&ett_s1ap_NRencryptionAlgorithms,
&ett_s1ap_NRintegrityProtectionAlgorithms,
&ett_s1ap_UE_Application_Layer_Measurement_Capability,
&ett_s1ap_sMTC,
&ett_s1ap_threshRS_Index_r15,
&ett_s1ap_sSBToMeasure,
&ett_s1ap_sSRSSIMeasurement,
&ett_s1ap_quantityConfigNR_R15,
&ett_s1ap_blackCellsToAddModList,
&ett_s1ap_NB_IoT_RLF_Report_Container,
#include "packet-s1ap-ettarr.c"
};

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

@ -569,33 +569,31 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
if ((s1ap_is_nbiot_ue(actx->pinfo) && (g_s1ap_dissect_lte_container_as == S1AP_LTE_CONTAINER_AUTOMATIC)) ||
(g_s1ap_dissect_lte_container_as == S1AP_LTE_CONTAINER_NBIOT)) {
TRY {
dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
} else {
TRY {
dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
break;
case SUCCESSFUL_OUTCOME:
/* 9.2.1.8 Target eNB to Source eNB Transparent Container */
TRY {
dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
break;
default:
break;
@ -612,14 +610,13 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UE_HistoryInformationFromTheUE);
TRY {
dissect_lte_rrc_VisitedCellInfoList_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
TRY {
dissect_lte_rrc_VisitedCellInfoList_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.FN_BODY UERadioCapability VAL_PTR = &parameter_tvb
@ -631,9 +628,12 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
return offset;
if (g_s1ap_dissect_container) {
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
volatile dissector_handle_t handle;
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UERadioCapability);
if ((s1ap_is_nbiot_ue(actx->pinfo) && (g_s1ap_dissect_lte_container_as == S1AP_LTE_CONTAINER_AUTOMATIC)) ||
if (s1ap_data->protocol_ie_id == id_UERadioCapability_NR_Format) {
handle = nr_rrc_ue_radio_access_cap_info_handle;
} else if ((s1ap_is_nbiot_ue(actx->pinfo) && (g_s1ap_dissect_lte_container_as == S1AP_LTE_CONTAINER_AUTOMATIC)) ||
(g_s1ap_dissect_lte_container_as == S1AP_LTE_CONTAINER_NBIOT)) {
handle = lte_rrc_ue_radio_access_cap_info_nb_handle;
} else {
@ -800,7 +800,31 @@ if (gcsna_handle) {
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UE_RLF_Report_Container_for_extended_bands);
dissect_lte_rrc_RLF_Report_v9e0_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
TRY {
dissect_lte_rrc_RLF_Report_v9e0_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.FN_BODY NB-IoT-RLF-Report-Container VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_NB_IoT_RLF_Report_Container);
TRY {
dissect_lte_rrc_RLF_Report_NB_r16_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.FN_BODY TooEarlyInterRATHOReportReportFromEUTRAN/uERLFReportContainer VAL_PTR = &parameter_tvb
@ -814,13 +838,13 @@ if (gcsna_handle) {
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UE_RLF_Report_Container);
TRY {
dissect_lte_rrc_RLF_Report_r9_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
TRY {
dissect_lte_rrc_RLF_Report_r9_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.TYPE_ATTR
@ -865,9 +889,69 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
IntersystemMeasurementConfiguration/rSRP DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_threshold_nr_rsrp_fmt)
#.TYPE_ATTR
IntersystemMeasurementConfiguration/rSRQ DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_threshold_nr_rsrq_fmt)
#.TYPE_ATTR
IntersystemMeasurementConfiguration/sINR DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_threshold_nr_sinr_fmt)
#.TYPE_ATTR
InterSystemMeasurementParameters/measurementDuration DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
#.FN_BODY InterSystemMeasurementItem/sMTC VAL_PTR = &ssb_mtc_tvb
tvbuff_t *ssb_mtc_tvb = NULL;
%(DEFAULT_BODY)s
if (ssb_mtc_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_sMTC);
dissect_lte_rrc_MTC_SSB_NR_r15_PDU(ssb_mtc_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY InterSystemMeasurementItem/threshRS-Index-r15 VAL_PTR = &threshold_list_tvb
tvbuff_t *threshold_list_tvb = NULL;
%(DEFAULT_BODY)s
if (threshold_list_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_threshRS_Index_r15);
dissect_lte_rrc_ThresholdListNR_r15_PDU(threshold_list_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY InterSystemMeasurementItem/sSBToMeasure VAL_PTR = &ssb_to_meas_tvb
tvbuff_t *ssb_to_meas_tvb = NULL;
%(DEFAULT_BODY)s
if (ssb_to_meas_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_sSBToMeasure);
dissect_lte_rrc_SSB_ToMeasure_r15_PDU(ssb_to_meas_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY InterSystemMeasurementItem/sSRSSIMeasurement VAL_PTR = &ss_rssi_meas_tvb
tvbuff_t *ss_rssi_meas_tvb = NULL;
%(DEFAULT_BODY)s
if (ss_rssi_meas_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_sSRSSIMeasurement);
dissect_lte_rrc_SS_RSSI_Measurement_r15_PDU(ss_rssi_meas_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY InterSystemMeasurementItem/quantityConfigNR-R15 VAL_PTR = &quantity_config_nr_tvb
tvbuff_t *quantity_config_nr_tvb = NULL;
%(DEFAULT_BODY)s
if (quantity_config_nr_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_quantityConfigNR_R15);
dissect_lte_rrc_QuantityConfigNR_r15_PDU(quantity_config_nr_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY InterSystemMeasurementItem/blackCellsToAddModList VAL_PTR = &black_cells_list_tvb
tvbuff_t *black_cells_list_tvb = NULL;
%(DEFAULT_BODY)s
if (black_cells_list_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_blackCellsToAddModList);
dissect_lte_rrc_CellsToAddModListNR_r15_PDU(black_cells_list_tvb, actx->pinfo, subtree, NULL);
}
#.TYPE_ATTR
MME-Code TYPE = FT_UINT8 DISPLAY = BASE_DEC_HEX
#.FN_BODY MME-Code VAL_PTR = &parameter_tvb HF_INDEX = -1
@ -942,12 +1026,12 @@ TimeSinceSecondaryNodeRelease TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_UNIT_STRING S
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_LastVisitedNGRANCellInformation);
TRY {
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.FN_BODY LastVisitedUTRANCellInformation VAL_PTR = &parameter_tvb
@ -960,13 +1044,12 @@ TimeSinceSecondaryNodeRelease TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_UNIT_STRING S
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_LastVisitedUTRANCellInformation);
TRY {
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
CATCH_BOUNDS_ERRORS {
show_exception(parameter_tvb, actx->pinfo, subtree, EXCEPT_CODE, GET_MESSAGE);
}
ENDTRY;
}
#.TYPE_ATTR
@ -1013,6 +1096,9 @@ RepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
s1ap_data->data_coding_scheme = dissect_cbs_data_coding_scheme(parameter_tvb, actx->pinfo, subtree, 0);
}
#.TYPE_ATTR
DataSize DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_bits
#.FN_BODY WarningMessageContents VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
@ -1409,6 +1495,9 @@ id-UEInformationTransfer ProcedureCode
id-eNBCPRelocationIndication ProcedureCode
id-MMECPRelocationIndication ProcedureCode
id-SecondaryRATDataUsageReport ProcedureCode
id-HandoverSuccess ProcedureCode
id-eNBEarlyStatusTransfer ProcedureCode
id-MMEEarlyStatusTransfer ProcedureCode
# ProtocolIE-ID
id-MME-UE-S1AP-ID ProtocolIE-ID
@ -1689,6 +1778,32 @@ id-EN-DCSONConfigurationTransfer-MCT ProtocolIE-ID
id-IMSvoiceEPSfallbackfrom5G ProtocolIE-ID
id-TimeSinceSecondaryNodeRelease ProtocolIE-ID
id-RequestTypeAdditionalInfo ProtocolIE-ID
id-AdditionalRRMPriorityIndex ProtocolIE-ID
id-ContextatSource ProtocolIE-ID
id-IAB-Authorized ProtocolIE-ID
id-IAB-Node-Indication ProtocolIE-ID
id-IAB-Supported ProtocolIE-ID
id-DataSize ProtocolIE-ID
id-Ethernet-Type ProtocolIE-ID
id-NRV2XServicesAuthorized ProtocolIE-ID
id-NRUESidelinkAggregateMaximumBitrate ProtocolIE-ID
id-PC5QoSParameters ProtocolIE-ID
id-IntersystemSONConfigurationTransferMCT ProtocolIE-ID
id-IntersystemSONConfigurationTransferECT ProtocolIE-ID
id-IntersystemMeasurementConfiguration ProtocolIE-ID
id-SourceNodeID ProtocolIE-ID
id-NB-IoT-RLF-Report-Container ProtocolIE-ID
id-UERadioCapabilityID ProtocolIE-ID
id-UERadioCapability-NR-Format ProtocolIE-ID
id-MDTConfigurationNR ProtocolIE-ID
id-DAPSRequestInfo ProtocolIE-ID
id-DAPSResponseInfoList ProtocolIE-ID
id-DAPSResponseInfoItem ProtocolIE-ID
id-NotifySourceeNB ProtocolIE-ID
id-eNB-EarlyStatusTransfer-TransparentContainer ProtocolIE-ID
id-Bearers-SubjectToEarlyStatusTransfer-Item ProtocolIE-ID
id-WUS-Assistance-Information ProtocolIE-ID
id-NB-IoT-PagingDRX ProtocolIE-ID
#.END
@ -1919,6 +2034,24 @@ ConnectedengNBList N s1ap.ies id-ConnectedengNBToRe
EN-DCSONConfigurationTransfer N s1ap.ies id-EN-DCSONConfigurationTransfer-ECT
EN-DCSONConfigurationTransfer N s1ap.ies id-EN-DCSONConfigurationTransfer-MCT
TimeSinceSecondaryNodeRelease N s1ap.ies id-TimeSinceSecondaryNodeRelease
AdditionalRRMPriorityIndex N s1ap.ies id-AdditionalRRMPriorityIndex
IAB-Authorized N s1ap.ies id-IAB-Authorized
IAB-Node-Indication N s1ap.ies id-IAB-Node-Indication
IAB-Supported N s1ap.ies id-IAB-Supported
DataSize N s1ap.ies id-DataSize
NRV2XServicesAuthorized N s1ap.ies id-NRV2XServicesAuthorized
NRUESidelinkAggregateMaximumBitrate N s1ap.ies id-NRUESidelinkAggregateMaximumBitrate
PC5QoSParameters N s1ap.ies id-PC5QoSParameters
IntersystemSONConfigurationTransfer N s1ap.ies id-IntersystemSONConfigurationTransferMCT
IntersystemSONConfigurationTransfer N s1ap.ies id-IntersystemSONConfigurationTransferECT
UERadioCapabilityID N s1ap.ies id-UERadioCapabilityID
UERadioCapability N s1ap.ies id-UERadioCapability-NR-Format
DAPSResponseInfoItem N s1ap.ies id-DAPSResponseInfoItem
NotifySourceeNB N s1ap.ies id-NotifySourceeNB
ENB-EarlyStatusTransfer-TransparentContainer N s1ap.ies id-eNB-EarlyStatusTransfer-TransparentContainer
Bearers-SubjectToEarlyStatusTransfer-Item N s1ap.ies id-Bearers-SubjectToEarlyStatusTransfer-Item
WUS-Assistance-Information N s1ap.ies id-WUS-Assistance-Information
NB-IoT-PagingDRX N s1ap.ies id-NB-IoT-PagingDRX
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -1980,6 +2113,14 @@ PLMNidentity N s1ap.extension id-LastNG-RANPLMNIdenti
PSCellInformation N s1ap.extension id-PSCellInformation
IMSvoiceEPSfallbackfrom5G N s1ap.extension id-IMSvoiceEPSfallbackfrom5G
RequestTypeAdditionalInfo N s1ap.extension id-TimeSinceSecondaryNodeRelease
ContextatSource N s1ap.extension id-ContextatSource
Ethernet-Type N s1ap.extension id-Ethernet-Type
IntersystemMeasurementConfiguration N s1ap.extension id-IntersystemMeasurementConfiguration
SourceNodeID N s1ap.extension id-SourceNodeID
NB-IoT-RLF-Report-Container N s1ap.extension id-NB-IoT-RLF-Report-Container
MDT-ConfigurationNR N s1ap.extension id-MDTConfigurationNR
DAPSRequestInfo N s1ap.extension id-DAPSRequestInfo
DAPSResponseInfoList N s1ap.extension id-DAPSResponseInfoList
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation
@ -2138,6 +2279,15 @@ MMECPRelocationIndication N s1ap.proc.imsg id-MMECPRelocationIndic
SecondaryRATDataUsageReport N s1ap.proc.imsg id-SecondaryRATDataUsageReport
UERadioCapabilityIDMappingRequest N s1ap.proc.imsg id-UERadioCapabilityIDMapping
UERadioCapabilityIDMappingResponse N s1ap.proc.sout id-UERadioCapabilityIDMapping
HandoverSuccess N s1ap.proc.imsg id-HandoverSuccess
ENBEarlyStatusTransfer N s1ap.proc.imsg id-eNBEarlyStatusTransfer
MMEEarlyStatusTransfer N s1ap.proc.imsg id-MMEEarlyStatusTransfer
#.FN_HDR HandoverRequired
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequired");
@ -2325,6 +2475,16 @@ SecondaryRATDataUsageReport N s1ap.proc.imsg id-SecondaryRATDataUsag
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MMECPRelocationIndication");
#.FN_HDR SecondaryRATDataUsageReport
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport");
#.FN_HDR UERadioCapabilityIDMappingRequest
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingRequest");
#.FN_HDR UERadioCapabilityIDMappingResponse
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingResponse");
#.FN_HDR HandoverSuccess
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverSuccess");
#.FN_HDR ENBEarlyStatusTransfer
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBEarlyStatusTransfer");
#.FN_HDR MMEEarlyStatusTransfer
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MMEEarlyStatusTransfer");
#.END
# Whenever a Cause appears, look up the reason and show it in the Info column

105
epan/dissectors/packet-lte-rrc.c
View File

@ -351,8 +351,14 @@ static int hf_lte_rrc_lte_rrc_UECapabilityEnquiry_PDU = -1; /* UECapabilityEnqu
static int hf_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */
static int hf_lte_rrc_lte_rrc_RLF_Report_r9_PDU = -1; /* RLF_Report_r9 */
static int hf_lte_rrc_lte_rrc_RLF_Report_v9e0_PDU = -1; /* RLF_Report_v9e0 */
static int hf_lte_rrc_lte_rrc_ThresholdListNR_r15_PDU = -1; /* ThresholdListNR_r15 */
static int hf_lte_rrc_lte_rrc_CellsToAddModListNR_r15_PDU = -1; /* CellsToAddModListNR_r15 */
static int hf_lte_rrc_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU = -1; /* MeasResultSCG_FailureMRDC_r15 */
static int hf_lte_rrc_lte_rrc_MeasResultList3EUTRA_r15_PDU = -1; /* MeasResultList3EUTRA_r15 */
static int hf_lte_rrc_lte_rrc_MTC_SSB_NR_r15_PDU = -1; /* MTC_SSB_NR_r15 */
static int hf_lte_rrc_lte_rrc_QuantityConfigNR_r15_PDU = -1; /* QuantityConfigNR_r15 */
static int hf_lte_rrc_lte_rrc_SS_RSSI_Measurement_r15_PDU = -1; /* SS_RSSI_Measurement_r15 */
static int hf_lte_rrc_lte_rrc_SSB_ToMeasure_r15_PDU = -1; /* SSB_ToMeasure_r15 */
static int hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU = -1; /* UE_EUTRA_Capability */
static int hf_lte_rrc_lte_rrc_V2X_BandParameters_r14_PDU = -1; /* V2X_BandParameters_r14 */
static int hf_lte_rrc_lte_rrc_V2X_BandParameters_v1530_PDU = -1; /* V2X_BandParameters_v1530 */
@ -378,6 +384,7 @@ static int hf_lte_rrc_DL_DCCH_Message_NB_PDU = -1; /* DL_DCCH_Message_NB */
static int hf_lte_rrc_UL_CCCH_Message_NB_PDU = -1; /* UL_CCCH_Message_NB */
static int hf_lte_rrc_SC_MCCH_Message_NB_PDU = -1; /* SC_MCCH_Message_NB */
static int hf_lte_rrc_UL_DCCH_Message_NB_PDU = -1; /* UL_DCCH_Message_NB */
static int hf_lte_rrc_lte_rrc_RLF_Report_NB_r16_PDU = -1; /* RLF_Report_NB_r16 */
static int hf_lte_rrc_HandoverPreparationInformation_v9j0_IEs_PDU = -1; /* HandoverPreparationInformation_v9j0_IEs */
static int hf_lte_rrc_SCG_Config_v12i0b_IEs_PDU = -1; /* SCG_Config_v12i0b_IEs */
static int hf_lte_rrc_MBMSInterestIndication_r11_PDU = -1; /* MBMSInterestIndication_r11 */
@ -125780,6 +125787,26 @@ int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_ThresholdListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_ThresholdListNR_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_ThresholdListNR_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_CellsToAddModListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_CellsToAddModListNR_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_CellsToAddModListNR_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@ -125800,6 +125827,46 @@ int dissect_lte_rrc_MeasResultList3EUTRA_r15_PDU(tvbuff_t *tvb _U_, packet_info
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_MTC_SSB_NR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_MTC_SSB_NR_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_MTC_SSB_NR_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_QuantityConfigNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_QuantityConfigNR_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_QuantityConfigNR_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_SS_RSSI_Measurement_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_SS_RSSI_Measurement_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SS_RSSI_Measurement_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_SSB_ToMeasure_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_SSB_ToMeasure_r15(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SSB_ToMeasure_r15_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@ -126050,6 +126117,16 @@ static int dissect_UL_DCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_RLF_Report_NB_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_RLF_Report_NB_r16(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_RLF_Report_NB_r16_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_HandoverPreparationInformation_v9j0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@ -126803,6 +126880,14 @@ void proto_register_lte_rrc(void) {
{ "RLF-Report-v9e0", "lte-rrc.RLF_Report_v9e0_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_ThresholdListNR_r15_PDU,
{ "ThresholdListNR-r15", "lte-rrc.ThresholdListNR_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_CellsToAddModListNR_r15_PDU,
{ "CellsToAddModListNR-r15", "lte-rrc.CellsToAddModListNR_r15",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU,
{ "MeasResultSCG-FailureMRDC-r15", "lte-rrc.MeasResultSCG_FailureMRDC_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -126811,6 +126896,22 @@ void proto_register_lte_rrc(void) {
{ "MeasResultList3EUTRA-r15", "lte-rrc.MeasResultList3EUTRA_r15",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_MTC_SSB_NR_r15_PDU,
{ "MTC-SSB-NR-r15", "lte-rrc.MTC_SSB_NR_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_QuantityConfigNR_r15_PDU,
{ "QuantityConfigNR-r15", "lte-rrc.QuantityConfigNR_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_SS_RSSI_Measurement_r15_PDU,
{ "SS-RSSI-Measurement-r15", "lte-rrc.SS_RSSI_Measurement_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_SSB_ToMeasure_r15_PDU,
{ "SSB-ToMeasure-r15", "lte-rrc.SSB_ToMeasure_r15",
FT_UINT32, BASE_DEC, VALS(lte_rrc_SSB_ToMeasure_r15_vals), 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU,
{ "UE-EUTRA-Capability", "lte-rrc.UE_EUTRA_Capability_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -126911,6 +127012,10 @@ void proto_register_lte_rrc(void) {
{ "UL-DCCH-Message-NB", "lte-rrc.UL_DCCH_Message_NB_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_RLF_Report_NB_r16_PDU,
{ "RLF-Report-NB-r16", "lte-rrc.RLF_Report_NB_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_HandoverPreparationInformation_v9j0_IEs_PDU,
{ "HandoverPreparationInformation-v9j0-IEs", "lte-rrc.HandoverPreparationInformation_v9j0_IEs_element",
FT_NONE, BASE_NONE, NULL, 0,

7
epan/dissectors/packet-lte-rrc.h
View File

@ -37,8 +37,14 @@ int dissect_lte_rrc_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_in
int dissect_lte_rrc_UECapabilityEnquiry_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_ThresholdListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_CellsToAddModListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_MeasResultList3EUTRA_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_MTC_SSB_NR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_QuantityConfigNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SS_RSSI_Measurement_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SSB_ToMeasure_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_V2X_BandParameters_r14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_V2X_BandParameters_v1530_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@ -51,6 +57,7 @@ int dissect_lte_rrc_VisitedCellInfoList_r12_PDU(tvbuff_t *tvb _U_, packet_info *
int dissect_lte_rrc_VisitedCellInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UEPagingCoverageInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_NB_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
/*--- End of included file: packet-lte-rrc-exp.h ---*/
#line 17 "./asn1/lte-rrc/packet-lte-rrc-template.h"

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

File diff suppressed because it is too large Load Diff