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

F1AP: upgrade dissector to v15.8.0 

Change-Id: I92f98721286cfff4b113618a68add578412352fa
Reviewed-on: https://code.wireshark.org/review/35756
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2020-01-12 17:20:54 +01:00
parent 23801f0ce2
commit a4c5296aaf
12 changed files with 330 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.6 Common Definitions
-- **************************************************************
--

9
epan/dissectors/asn1/f1ap/F1AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -352,7 +352,12 @@ id-Cell-Type ProtocolIE-ID ::= 232
id-IgnorePRACHConfiguration ProtocolIE-ID ::= 233
id-CG-Config ProtocolIE-ID ::= 234
id-PDCCH-BlindDetectionSCG ProtocolIE-ID ::= 235
id-Requested-PDCCH-BlindDetectionSCG ProtocolIE-ID ::= 236
id-Requested-PDCCH-BlindDetectionSCG ProtocolIE-ID ::= 236
id-Ph-InfoMCG ProtocolIE-ID ::= 237
id-MeasGapSharingConfig ProtocolIE-ID ::= 238
id-systemInformationAreaID ProtocolIE-ID ::= 239
id-areaScope ProtocolIE-ID ::= 240
id-RRCContainer-RRCSetupComplete ProtocolIE-ID ::= 241
END

2
epan/dissectors/asn1/f1ap/F1AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.8 Container Definitions
-- **************************************************************
--

22
epan/dissectors/asn1/f1ap/F1AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -59,6 +59,9 @@ IMPORTS
id-IgnorePRACHConfiguration,
id-CG-Config,
id-Ph-InfoMCG,
id-MeasGapSharingConfig,
id-systemInformationAreaID,
id-areaScope,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@ -140,6 +143,8 @@ AvailablePLMNList-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
AveragingWindow ::= INTEGER (0..4095, ...)
AreaScope ::= ENUMERATED {true, ...}
-- B
BitRate ::= INTEGER (0..4000000000000,...)
@ -241,7 +246,9 @@ CauseRadioNetwork ::= ENUMERATED {
resources-not-available-for-the-slice,
amf-initiated-abnormal-release,
release-due-to-pre-emption,
plmn-not-served-by-the-gNB-CU
plmn-not-served-by-the-gNB-CU,
multiple-drb-id-instances,
unknown-drb-id
}
CauseTransport ::= ENUMERATED {
@ -713,7 +720,8 @@ DUtoCURRCInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-DRX-Config CRITICALITY ignore EXTENSION DRX-Config PRESENCE optional }|
{ ID id-PDCCH-BlindDetectionSCG CRITICALITY ignore EXTENSION PDCCH-BlindDetectionSCG PRESENCE optional }|
{ ID id-Requested-PDCCH-BlindDetectionSCG CRITICALITY ignore EXTENSION Requested-PDCCH-BlindDetectionSCG PRESENCE optional }|
{ ID id-Ph-InfoMCG CRITICALITY ignore EXTENSION Ph-InfoMCG PRESENCE optional },
{ ID id-Ph-InfoMCG CRITICALITY ignore EXTENSION Ph-InfoMCG PRESENCE optional }|
{ ID id-MeasGapSharingConfig CRITICALITY ignore EXTENSION MeasGapSharingConfig PRESENCE optional },
...
}
@ -1028,6 +1036,7 @@ GNB-CUSystemInformation::= SEQUENCE {
}
GNB-CUSystemInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ID id-systemInformationAreaID CRITICALITY ignore EXTENSION SystemInformationAreaID PRESENCE optional},
...
}
@ -1178,6 +1187,8 @@ MeasConfig ::= OCTET STRING
MeasGapConfig ::= OCTET STRING
MeasGapSharingConfig ::= OCTET STRING
MeasurementTimingConfiguration ::= OCTET STRING
MessageIdentifier ::= BIT STRING (SIZE (16))
@ -1548,6 +1559,8 @@ RLC-Status-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
RRCContainer ::= OCTET STRING
RRCContainer-RRCSetupComplete ::= OCTET STRING
RRCDeliveryStatus ::= SEQUENCE {
delivery-status PDCP-SN,
triggering-message PDCP-SN,
@ -1766,6 +1779,7 @@ SibtypetobeupdatedListItem ::= SEQUENCE {
}
SibtypetobeupdatedListItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ID id-areaScope CRITICALITY ignore EXTENSION AreaScope PRESENCE optional},
...
}
@ -1917,6 +1931,8 @@ SupportedSULFreqBandItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SystemInformationAreaID ::=BIT STRING (SIZE (24))
-- T
FiveGS-TAC ::= OCTET STRING (SIZE(3))

