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

F1AP: upgrade dissector to v16.8.0

This commit is contained in:
Pascal Quantin 2022-01-03 19:21:37 +01:00 committed by A Wireshark GitLab Utility
parent 6d319297ae
commit d2b5441cec
9 changed files with 341 additions and 183 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 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.6 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -647,6 +647,8 @@ id-TransmissionStopIndicator ProtocolIE-ID ::= 430
id-SrsFrequency ProtocolIE-ID ::= 431
id-SCGIndicator ProtocolIE-ID ::= 432
id-EstimatedArrivalProbability ProtocolIE-ID ::= 433
id-TRPType ProtocolIE-ID ::= 434
id-SRSSpatialRelationPerSRSResource ProtocolIE-ID ::= 435
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.8 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -107,6 +107,8 @@ IMPORTS
id-TransmissionStopIndicator,
id-SrsFrequency,
id-EstimatedArrivalProbability,
id-TRPType,
id-SRSSpatialRelationPerSRSResource,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@ -4519,6 +4521,28 @@ SpatialRelationforResourceIDItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SpatialRelationPerSRSResource ::= SEQUENCE {
spatialRelationPerSRSResource-List SpatialRelationPerSRSResource-List,
iE-Extensions ProtocolExtensionContainer { { SpatialRelationPerSRSResource-ExtIEs} } OPTIONAL,
...
}
SpatialRelationPerSRSResource-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SpatialRelationPerSRSResource-List::= SEQUENCE(SIZE (1.. maxnoSRS-ResourcePerSet)) OF SpatialRelationPerSRSResourceItem
SpatialRelationPerSRSResourceItem ::= SEQUENCE {
referenceSignal ReferenceSignal,
iE-Extensions ProtocolExtensionContainer { { SpatialRelationPerSRSResourceItem-ExtIEs} } OPTIONAL,
...
}
SpatialRelationPerSRSResourceItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SpatialRelationPos ::= CHOICE {
sSBPos SSB,
pRSInformationPos PRSInformationPos,
@ -4723,6 +4747,7 @@ SRSResourceSetItem ::= SEQUENCE {
}
SRSResourceSetItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-SRSSpatialRelationPerSRSResource CRITICALITY ignore EXTENSION SpatialRelationPerSRSResource PRESENCE optional},
...
}
@ -5150,7 +5175,9 @@ TRPInformationTypeItem ::= ENUMERATED {
sFNInitTime,
spatialDirectInfo,
geoCoord,
...}
...,
trp-type
}
TRPInformationTypeResponseList ::= SEQUENCE (SIZE(1.. maxnoofTRPInfoTypes)) OF TRPInformationTypeResponseItem
@ -5168,6 +5195,7 @@ TRPInformationTypeResponseItem ::= CHOICE {
}
TRPInformationTypeResponseItem-ExtIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TRPType CRITICALITY reject TYPE TRPType PRESENCE mandatory },
...
}
@ -5280,6 +5308,15 @@ Transport-Layer-Address-Info-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
TRPType ::= ENUMERATED {
prsOnlyTP,
srsOnlyRP,
tp,
rp,
trp,
...
}
TSCAssistanceInformation ::= SEQUENCE {
periodicity Periodicity,
burstArrivalTime BurstArrivalTime OPTIONAL,

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -262,7 +262,8 @@ IMPORTS
Extended-GNB-CU-Name,
Extended-GNB-DU-Name,
F1CTransferPath,
SCGIndicator
SCGIndicator,
SpatialRelationPerSRSResource
@ -610,6 +611,7 @@ FROM F1AP-Containers
id-E-CID-ReportCharacteristics,
id-F1CTransferPath,
id-SCGIndicator,
id-SRSSpatialRelationPerSRSResource,
maxCellingNBDU,
maxnoofCandidateSpCells,
maxnoofDRBs,
@ -762,7 +764,7 @@ F1SetupRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-GNB-DU-RRC-Version CRITICALITY reject TYPE RRC-Version PRESENCE mandatory }|
{ ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }|
{ ID id-BAPAddress CRITICALITY ignore TYPE BAPAddress PRESENCE optional }|
{ ID id-Extended-GNB-CU-Name CRITICALITY ignore TYPE Extended-GNB-CU-Name PRESENCE optional },
{ ID id-Extended-GNB-DU-Name CRITICALITY ignore TYPE Extended-GNB-DU-Name PRESENCE optional },
...
}
@ -795,7 +797,7 @@ F1SetupResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-Transport-Layer-Address-Info CRITICALITY ignore TYPE Transport-Layer-Address-Info PRESENCE optional }|
{ ID id-UL-BH-Non-UP-Traffic-Mapping CRITICALITY reject TYPE UL-BH-Non-UP-Traffic-Mapping PRESENCE optional }|
{ ID id-BAPAddress CRITICALITY ignore TYPE BAPAddress PRESENCE optional }|
{ ID id-Extended-GNB-DU-Name CRITICALITY ignore TYPE Extended-GNB-DU-Name PRESENCE optional },
{ ID id-Extended-GNB-CU-Name CRITICALITY ignore TYPE Extended-GNB-CU-Name PRESENCE optional },
...
}
@ -3434,6 +3436,7 @@ SemipersistentSRS ::= SEQUENCE {
}
SemipersistentSRS-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-SRSSpatialRelationPerSRSResource CRITICALITY ignore EXTENSION SpatialRelationPerSRSResource PRESENCE optional},
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.7.0 (2021-10)
-- 3GPP TS 38.473 V16.8.0 (2021-12)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--

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

@ -590,6 +590,8 @@ id-TransmissionStopIndicator ProtocolIE-ID
id-SrsFrequency ProtocolIE-ID
id-SCGIndicator ProtocolIE-ID
id-EstimatedArrivalProbability ProtocolIE-ID
id-TRPType ProtocolIE-ID
id-SRSSpatialRelationPerSRSResource ProtocolIE-ID
#.END
#.REGISTER
@ -923,6 +925,7 @@ Extended-GNB-DU-Name N f1ap.ies id-Extended-GNB-DU-
Extended-GNB-CU-Name N f1ap.ies id-Extended-GNB-CU-Name
F1CTransferPath N f1ap.ies id-F1CTransferPath
SCGIndicator N f1ap.ies id-SCGIndicator
TRPType N f1ap.ies id-TRPType
#F1AP-PROTOCOL-EXTENSION
GNB-CUSystemInformation N f1ap.extension id-gNB-CUSystemInformation
@ -1016,6 +1019,7 @@ SFN-Offset N f1ap.extension id-SFN-Offset
TransmissionStopIndicator N f1ap.extension id-TransmissionStopIndicator
SrsFrequency N f1ap.extension id-SrsFrequency
CHO-Probability N f1ap.extension id-EstimatedArrivalProbability
SpatialRelationPerSRSResource N f1ap.extension id-SRSSpatialRelationPerSRSResource
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset

4
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-2021, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2022, 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 V16.7.0 (2021-10)
* References: 3GPP TS 38.473 V16.8.0 (2021-12)
*/
#include "config.h"

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

File diff suppressed because it is too large Load Diff