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

NGAP: upgrade dissector to v17.3.0

This commit is contained in:
Pascal Quantin 2023-01-11 11:25:21 +01:00 committed by A Wireshark GitLab Utility
parent f2cdd8bbc3
commit 20a8a8eb0f
9 changed files with 218 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.6 Common Definitions
-- **************************************************************
--

167
epan/dissectors/asn1/ngap/NGAP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -126,88 +126,89 @@ maxProtocolIEs INTEGER ::= 65535
--
-- **************************************************************
maxnoofAllowedAreas INTEGER ::= 16
maxnoofAllowedCAGsperPLMN INTEGER ::= 256
maxnoofAllowedS-NSSAIs INTEGER ::= 8
maxnoofBluetoothName INTEGER ::= 4
maxnoofBPLMNs INTEGER ::= 12
maxnoofCAGSperCell INTEGER ::= 64
maxnoofCellIDforMDT INTEGER ::= 32
maxnoofCellIDforWarning INTEGER ::= 65535
maxnoofCellinAoI INTEGER ::= 256
maxnoofCellinEAI INTEGER ::= 65535
maxnoofCellinTAI INTEGER ::= 65535
maxnoofCellsforMBS INTEGER ::= 8192
maxnoofCellsingNB INTEGER ::= 16384
maxnoofCellsinngeNB INTEGER ::= 256
maxnoofCellsinNGRANNode INTEGER ::= 16384
maxnoofCellsinUEHistoryInfo INTEGER ::= 16
maxnoofCellsUEMovingTrajectory INTEGER ::= 16
maxnoofDRBs INTEGER ::= 32
maxnoofEmergencyAreaID INTEGER ::= 65535
maxnoofEAIforRestart INTEGER ::= 256
maxnoofEPLMNs INTEGER ::= 15
maxnoofEPLMNsPlusOne INTEGER ::= 16
maxnoofE-RABs INTEGER ::= 256
maxnoofErrors INTEGER ::= 256
maxnoofExtSliceItems INTEGER ::= 65535
maxnoofForbTACs INTEGER ::= 4096
maxnoofFreqforMDT INTEGER ::= 8
maxnoofMBSAreaSessionIDs INTEGER ::= 256
maxnoofMBSFSAs INTEGER ::= 64
maxnoofMBSQoSFlows INTEGER ::= 64
maxnoofMBSSessions INTEGER ::= 32
maxnoofMBSSessionsofUE INTEGER ::= 256
maxnoofMBSServiceAreaInformation INTEGER ::= 256
maxnoofMDTPLMNs INTEGER ::= 16
maxnoofMRBs INTEGER ::= 32
maxnoofMultiConnectivity INTEGER ::= 4
maxnoofMultiConnectivityMinusOne INTEGER ::= 3
maxnoofNeighPCIforMDT INTEGER ::= 32
maxnoofNGAPIESupportInfo INTEGER ::= 32
maxnoofNGConnectionsToReset INTEGER ::= 65536
maxnoofNRCellBands INTEGER ::= 32
maxnoofNSAGs INTEGER ::= 256
maxnoofPagingAreas INTEGER ::= 64
maxnoofPC5QoSFlows INTEGER ::= 2048
maxnoofPDUSessions INTEGER ::= 256
maxnoofPLMNs INTEGER ::= 12
maxnoofAllowedAreas INTEGER ::= 16
maxnoofAllowedCAGsperPLMN INTEGER ::= 256
maxnoofAllowedS-NSSAIs INTEGER ::= 8
maxnoofBluetoothName INTEGER ::= 4
maxnoofBPLMNs INTEGER ::= 12
maxnoofCAGSperCell INTEGER ::= 64
maxnoofCellIDforMDT INTEGER ::= 32
maxnoofCellIDforWarning INTEGER ::= 65535
maxnoofCellinAoI INTEGER ::= 256
maxnoofCellinEAI INTEGER ::= 65535
maxnoofCellinTAI INTEGER ::= 65535
maxnoofCellsforMBS INTEGER ::= 8192
maxnoofCellsingNB INTEGER ::= 16384
maxnoofCellsinngeNB INTEGER ::= 256
maxnoofCellsinNGRANNode INTEGER ::= 16384
maxnoofCellsinUEHistoryInfo INTEGER ::= 16
maxnoofCellsUEMovingTrajectory INTEGER ::= 16
maxnoofDRBs INTEGER ::= 32
maxnoofEmergencyAreaID INTEGER ::= 65535
maxnoofEAIforRestart INTEGER ::= 256
maxnoofEPLMNs INTEGER ::= 15
maxnoofEPLMNsPlusOne INTEGER ::= 16
maxnoofE-RABs INTEGER ::= 256
maxnoofErrors INTEGER ::= 256
maxnoofExtSliceItems INTEGER ::= 65535
maxnoofForbTACs INTEGER ::= 4096
maxnoofFreqforMDT INTEGER ::= 8
maxnoofMBSAreaSessionIDs INTEGER ::= 256
maxnoofMBSFSAs INTEGER ::= 64
maxnoofMBSQoSFlows INTEGER ::= 64
maxnoofMBSSessions INTEGER ::= 32
maxnoofMBSSessionsofUE INTEGER ::= 256
maxnoofMBSServiceAreaInformation INTEGER ::= 256
maxnoofMDTPLMNs INTEGER ::= 16
maxnoofMRBs INTEGER ::= 32
maxnoofMultiConnectivity INTEGER ::= 4
maxnoofMultiConnectivityMinusOne INTEGER ::= 3
maxnoofNeighPCIforMDT INTEGER ::= 32
maxnoofNGAPIESupportInfo INTEGER ::= 32
maxnoofNGConnectionsToReset INTEGER ::= 65536
maxnoofNRCellBands INTEGER ::= 32
maxnoofNSAGs INTEGER ::= 256
maxnoofPagingAreas INTEGER ::= 64
maxnoofPC5QoSFlows INTEGER ::= 2048
maxnoofPDUSessions INTEGER ::= 256
maxnoofPLMNs INTEGER ::= 12
maxnoofPSCellsPerPrimaryCellinUEHistoryInfo INTEGER ::= 8
maxnoofQosFlows INTEGER ::= 64
maxnoofQosParaSets INTEGER ::= 8
maxnoofRANNodeinAoI INTEGER ::= 64
maxnoofRecommendedCells INTEGER ::= 16
maxnoofRecommendedRANNodes INTEGER ::= 16
maxnoofAoI INTEGER ::= 64
maxnoofReportedCells INTEGER ::= 256
maxnoofSensorName INTEGER ::= 3
maxnoofServedGUAMIs INTEGER ::= 256
maxnoofSliceItems INTEGER ::= 1024
maxnoofSuccessfulHOReports INTEGER ::= 64
maxnoofTACs INTEGER ::= 256
maxnoofTACsinNTN INTEGER ::= 12
maxnoofTAforMDT INTEGER ::= 8
maxnoofTAIforInactive INTEGER ::= 16
maxnoofTAIforMBS INTEGER ::= 1024
maxnoofTAIforPaging INTEGER ::= 16
maxnoofTAIforRestart INTEGER ::= 2048
maxnoofTAIforWarning INTEGER ::= 65535
maxnoofTAIinAoI INTEGER ::= 16
maxnoofTimePeriods INTEGER ::= 2
maxnoofTNLAssociations INTEGER ::= 32
maxnoofUEsforPaging INTEGER ::= 4096
maxnoofWLANName INTEGER ::= 4
maxnoofXnExtTLAs INTEGER ::= 16
maxnoofXnGTP-TLAs INTEGER ::= 16
maxnoofXnTLAs INTEGER ::= 2
maxnoofCandidateCells INTEGER ::= 32
maxnoofTargetS-NSSAIs INTEGER ::= 8
maxNRARFCN INTEGER ::= 3279165
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofPLMNforQMC INTEGER ::= 16
maxnoofUEAppLayerMeas INTEGER ::= 16
maxnoofSNSSAIforQMC INTEGER ::= 16
maxnoofTAforQMC INTEGER ::= 8
maxnoofQosFlows INTEGER ::= 64
maxnoofQosParaSets INTEGER ::= 8
maxnoofRANNodeinAoI INTEGER ::= 64
maxnoofRecommendedCells INTEGER ::= 16
maxnoofRecommendedRANNodes INTEGER ::= 16
maxnoofAoI INTEGER ::= 64
maxnoofReportedCells INTEGER ::= 256
maxnoofSensorName INTEGER ::= 3
maxnoofServedGUAMIs INTEGER ::= 256
maxnoofSliceItems INTEGER ::= 1024
maxnoofSuccessfulHOReports INTEGER ::= 64
maxnoofTACs INTEGER ::= 256
maxnoofTACsinNTN INTEGER ::= 12
maxnoofTAforMDT INTEGER ::= 8
maxnoofTAIforInactive INTEGER ::= 16
maxnoofTAIforMBS INTEGER ::= 1024
maxnoofTAIforPaging INTEGER ::= 16
maxnoofTAIforRestart INTEGER ::= 2048
maxnoofTAIforWarning INTEGER ::= 65535
maxnoofTAIinAoI INTEGER ::= 16
maxnoofTimePeriods INTEGER ::= 2
maxnoofTNLAssociations INTEGER ::= 32
maxnoofUEsforPaging INTEGER ::= 4096
maxnoofWLANName INTEGER ::= 4
maxnoofXnExtTLAs INTEGER ::= 16
maxnoofXnGTP-TLAs INTEGER ::= 16
maxnoofXnTLAs INTEGER ::= 2
maxnoofCandidateCells INTEGER ::= 32
maxnoofTargetS-NSSAIs INTEGER ::= 8
maxNRARFCN INTEGER ::= 3279165
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofPLMNforQMC INTEGER ::= 16
maxnoofUEAppLayerMeas INTEGER ::= 16
maxnoofSNSSAIforQMC INTEGER ::= 16
maxnoofTAforQMC INTEGER ::= 8
maxnoofThresholdsForExcessPacketDelay INTEGER ::= 255
-- **************************************************************
--
@ -560,7 +561,7 @@ maxProtocolIEs INTEGER ::= 65535
id-M6ReportAmount ProtocolIE-ID ::= 338
id-M7ReportAmount ProtocolIE-ID ::= 339
id-IncludeBeamMeasurementsIndication ProtocolIE-ID ::= 340
id-M6DelayThreshold ProtocolIE-ID ::= 341
id-ExcessPacketDelayThresholdConfiguration ProtocolIE-ID ::= 341
id-PagingCause ProtocolIE-ID ::= 342
id-PagingCauseIndicationForVoiceService ProtocolIE-ID ::= 343
id-PEIPSassistanceInformation ProtocolIE-ID ::= 344