28
epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -70,6 +70,7 @@ IMPORTS
RAT-FrequencyPriorityInformation,
ResourceCoordinationTransferContainer,
RRCContainer,
RRCContainer-RRCSetupComplete,
RRCReconfigurationCompleteIndicator,
SCellIndex,
SCell-ToBeRemoved-Item,
@ -143,7 +144,8 @@ IMPORTS
PagingOrigin,
UAC-Assistance-Info,
RANUEID,
GNB-DU-TNL-Association-To-Remove-Item
GNB-DU-TNL-Association-To-Remove-Item,
NotificationInformation
FROM F1AP-IEs
@ -230,6 +232,7 @@ FROM F1AP-Containers
id-ResetType,
id-ResourceCoordinationTransferContainer,
id-RRCContainer,
id-RRCContainer-RRCSetupComplete,
id-RRCReconfigurationCompleteIndicator,
id-SCell-FailedtoSetup-List,
id-SCell-FailedtoSetup-Item,
@ -343,6 +346,7 @@ FROM F1AP-Containers
id-PagingOrigin,
id-GNB-DU-TNL-Association-To-Remove-Item,
id-GNB-DU-TNL-Association-To-Remove-List,
id-NotificationInformation,
maxCellingNBDU,
maxnoofCandidateSpCells,
maxnoofDRBs,
@ -1454,7 +1458,8 @@ PWSCancelRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-NumberofBroadcastRequest CRITICALITY reject TYPE NumberofBroadcastRequest PRESENCE mandatory }|
{ ID id-Broadcast-To-Be-Cancelled-List CRITICALITY reject TYPE Broadcast-To-Be-Cancelled-List PRESENCE optional }|
{ ID id-Cancel-all-Warning-Messages-Indicator CRITICALITY reject TYPE Cancel-all-Warning-Messages-Indicator PRESENCE optional },
{ ID id-Cancel-all-Warning-Messages-Indicator CRITICALITY reject TYPE Cancel-all-Warning-Messages-Indicator PRESENCE optional }|
{ ID id-NotificationInformation CRITICALITY reject TYPE NotificationInformation PRESENCE optional},
...
}
@ -1539,14 +1544,15 @@ InitialULRRCMessageTransfer ::= SEQUENCE {
}
InitialULRRCMessageTransferIEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-NRCGI CRITICALITY reject TYPE NRCGI PRESENCE mandatory }|
{ ID id-C-RNTI CRITICALITY reject TYPE C-RNTI PRESENCE mandatory }|
{ ID id-RRCContainer CRITICALITY reject TYPE RRCContainer PRESENCE mandatory }|
{ ID id-DUtoCURRCContainer CRITICALITY reject TYPE DUtoCURRCContainer PRESENCE optional }|
{ ID id-SULAccessIndication CRITICALITY ignore TYPE SULAccessIndication PRESENCE optional }|
{ ID id-TransactionID CRITICALITY ignore TYPE TransactionID PRESENCE mandatory }|
{ ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional },
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-NRCGI CRITICALITY reject TYPE NRCGI PRESENCE mandatory }|
{ ID id-C-RNTI CRITICALITY reject TYPE C-RNTI PRESENCE mandatory }|
{ ID id-RRCContainer CRITICALITY reject TYPE RRCContainer PRESENCE mandatory }|
{ ID id-DUtoCURRCContainer CRITICALITY reject TYPE DUtoCURRCContainer PRESENCE optional }|
{ ID id-SULAccessIndication CRITICALITY ignore TYPE SULAccessIndication PRESENCE optional }|
{ ID id-TransactionID CRITICALITY ignore TYPE TransactionID PRESENCE mandatory }|
{ ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional }|
{ ID id-RRCContainer-RRCSetupComplete CRITICALITY ignore TYPE RRCContainer-RRCSetupComplete PRESENCE optional },
...
}

