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

XnAP: upgrade dissector to v16.5.0

This commit is contained in:
Pascal Quantin 2021-04-10 12:06:26 +02:00
parent 1c2cf2ba0e
commit c0e041c6a3
9 changed files with 331 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.6 Common definitions
-- **************************************************************
--

6
epan/dissectors/asn1/xnap/XnAP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -387,6 +387,8 @@ id-QosMonitoringReportingFrequency ProtocolIE-ID ::= 238
id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated ProtocolIE-ID ::= 239
id-DL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 240
id-UL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 241
id-SFN-Offset ProtocolIE-ID ::= 242
id-QoSMonitoringDisabled ProtocolIE-ID ::= 243
id-ExtendedUEIdentityIndexValue ProtocolIE-ID ::= 244
END

2
epan/dissectors/asn1/xnap/XnAP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.8 Container definitions
-- **************************************************************
--

30
epan/dissectors/asn1/xnap/XnAP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@ -53,6 +53,7 @@ IMPORTS
id-NRUESidelinkAggregateMaximumBitRate,
id-ExtendedRATRestrictionInformation,
id-QoSMonitoringRequest,
id-QoSMonitoringDisabled,
id-QosMonitoringReportingFrequency,
id-DAPSRequestInfo,
id-OffsetOfNbiotChannelNumberToDL-EARFCN,
@ -86,6 +87,7 @@ IMPORTS
id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated,
id-DL-scheduling-PDCCH-CCE-usage,
id-UL-scheduling-PDCCH-CCE-usage,
id-SFN-Offset,
maxEARFCN,
maxnoofAllowedAreas,
maxnoofAMFRegions,
@ -565,7 +567,9 @@ CauseRadioNetworkLayer ::= ENUMERATED {
measurement-temporarily-not-available,
measurement-not-supported-for-the-object,
ue-power-saving,
unknown-NG-RAN-node2-Measurement-ID
unknown-NG-RAN-node2-Measurement-ID,
insufficient-ue-capabilities,
normal-release
}
CauseTransportLayer ::= ENUMERATED {
@ -1370,6 +1374,8 @@ ExtendedPacketDelayBudget ::= INTEGER (0..65535, ...)
ExtendedSliceSupportList ::= SEQUENCE (SIZE(1..maxnoofExtSliceItems)) OF S-NSSAI
ExtendedUEIdentityIndexValue ::= BIT STRING (SIZE(16))
ExtTLAs ::= SEQUENCE (SIZE(1..maxnoofExtTLAs)) OF ExtTLA-Item
ExtTLA-Item ::= SEQUENCE {
@ -3845,7 +3851,8 @@ QoSFlowLevelQoSParameters ::= SEQUENCE {
QoSFlowLevelQoSParameters-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
{ID id-QoSMonitoringRequest CRITICALITY ignore EXTENSION QosMonitoringRequest PRESENCE optional}|
{ID id-QosMonitoringReportingFrequency CRITICALITY ignore EXTENSION QosMonitoringReportingFrequency PRESENCE optional},
{ID id-QosMonitoringReportingFrequency CRITICALITY ignore EXTENSION QosMonitoringReportingFrequency PRESENCE optional}|
{ID id-QoSMonitoringDisabled CRITICALITY ignore EXTENSION QoSMonitoringDisabled PRESENCE optional},
...
}
@ -3948,6 +3955,7 @@ QoSFlowsUsageReport-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
}
QosMonitoringRequest ::= ENUMERATED {ul, dl, both}
QoSMonitoringDisabled ::= ENUMERATED {true, ...}
QosMonitoringReportingFrequency ::= INTEGER (1..1800, ...)
-- R
@ -4510,7 +4518,8 @@ ServedCells-E-UTRA-Item ::= SEQUENCE {
}
ServedCells-E-UTRA-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
{ ID id-SFN-Offset CRITICALITY ignore EXTENSION SFN-Offset PRESENCE optional },
...
}
@ -4566,10 +4575,21 @@ ServedCellInformation-NR-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
{ ID id-SSB-PositionsInBurst CRITICALITY ignore EXTENSION SSB-PositionsInBurst PRESENCE optional }|
{ ID id-NRCellPRACHConfig CRITICALITY ignore EXTENSION NRCellPRACHConfig PRESENCE optional }|
{ ID id-NPN-Broadcast-Information CRITICALITY reject EXTENSION NPN-Broadcast-Information PRESENCE optional }|
{ ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional },
{ ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional } |
{ ID id-SFN-Offset CRITICALITY ignore EXTENSION SFN-Offset PRESENCE optional },
...
}
SFN-Offset ::= SEQUENCE {
sFN-Time-Offset BIT STRING (SIZE(24)),
iE-Extensions ProtocolExtensionContainer { {SFN-Offset-ExtIEs} } OPTIONAL,
...
}
SFN-Offset-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
ServedCells-NR ::= SEQUENCE (SIZE (1..maxnoofCellsinNG-RANnode)) OF ServedCells-NR-Item