2
epan/dissectors/asn1/ngap/NGAP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.8 Container Definitions
-- **************************************************************
--

29
epan/dissectors/asn1/ngap/NGAP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -67,7 +67,7 @@ IMPORTS
id-M4ReportAmount,
id-M5ReportAmount,
id-M6ReportAmount,
id-M6DelayThreshold,
id-ExcessPacketDelayThresholdConfiguration,
id-M7ReportAmount,
id-MaximumIntegrityProtectedDataRate-DL,
id-MBS-AreaSessionID,
@ -241,7 +241,8 @@ IMPORTS
maxnoofWLANName,
maxnoofXnExtTLAs,
maxnoofXnGTP-TLAs,
maxnoofXnTLAs
maxnoofXnTLAs,
maxnoofThresholdsForExcessPacketDelay
FROM NGAP-Constants
@ -1721,6 +1722,24 @@ EventType ::= ENUMERATED {
...
}
ExcessPacketDelayThresholdConfiguration ::= SEQUENCE (SIZE(1..maxnoofThresholdsForExcessPacketDelay)) OF ExcessPacketDelayThresholdItem
ExcessPacketDelayThresholdItem ::= SEQUENCE {
fiveQi FiveQI,
excessPacketDelayThresholdValue ExcessPacketDelayThresholdValue,
iE-Extensions ProtocolExtensionContainer { { ExcessPacketDelayThresholdItem-ExtIEs} } OPTIONAL,
...
}
ExcessPacketDelayThresholdItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
...
}
ExcessPacketDelayThresholdValue ::= ENUMERATED {
ms0dot25, ms0dot5, ms1, ms2, ms4, ms5, ms10, ms20, ms30, ms40, ms50, ms60, ms70, ms80, ms90, ms100, ms150, ms300, ms500,
...
}
ExpectedActivityPeriod ::= INTEGER (1..30|40|50|60|80|100|120|150|180|181, ...)
ExpectedHOInterval ::= ENUMERATED {
@ -3642,12 +3661,10 @@ M6Configuration ::= SEQUENCE {
M6Configuration-ExtIEs NGAP-PROTOCOL-EXTENSION ::= {
{ ID id-M6ReportAmount CRITICALITY ignore EXTENSION M6ReportAmountMDT PRESENCE optional }|
{ ID id-M6DelayThreshold CRITICALITY ignore EXTENSION M6DelayThreshold PRESENCE optional },
-- The above IE shall be present if the M6 Links to Log IE is set to the value “uplink” or “both-uplink-and-downlink”
{ ID id-ExcessPacketDelayThresholdConfiguration CRITICALITY ignore EXTENSION ExcessPacketDelayThresholdConfiguration PRESENCE optional },
...
}
M6DelayThreshold ::= ENUMERATED {ms0dot25, ms0dot5, ms1, ms2, ms4, ms10, ms20, ms50, ms100, ms500, ...}
M6ReportAmountMDT ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity, ...}

5
epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -529,7 +529,8 @@ PDUSessionResourceSetupResponseIEs NGAP-PROTOCOL-IES ::= {
{ ID id-RAN-UE-NGAP-ID CRITICALITY ignore TYPE RAN-UE-NGAP-ID PRESENCE mandatory }|
{ ID id-PDUSessionResourceSetupListSURes CRITICALITY ignore TYPE PDUSessionResourceSetupListSURes PRESENCE optional }|
{ ID id-PDUSessionResourceFailedToSetupListSURes CRITICALITY ignore TYPE PDUSessionResourceFailedToSetupListSURes PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional },
...
}

2
epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.413 V17.2.0 (2022-09)
-- 3GPP TS 38.413 V17.3.0 (2022-12)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--

4
epan/dissectors/asn1/ngap/ngap.cnf
View File

@ -1652,7 +1652,7 @@ id-M5ReportAmount ProtocolIE-ID
id-M6ReportAmount ProtocolIE-ID
id-M7ReportAmount ProtocolIE-ID
id-IncludeBeamMeasurementsIndication ProtocolIE-ID
id-M6DelayThreshold ProtocolIE-ID
id-ExcessPacketDelayThresholdConfiguration ProtocolIE-ID
id-PagingCause ProtocolIE-ID
id-PagingCauseIndicationForVoiceService ProtocolIE-ID
id-PEIPSassistanceInformation ProtocolIE-ID
@ -2036,7 +2036,7 @@ M5ReportAmountMDT N ngap.extension id-M5Rep
M6ReportAmountMDT N ngap.extension id-M6ReportAmount
M7ReportAmountMDT N ngap.extension id-M7ReportAmount
IncludeBeamMeasurementsIndication N ngap.extension id-IncludeBeamMeasurementsIndication
M6DelayThreshold N ngap.extension id-M6DelayThreshold
ExcessPacketDelayThresholdConfiguration N ngap.extension id-ExcessPacketDelayThresholdConfiguration
PagingCauseIndicationForVoiceService N ngap.extension id-PagingCauseIndicationForVoiceService
PEIPSassistanceInformation N ngap.extension id-PEIPSassistanceInformation
TAINSAGSupportList N ngap.extension id-TAINSAGSupportList

4
epan/dissectors/asn1/ngap/packet-ngap-template.c
View File

@ -1,7 +1,7 @@
/* packet-ngap.c
* Routines for NG-RAN NG Application Protocol (NGAP) packet dissection
* Copyright 2018, Anders Broman <anders.broman@ericsson.com>
* Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2023, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -9,7 +9,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.413 v17.2.0 (2022-09)
* References: 3GPP TS 38.413 v17.3.0 (2022-12)
*/
#include "config.h"

143
epan/dissectors/packet-ngap.c
View File

@ -6,7 +6,7 @@
/* packet-ngap.c
* Routines for NG-RAN NG Application Protocol (NGAP) packet dissection
* Copyright 2018, Anders Broman <anders.broman@ericsson.com>
* Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2023, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -14,7 +14,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.413 v17.2.0 (2022-09)
* References: 3GPP TS 38.413 v17.3.0 (2022-12)
*/
#include "config.h"
@ -156,6 +156,7 @@ static int proto_json = -1;
#define maxnoofUEAppLayerMeas 16
#define maxnoofSNSSAIforQMC 16
#define maxnoofTAforQMC 8
#define maxnoofThresholdsForExcessPacketDelay 255
typedef enum _ProcedureCode_enum {
id_AMFConfigurationUpdate = 0,
@ -578,7 +579,7 @@ typedef enum _ProtocolIE_ID_enum {
id_M6ReportAmount = 338,
id_M7ReportAmount = 339,
id_IncludeBeamMeasurementsIndication = 340,
id_M6DelayThreshold = 341,
id_ExcessPacketDelayThresholdConfiguration = 341,
id_PagingCause = 342,
id_PagingCauseIndicationForVoiceService = 343,
id_PEIPSassistanceInformation = 344,
@ -743,6 +744,7 @@ static int hf_ngap_EndpointIPAddressAndPort_PDU = -1; /* EndpointIPAddressAndPo
static int hf_ngap_EndIndication_PDU = -1; /* EndIndication */
static int hf_ngap_EUTRA_CGI_PDU = -1; /* EUTRA_CGI */
static int hf_ngap_EUTRA_PagingeDRXInformation_PDU = -1; /* EUTRA_PagingeDRXInformation */
static int hf_ngap_ExcessPacketDelayThresholdConfiguration_PDU = -1; /* ExcessPacketDelayThresholdConfiguration */
static int hf_ngap_ExpectedUEActivityBehaviour_PDU = -1; /* ExpectedUEActivityBehaviour */
static int hf_ngap_Extended_AMFName_PDU = -1; /* Extended_AMFName */
static int hf_ngap_ExtendedPacketDelayBudget_PDU = -1; /* ExtendedPacketDelayBudget */
@ -812,7 +814,6 @@ static int hf_ngap_MulticastGroupPagingAreaList_PDU = -1; /* MulticastGroupPagi
static int hf_ngap_IncludeBeamMeasurementsIndication_PDU = -1; /* IncludeBeamMeasurementsIndication */
static int hf_ngap_M4ReportAmountMDT_PDU = -1; /* M4ReportAmountMDT */
static int hf_ngap_M5ReportAmountMDT_PDU = -1; /* M5ReportAmountMDT */
static int hf_ngap_M6DelayThreshold_PDU = -1; /* M6DelayThreshold */
static int hf_ngap_M6ReportAmountMDT_PDU = -1; /* M6ReportAmountMDT */
static int hf_ngap_M7ReportAmountMDT_PDU = -1; /* M7ReportAmountMDT */
static int hf_ngap_NAS_PDU_PDU = -1; /* NAS_PDU */
@ -1396,6 +1397,9 @@ static int hf_ngap_EUTRA_CGIList_item = -1; /* EUTRA_CGI */
static int hf_ngap_EUTRA_CGIListForWarning_item = -1; /* EUTRA_CGI */
static int hf_ngap_eUTRA_paging_eDRX_Cycle = -1; /* EUTRA_Paging_eDRX_Cycle */
static int hf_ngap_eUTRA_paging_Time_Window = -1; /* EUTRA_Paging_Time_Window */
static int hf_ngap_ExcessPacketDelayThresholdConfiguration_item = -1; /* ExcessPacketDelayThresholdItem */
static int hf_ngap_fiveQi = -1; /* FiveQI */
static int hf_ngap_excessPacketDelayThresholdValue = -1; /* ExcessPacketDelayThresholdValue */
static int hf_ngap_expectedActivityPeriod = -1; /* ExpectedActivityPeriod */
static int hf_ngap_expectedIdlePeriod = -1; /* ExpectedIdlePeriod */
static int hf_ngap_sourceOfUEActivityBehaviourInformation = -1; /* SourceOfUEActivityBehaviourInformation */
@ -2293,6 +2297,8 @@ static gint ett_ngap_EUTRA_CGI = -1;
static gint ett_ngap_EUTRA_CGIList = -1;
static gint ett_ngap_EUTRA_CGIListForWarning = -1;
static gint ett_ngap_EUTRA_PagingeDRXInformation = -1;
static gint ett_ngap_ExcessPacketDelayThresholdConfiguration = -1;
static gint ett_ngap_ExcessPacketDelayThresholdItem = -1;
static gint ett_ngap_ExpectedUEActivityBehaviour = -1;
static gint ett_ngap_ExpectedUEBehaviour = -1;
static gint ett_ngap_ExpectedUEMovingTrajectory = -1;
@ -4015,7 +4021,7 @@ static const value_string ngap_ProtocolIE_ID_vals[] = {
{ id_M6ReportAmount, "id-M6ReportAmount" },
{ id_M7ReportAmount, "id-M7ReportAmount" },
{ id_IncludeBeamMeasurementsIndication, "id-IncludeBeamMeasurementsIndication" },
{ id_M6DelayThreshold, "id-M6DelayThreshold" },
{ id_ExcessPacketDelayThresholdConfiguration, "id-ExcessPacketDelayThresholdConfiguration" },
{ id_PagingCause, "id-PagingCause" },
{ id_PagingCauseIndicationForVoiceService, "id-PagingCauseIndicationForVoiceService" },
{ id_PEIPSassistanceInformation, "id-PEIPSassistanceInformation" },
@ -9307,6 +9313,69 @@ dissect_ngap_EventType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
static const value_string ngap_ExcessPacketDelayThresholdValue_vals[] = {
{ 0, "ms0dot25" },
{ 1, "ms0dot5" },
{ 2, "ms1" },
{ 3, "ms2" },
{ 4, "ms4" },
{ 5, "ms5" },
{ 6, "ms10" },
{ 7, "ms20" },
{ 8, "ms30" },
{ 9, "ms40" },
{ 10, "ms50" },
{ 11, "ms60" },
{ 12, "ms70" },
{ 13, "ms80" },
{ 14, "ms90" },
{ 15, "ms100" },
{ 16, "ms150" },
{ 17, "ms300" },
{ 18, "ms500" },
{ 0, NULL }
};
static int
dissect_ngap_ExcessPacketDelayThresholdValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
19, NULL, TRUE, 0, NULL);
return offset;
}
static const per_sequence_t ExcessPacketDelayThresholdItem_sequence[] = {
{ &hf_ngap_fiveQi , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_FiveQI },
{ &hf_ngap_excessPacketDelayThresholdValue, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_ExcessPacketDelayThresholdValue },
{ &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
dissect_ngap_ExcessPacketDelayThresholdItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_ngap_ExcessPacketDelayThresholdItem, ExcessPacketDelayThresholdItem_sequence);
return offset;
}
static const per_sequence_t ExcessPacketDelayThresholdConfiguration_sequence_of[1] = {
{ &hf_ngap_ExcessPacketDelayThresholdConfiguration_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_ExcessPacketDelayThresholdItem },
};
static int
dissect_ngap_ExcessPacketDelayThresholdConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
ett_ngap_ExcessPacketDelayThresholdConfiguration, ExcessPacketDelayThresholdConfiguration_sequence_of,
1, maxnoofThresholdsForExcessPacketDelay, FALSE);
return offset;
}
static const per_sequence_t Extended_AMFName_sequence[] = {
{ &hf_ngap_aMFNameVisibleString, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_AMFNameVisibleString },
{ &hf_ngap_aMFNameUTF8String, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_AMFNameUTF8String },
@ -14139,30 +14208,6 @@ dissect_ngap_M5ReportAmountMDT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
}
static const value_string ngap_M6DelayThreshold_vals[] = {
{ 0, "ms0dot25" },
{ 1, "ms0dot5" },
{ 2, "ms1" },
{ 3, "ms2" },
{ 4, "ms4" },
{ 5, "ms10" },
{ 6, "ms20" },
{ 7, "ms50" },
{ 8, "ms100" },
{ 9, "ms500" },
{ 0, NULL }
};
static int
dissect_ngap_M6DelayThreshold(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
10, NULL, TRUE, 0, NULL);
return offset;
}
static const value_string ngap_M6ReportAmountMDT_vals[] = {
{ 0, "r1" },
{ 1, "r2" },
@ -23232,6 +23277,14 @@ static int dissect_EUTRA_PagingeDRXInformation_PDU(tvbuff_t *tvb _U_, packet_inf
offset += 7; offset >>= 3;
return offset;
}
static int dissect_ExcessPacketDelayThresholdConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_ngap_ExcessPacketDelayThresholdConfiguration(tvb, offset, &asn1_ctx, tree, hf_ngap_ExcessPacketDelayThresholdConfiguration_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_ExpectedUEActivityBehaviour_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -23784,14 +23837,6 @@ static int dissect_M5ReportAmountMDT_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
static int dissect_M6DelayThreshold_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_ngap_M6DelayThreshold(tvb, offset, &asn1_ctx, tree, hf_ngap_M6DelayThreshold_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_M6ReportAmountMDT_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -27304,7 +27349,7 @@ proto_reg_handoff_ngap(void)
dissector_add_uint("ngap.extension", id_M6ReportAmount, create_dissector_handle(dissect_M6ReportAmountMDT_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_M7ReportAmount, create_dissector_handle(dissect_M7ReportAmountMDT_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_IncludeBeamMeasurementsIndication, create_dissector_handle(dissect_IncludeBeamMeasurementsIndication_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_M6DelayThreshold, create_dissector_handle(dissect_M6DelayThreshold_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_ExcessPacketDelayThresholdConfiguration, create_dissector_handle(dissect_ExcessPacketDelayThresholdConfiguration_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_PagingCauseIndicationForVoiceService, create_dissector_handle(dissect_PagingCauseIndicationForVoiceService_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_PEIPSassistanceInformation, create_dissector_handle(dissect_PEIPSassistanceInformation_PDU, proto_ngap));
dissector_add_uint("ngap.extension", id_TAINSAGSupportList, create_dissector_handle(dissect_TAINSAGSupportList_PDU, proto_ngap));
@ -27950,6 +27995,10 @@ void proto_register_ngap(void) {
{ "EUTRA-PagingeDRXInformation", "ngap.EUTRA_PagingeDRXInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_ngap_ExcessPacketDelayThresholdConfiguration_PDU,
{ "ExcessPacketDelayThresholdConfiguration", "ngap.ExcessPacketDelayThresholdConfiguration",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_ngap_ExpectedUEActivityBehaviour_PDU,
{ "ExpectedUEActivityBehaviour", "ngap.ExpectedUEActivityBehaviour_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -28226,10 +28275,6 @@ void proto_register_ngap(void) {
{ "M5ReportAmountMDT", "ngap.M5ReportAmountMDT",
FT_UINT32, BASE_DEC, VALS(ngap_M5ReportAmountMDT_vals), 0,
NULL, HFILL }},
{ &hf_ngap_M6DelayThreshold_PDU,
{ "M6DelayThreshold", "ngap.M6DelayThreshold",
FT_UINT32, BASE_DEC, VALS(ngap_M6DelayThreshold_vals), 0,
NULL, HFILL }},
{ &hf_ngap_M6ReportAmountMDT_PDU,
{ "M6ReportAmountMDT", "ngap.M6ReportAmountMDT",
FT_UINT32, BASE_DEC, VALS(ngap_M6ReportAmountMDT_vals), 0,
@ -30562,6 +30607,18 @@ void proto_register_ngap(void) {
{ "eUTRA-paging-Time-Window", "ngap.eUTRA_paging_Time_Window",
FT_UINT32, BASE_DEC, VALS(ngap_EUTRA_Paging_Time_Window_vals), 0,
NULL, HFILL }},
{ &hf_ngap_ExcessPacketDelayThresholdConfiguration_item,
{ "ExcessPacketDelayThresholdItem", "ngap.ExcessPacketDelayThresholdItem_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_ngap_fiveQi,
{ "fiveQi", "ngap.fiveQi",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_ngap_excessPacketDelayThresholdValue,
{ "excessPacketDelayThresholdValue", "ngap.excessPacketDelayThresholdValue",
FT_UINT32, BASE_DEC, VALS(ngap_ExcessPacketDelayThresholdValue_vals), 0,
NULL, HFILL }},
{ &hf_ngap_expectedActivityPeriod,
{ "expectedActivityPeriod", "ngap.expectedActivityPeriod",
FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
@ -33552,6 +33609,8 @@ void proto_register_ngap(void) {
&ett_ngap_EUTRA_CGIList,
&ett_ngap_EUTRA_CGIListForWarning,
&ett_ngap_EUTRA_PagingeDRXInformation,
&ett_ngap_ExcessPacketDelayThresholdConfiguration,
&ett_ngap_ExcessPacketDelayThresholdItem,
&ett_ngap_ExpectedUEActivityBehaviour,
&ett_ngap_ExpectedUEBehaviour,
&ett_ngap_ExpectedUEMovingTrajectory,