2
epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 3GPP TS 38.473 V15.8.0 (2019-12)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--

25
epan/dissectors/asn1/f1ap/f1ap.cnf
View File

@ -365,6 +365,10 @@ id-CG-Config ProtocolIE-ID
id-PDCCH-BlindDetectionSCG ProtocolIE-ID
id-Requested-PDCCH-BlindDetectionSCG ProtocolIE-ID
id-Ph-InfoMCG ProtocolIE-ID
id-MeasGapSharingConfig ProtocolIE-ID
id-systemInformationAreaID ProtocolIE-ID
id-areaScope ProtocolIE-ID
id-RRCContainer-RRCSetupComplete ProtocolIE-ID
#.END
#.REGISTER
@ -553,6 +557,7 @@ UAC-Assistance-Info N f1ap.ies id-UAC-Assistance-I
RANUEID N f1ap.ies id-RANUEID
GNB-DU-TNL-Association-To-Remove-Item N f1ap.ies id-GNB-DU-TNL-Association-To-Remove-Item
GNB-DU-TNL-Association-To-Remove-List N f1ap.ies id-GNB-DU-TNL-Association-To-Remove-List
RRCContainer-RRCSetupComplete N f1ap.ies id-RRCContainer-RRCSetupComplete
#F1AP-PROTOCOL-EXTENSION
GNB-CUSystemInformation N f1ap.extension id-gNB-CUSystemInformation
@ -599,6 +604,9 @@ CG-Config N f1ap.extension id-CG-Config
PDCCH-BlindDetectionSCG N f1ap.extension id-PDCCH-BlindDetectionSCG
Requested-PDCCH-BlindDetectionSCG N f1ap.extension id-Requested-PDCCH-BlindDetectionSCG
Ph-InfoMCG N f1ap.extension id-Ph-InfoMCG
MeasGapSharingConfig N f1ap.extension id-MeasGapSharingConfig
SystemInformationAreaID N f1ap.extension id-systemInformationAreaID
AreaScope N f1ap.extension id-areaScope
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset
@ -774,6 +782,15 @@ F1RemovalFailure N f1ap.proc.uout id-F1Removal
}
}
#.FN_BODY RRCContainer-RRCSetupComplete VAL_PTR=&param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_RRCContainer_RRCSetupComplete);
call_dissector(nr_rrc_ul_dcch_handle, param_tvb, actx->pinfo, subtree);
}
#.FN_BODY DUtoCURRCContainer VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
@ -891,6 +908,14 @@ BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
dissect_nr_rrc_MeasGapConfig_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY MeasGapSharingConfig VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_MeasGapSharingConfig);
dissect_nr_rrc_MeasGapSharingConfig_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY DUtoCURRCInformation/requestedP-MaxFR1 VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s

10
epan/dissectors/asn1/f1ap/packet-f1ap-template.c
View File