7
epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@ -57,6 +57,7 @@ IMPORTS
DRBToQoSFlowMapping-List,
E-UTRA-CGI,
ExpectedUEBehaviour,
ExtendedUEIdentityIndexValue,
FiveGCMobilityRestrictionListContainer,
GlobalCell-ID,
GlobalNG-RANNode-ID,
@ -213,6 +214,7 @@ FROM XnAP-Containers
id-DesiredActNotificationLevel,
id-DRBsSubjectToStatusTransfer-List,
id-ExpectedUEBehaviour,
id-ExtendedUEIdentityIndexValue,
id-FiveGCMobilityRestrictionListContainer,
id-GlobalNG-RAN-node-ID,
id-GUAMI,
@ -652,7 +654,8 @@ RANPaging-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-RANPagingArea CRITICALITY reject TYPE RANPagingArea PRESENCE mandatory}|
{ ID id-PagingPriority CRITICALITY ignore TYPE PagingPriority PRESENCE optional }|
{ ID id-AssistanceDataForRANPaging CRITICALITY ignore TYPE AssistanceDataForRANPaging PRESENCE optional }|
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional },
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional }|
{ ID id-ExtendedUEIdentityIndexValue CRITICALITY ignore TYPE ExtendedUEIdentityIndexValue PRESENCE optional },
...
}

2
epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.4.0 (2021-01)
-- 3GPP TS 38.423 V16.5.0 (2021-04)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--

51
epan/dissectors/asn1/xnap/packet-xnap-template.c
View File