@ -1,6 +1,6 @@
/* packet-f1ap.c
* Routines for E-UTRAN F1 Application Protocol (F1AP) packet dissection
* Copyright 2018-2019, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2020, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.473 V15.7.0 (2019-09)
* References: 3GPP TS 38.473 V15.8.0 (2019-12)
*/
#include "config.h"
@ -58,10 +58,12 @@ static gint ett_f1ap_requestedP_MaxFR1 = -1;
static gint ett_f1ap_HandoverPreparationInformation = -1;
static gint ett_f1ap_MeasConfig = -1;
static gint ett_f1ap_MeasGapConfig = -1;
static gint ett_f1ap_MeasGapSharingConfig = -1;
static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container = -1;
static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container = -1;
static gint ett_f1ap_ProtectedEUTRAResourceIndication = -1;
static gint ett_f1ap_RRCContainer = -1;
static gint ett_f1ap_RRCContainer_RRCSetupComplete = -1;
static gint ett_f1ap_sIBmessage = -1;
static gint ett_f1ap_UplinkTxDirectCurrentListInformation = -1;
static gint ett_f1ap_DRX_Config = -1;
@ -99,6 +101,7 @@ typedef struct {
/* Global variables */
static dissector_handle_t f1ap_handle;
static dissector_handle_t nr_rrc_ul_ccch_handle;
static dissector_handle_t nr_rrc_ul_dcch_handle;
/* Dissector tables */
static dissector_table_t f1ap_ies_dissector_table;
@ -237,10 +240,12 @@ void proto_register_f1ap(void) {
&ett_f1ap_HandoverPreparationInformation,
&ett_f1ap_MeasConfig,
&ett_f1ap_MeasGapConfig,
&ett_f1ap_MeasGapSharingConfig,
&ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container,
&ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container,
&ett_f1ap_ProtectedEUTRAResourceIndication,
&ett_f1ap_RRCContainer,
&ett_f1ap_RRCContainer_RRCSetupComplete,
&ett_f1ap_sIBmessage,
&ett_f1ap_UplinkTxDirectCurrentListInformation,
&ett_f1ap_DRX_Config,
@ -277,6 +282,7 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint_with_preference("sctp.port", SCTP_PORT_F1AP, f1ap_handle);
dissector_add_uint("sctp.ppi", F1AP_PROTOCOL_ID, f1ap_handle);
nr_rrc_ul_ccch_handle = find_dissector_add_dependency("nr-rrc.ul.ccch", proto_f1ap);
nr_rrc_ul_dcch_handle = find_dissector_add_dependency("nr-rrc.ul.dcch", proto_f1ap);
#include "packet-f1ap-dis-tab.c"
}

2
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -53,6 +53,7 @@ HandoverCommand_PDU
HandoverPreparationInformation_PDU
MeasConfig_PDU
MeasGapConfig_PDU
MeasGapSharingConfig_PDU
MeasResultSCG-Failure_PDU
MeasurementTimingConfiguration_PDU
MIB_PDU
@ -99,6 +100,7 @@ HandoverCommand
HandoverPreparationInformation
MeasConfig
MeasGapConfig
MeasGapSharingConfig
MeasResultSCG-Failure
MeasurementTimingConfiguration
MIB

326
epan/dissectors/packet-f1ap.c
View File

File diff suppressed because it is too large Load Diff

17
epan/dissectors/packet-nr-rrc.c
View File

@ -290,6 +290,7 @@ static int hf_nr_rrc_nr_rrc_CellGroupConfig_PDU = -1; /* CellGroupConfig */
static int hf_nr_rrc_nr_rrc_DRX_Config_PDU = -1; /* DRX_Config */
static int hf_nr_rrc_nr_rrc_MeasConfig_PDU = -1; /* MeasConfig */
static int hf_nr_rrc_nr_rrc_MeasGapConfig_PDU = -1; /* MeasGapConfig */
static int hf_nr_rrc_nr_rrc_MeasGapSharingConfig_PDU = -1; /* MeasGapSharingConfig */
static int hf_nr_rrc_nr_rrc_MeasResultSCG_Failure_PDU = -1; /* MeasResultSCG_Failure */
static int hf_nr_rrc_nr_rrc_P_Max_PDU = -1; /* P_Max */
static int hf_nr_rrc_nr_rrc_RadioBearerConfig_PDU = -1; /* RadioBearerConfig */
@ -18186,6 +18187,8 @@ static const per_sequence_t MeasGapSharingConfig_sequence[] = {
static int
dissect_nr_rrc_MeasGapSharingConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_nr_rrc_MeasGapSharingConfig, MeasGapSharingConfig_sequence);
@ -44283,6 +44286,16 @@ int dissect_nr_rrc_MeasGapConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_MeasGapSharingConfig_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_nr_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_nr_rrc_MeasGapSharingConfig(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_MeasGapSharingConfig_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_MeasResultSCG_Failure_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_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@ -44579,6 +44592,10 @@ proto_register_nr_rrc(void) {
{ "MeasGapConfig", "nr-rrc.MeasGapConfig_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_MeasGapSharingConfig_PDU,
{ "MeasGapSharingConfig", "nr-rrc.MeasGapSharingConfig_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_MeasResultSCG_Failure_PDU,
{ "MeasResultSCG-Failure", "nr-rrc.MeasResultSCG_Failure_element",
FT_NONE, BASE_NONE, NULL, 0,

1
epan/dissectors/packet-nr-rrc.h
View File

@ -52,6 +52,7 @@ int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
int dissect_nr_rrc_DRX_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasGapConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasGapSharingConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasResultSCG_Failure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_P_Max_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RadioBearerConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);