@ -10,7 +10,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref:
* 3GPP TS 38.423 V16.4.0 (2021-01)
* 3GPP TS 38.423 V16.5.0 (2021-04)
*/
#include "config.h"
@ -53,10 +53,15 @@ static int hf_xnap_transportLayerAddressIPv4 = -1;
static int hf_xnap_transportLayerAddressIPv6 = -1;
static int hf_xnap_NG_RANTraceID_TraceID = -1;
static int hf_xnap_NG_RANTraceID_TraceRecordingSessionReference = -1;
static int hf_xnap_ExtendedRATRestrictionInformation_e_UTRA = -1;
static int hf_xnap_ExtendedRATRestrictionInformation_nR = -1;
static int hf_xnap_ExtendedRATRestrictionInformation_nR_unlicensed = -1;
static int hf_xnap_ExtendedRATRestrictionInformation_reserved = -1;
static int hf_xnap_primaryRATRestriction_e_UTRA = -1;
static int hf_xnap_primaryRATRestriction_nR = -1;
static int hf_xnap_primaryRATRestriction_nR_unlicensed = -1;
static int hf_xnap_primaryRATRestriction_reserved = -1;
static int hf_xnap_secondaryRATRestriction_e_UTRA = -1;
static int hf_xnap_secondaryRATRestriction_nR = -1;
static int hf_xnap_secondaryRATRestriction_e_UTRA_unlicensed = -1;
static int hf_xnap_secondaryRATRestriction_nR_unlicensed = -1;
static int hf_xnap_secondaryRATRestriction_reserved = -1;
static int hf_xnap_MDT_Location_Info_GNSS = -1;
static int hf_xnap_MDT_Location_Info_reserved = -1;
static int hf_xnap_MeasurementsToActivate_M1 = -1;
@ -347,22 +352,42 @@ void proto_register_xnap(void) {
{ "TraceRecordingSessionReference", "xnap.NG_RANTraceID.TraceRecordingSessionReference",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_ExtendedRATRestrictionInformation_e_UTRA,
{ "e-UTRA", "xnap.ExtendedRATRestrictionInformation.e_UTRA",
{ &hf_xnap_primaryRATRestriction_e_UTRA,
{ "e-UTRA", "xnap.primaryRATRestriction.e_UTRA",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x80,
NULL, HFILL }},
{ &hf_xnap_ExtendedRATRestrictionInformation_nR,
{ "nR", "xnap.ExtendedRATRestrictionInformation.nR",
{ &hf_xnap_primaryRATRestriction_nR,
{ "nR", "xnap.primaryRATRestriction.nR",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x40,
NULL, HFILL }},
{ &hf_xnap_ExtendedRATRestrictionInformation_nR_unlicensed,
{ "nR-unlicensed", "xnap.ExtendedRATRestrictionInformation.nR_unlicensed",
{ &hf_xnap_primaryRATRestriction_nR_unlicensed,
{ "nR-unlicensed", "xnap.primaryRATRestriction.nR_unlicensed",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x20,
NULL, HFILL }},
{ &hf_xnap_ExtendedRATRestrictionInformation_reserved,
{ "reserved", "xnap.ExtendedRATRestrictionInformation.reserved",
{ &hf_xnap_primaryRATRestriction_reserved,
{ "reserved", "xnap.primaryRATRestriction.reserved",
FT_UINT8, BASE_HEX, NULL, 0x1f,
NULL, HFILL }},
{ &hf_xnap_secondaryRATRestriction_e_UTRA,
{ "e-UTRA", "xnap.secondaryRATRestriction.e_UTRA",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x80,
NULL, HFILL }},
{ &hf_xnap_secondaryRATRestriction_nR,
{ "nR", "xnap.secondaryRATRestriction.nR",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x40,
NULL, HFILL }},
{ &hf_xnap_secondaryRATRestriction_e_UTRA_unlicensed,
{ "e-UTRA-unlicensed", "xnap.secondaryRATRestriction.e_UTRA_unlicensed",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x20,
NULL, HFILL }},
{ &hf_xnap_secondaryRATRestriction_nR_unlicensed,
{ "nR-unlicensed", "xnap.secondaryRATRestriction.nR_unlicensed",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10,
NULL, HFILL }},
{ &hf_xnap_secondaryRATRestriction_reserved,
{ "reserved", "xnap.secondaryRATRestriction.reserved",
FT_UINT8, BASE_HEX, NULL, 0x0f,
NULL, HFILL }},
{ &hf_xnap_MDT_Location_Info_GNSS,
{ "GNSS", "xnap.MDT_Location_Info.GNSS",
FT_BOOLEAN, 8, TFS(&tfs_activated_deactivated), 0x80,

23
epan/dissectors/asn1/xnap/xnap.cnf
View File

@ -491,10 +491,10 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
%(DEFAULT_BODY)s
if (parameter_tvb) {
static int * const fields[] = {
&hf_xnap_ExtendedRATRestrictionInformation_e_UTRA,
&hf_xnap_ExtendedRATRestrictionInformation_nR,
&hf_xnap_ExtendedRATRestrictionInformation_nR_unlicensed,
&hf_xnap_ExtendedRATRestrictionInformation_reserved,
&hf_xnap_primaryRATRestriction_e_UTRA,
&hf_xnap_primaryRATRestriction_nR,
&hf_xnap_primaryRATRestriction_nR_unlicensed,
&hf_xnap_primaryRATRestriction_reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_primaryRATRestriction);
@ -506,10 +506,11 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
%(DEFAULT_BODY)s
if (parameter_tvb) {
static int * const fields[] = {
&hf_xnap_ExtendedRATRestrictionInformation_e_UTRA,
&hf_xnap_ExtendedRATRestrictionInformation_nR,
&hf_xnap_ExtendedRATRestrictionInformation_nR_unlicensed,
&hf_xnap_ExtendedRATRestrictionInformation_reserved,
&hf_xnap_secondaryRATRestriction_e_UTRA,
&hf_xnap_secondaryRATRestriction_nR,
&hf_xnap_secondaryRATRestriction_e_UTRA_unlicensed,
&hf_xnap_secondaryRATRestriction_nR_unlicensed,
&hf_xnap_secondaryRATRestriction_reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_secondaryRATRestriction);
@ -1180,6 +1181,9 @@ id-QosMonitoringReportingFrequency ProtocolIE-ID
id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated ProtocolIE-ID
id-DL-scheduling-PDCCH-CCE-usage ProtocolIE-ID
id-UL-scheduling-PDCCH-CCE-usage ProtocolIE-ID
id-SFN-Offset ProtocolIE-ID
id-QoSMonitoringDisabled ProtocolIE-ID
id-ExtendedUEIdentityIndexValue ProtocolIE-ID
#.REGISTER
@ -1357,6 +1361,7 @@ MDTPLMNList N xnap.ies id-MDTPLMNList
UERadioCapabilityID N xnap.ies id-UERadioCapabilityID
SNTriggered N xnap.ies id-SNTriggered
CellAssistanceInfo-EUTRA N xnap.ies id-cellAssistanceInfo-EUTRA
ExtendedUEIdentityIndexValue N xnap.ies id-ExtendedUEIdentityIndexValue
#XNAP-PROTOCOL-EXTENSION
Additional-UL-NG-U-TNLatUPF-List N xnap.extension id-Additional-UL-NG-U-TNLatUPF-List
@ -1430,6 +1435,8 @@ QosMonitoringReportingFrequency N xnap.extension id-QosMonitor
QoSFlowsMappedtoDRB-SetupResponse-MNterminated N xnap.extension id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated
DL-scheduling-PDCCH-CCE-usage N xnap.extension id-DL-scheduling-PDCCH-CCE-usage
UL-scheduling-PDCCH-CCE-usage N xnap.extension id-UL-scheduling-PDCCH-CCE-usage
SFN-Offset N xnap.extension id-SFN-Offset
QoSMonitoringDisabled N xnap.extension id-QoSMonitoringDisabled
#XNAP-ELEMENTARY-PROCEDURE
HandoverRequest N xnap.proc.imsg id-handoverPreparation

359
epan/dissectors/packet-xnap.c
View File

File diff suppressed because it is too large Load Diff