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

LTE RRC: upgrade dissector to v15.0.1 

Change-Id: If0b6fe029b5f852250fde36ead5dc5bb03d44e28
Reviewed-on: https://code.wireshark.org/review/25304
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-01-13 18:34:14 +01:00
parent bd857b6a9c
commit c634a73c95
23 changed files with 9394 additions and 3077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/Makefile.am
View File

@ -157,6 +157,7 @@ ASN1_DISSECTOR_SRC = \
packet-mpeg-pes.c \
packet-mudurl.c \
packet-nbap.c \
packet-nr-rrc.c \
packet-novell_pkis.c \
packet-ns_cert_exts.c \
packet-ocsp.c \

8
epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -376,6 +376,10 @@ AS-Config ::= SEQUENCE {
[[ sourceSCellConfigList-r10 SCellToAddModList-r10 OPTIONAL
]],
[[ sourceConfigSCG-r12 SCG-Config-r12 OPTIONAL
]],
[[ sourceRB-ConfigNR-r15 OCTET STRING OPTIONAL,
sourceRB-ConfigSN-NR-r15 OCTET STRING OPTIONAL,
sourceOtherConfigSN-NR-r15 OCTET STRING OPTIONAL
]]
}
@ -419,6 +423,8 @@ AS-Context-v1130 ::= SEQUENCE {
...,
[[ sidelinkUEInformation-r12 OCTET STRING (CONTAINING
SidelinkUEInformation-r12) OPTIONAL -- Cond HO2
]],
[[ sourceContextENDC-r15 OCTET STRING OPTIONAL -- Cond HO2
]]
}

824
epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

26
epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -16,7 +16,9 @@ FROM EUTRA-InterNodeDefinitions
CarrierFreq-NB-r13,
RadioResourceConfigDedicated-NB-r13,
UECapabilityInformation-NB,
UE-Capability-NB-r13,
UE-Capability-NB-Ext-r14-IEs,
UE-RadioPagingInfo-NB-r13
FROM NBIOT-RRC-Definitions;
@ -36,6 +38,16 @@ HandoverPreparationInformation-NB-IEs ::= SEQUENCE {
as-Config-r13 AS-Config-NB,
rrm-Config-r13 RRM-Config-NB OPTIONAL,
as-Context-r13 AS-Context-NB OPTIONAL,
nonCriticalExtension HandoverPreparationInformation-NB-v1380-IEs OPTIONAL
}
HandoverPreparationInformation-NB-v1380-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension HandoverPreparationInformation-NB-Ext-r14-IEs OPTIONAL
}
HandoverPreparationInformation-NB-Ext-r14-IEs ::= SEQUENCE {
ue-RadioAccessCapabilityInfoExt-r14 OCTET STRING (CONTAINING UE-Capability-NB-Ext-r14-IEs) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -70,7 +82,17 @@ UERadioAccessCapabilityInformation-NB ::= SEQUENCE {
UERadioAccessCapabilityInformation-NB-IEs ::= SEQUENCE {
ue-RadioAccessCapabilityInfo-r13 OCTET STRING (CONTAINING UE-Capability-NB-r13),
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UERadioAccessCapabilityInformation-NB-v1380-IEs OPTIONAL
}
UERadioAccessCapabilityInformation-NB-v1380-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension UERadioAccessCapabilityInformation-NB-r14-IEs OPTIONAL
}
UERadioAccessCapabilityInformation-NB-r14-IEs ::= SEQUENCE {
ue-RadioAccessCapabilityInfo-r14 OCTET STRING (CONTAINING UECapabilityInformation-NB) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}

59
epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -600,7 +600,17 @@ SystemInformationBlockType1-NB-v1350 ::= SEQUENCE {
SystemInformationBlockType1-NB-v1430 ::= SEQUENCE {
cellSelectionInfo-v1430 CellSelectionInfo-NB-v1430 OPTIONAL, -- Need OR
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension SystemInformationBlockType1-NB-v1450 OPTIONAL
}
SystemInformationBlockType1-NB-v1450 ::= SEQUENCE {
nrs-CRS-PowerOffset-v1450 ENUMERATED {dB-6, dB-4dot77, dB-3,
dB-1dot77, dB0, dB1,
dB1dot23, dB2, dB3,
dB4, dB4dot23, dB5,
dB6, dB7, dB8,
dB9} OPTIONAL, -- Cond inband-SamePCI-ExceptAnchor
nonCriticalExtension SEQUENCE {} OPTIONAL
}
PLMN-IdentityList-NB-r13 ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo-NB-r13
@ -667,9 +677,14 @@ UECapabilityInformation-NB ::= SEQUENCE {
}
UECapabilityInformation-NB-r13-IEs ::= SEQUENCE {
ue-Capability-Container-r13 UE-Capability-NB-r13,
ue-Capability-r13 UE-Capability-NB-r13,
ue-RadioPagingInfo-r13 UE-RadioPagingInfo-NB-r13,
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension UECapabilityInformation-NB-Ext-r14-IEs OPTIONAL
}
UECapabilityInformation-NB-Ext-r14-IEs ::= SEQUENCE {
ue-Capability-ContainerExt-r14 OCTET STRING (CONTAINING UE-Capability-NB-Ext-r14-IEs),
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -722,7 +737,7 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
t-Reselection-r13 T-Reselection-NB-r13
},
freqBandInfo-r13 NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF
NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
...,
@ -731,6 +746,8 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
[[ intraFreqCellReselectionInfo-v1360 IntraFreqCellReselectionInfo-NB-v1360 OPTIONAL -- Need OR
]],
[[ intraFreqCellReselectionInfo-v1430 IntraFreqCellReselectionInfo-NB-v1430 OPTIONAL -- Need OR
]],
[[ cellReselectionInfoCommon-v1450 CellReselectionInfoCommon-NB-v1450 OPTIONAL -- Need OR
]]
}
@ -747,6 +764,10 @@ IntraFreqCellReselectionInfo-NB-v1430 ::= SEQUENCE {
ce-AuthorisationOffset-r14 ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35} OPTIONAL -- Need OP
}
CellReselectionInfoCommon-NB-v1450 ::= SEQUENCE {
s-SearchDeltaP-r14 ENUMERATED {dB6, dB9, dB12, dB15}
}
SystemInformationBlockType4-NB-r13 ::= SEQUENCE {
intraFreqNeighCellList-r13 IntraFreqNeighCellList OPTIONAL, -- Need OR
@ -1169,6 +1190,10 @@ NPRACH-ConfigSIB-NB-v1330 ::= SEQUENCE {
nprach-ParametersList-v1330 NPRACH-ParametersList-NB-v1330
}
NPRACH-ConfigSIB-NB-v1450 ::= SEQUENCE {
maxNumPreambleAttemptCE-r14 ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1}
}
NPRACH-ParametersList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-r13
NPRACH-ParametersList-NB-v1330 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-v1330
@ -1273,7 +1298,9 @@ RACH-ConfigCommon-NB-r13 ::= SEQUENCE {
powerRampingParameters-r13 PowerRampingParameters,
rach-InfoList-r13 RACH-InfoList-NB-r13,
connEstFailOffset-r13 INTEGER (0..15) OPTIONAL, -- Need OP
...
...,
[[ powerRampingParameters-v1450 PowerRampingParameters-NB-v1450 OPTIONAL -- Need OR
]]
}
RACH-InfoList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF RACH-Info-NB-r13
@ -1285,6 +1312,22 @@ RACH-Info-NB-r13 ::= SEQUENCE {
pp1, pp2, pp3, pp4, pp8, pp16, pp32, pp64}
}
PowerRampingParameters-NB-v1450 ::= SEQUENCE {
preambleInitialReceivedTargetPower-v1450 ENUMERATED {
dBm-130, dBm-128, dBm-126, dBm-124, dBm-122,
dBm-88, dBm-86, dBm-84,dBm-82, dBm-80}
OPTIONAL, -- Need OR
powerRampingParametersCE1-r14 SEQUENCE {
powerRampingStepCE1-r14 ENUMERATED {dB0, dB2, dB4, dB6},
preambleInitialReceivedTargetPowerCE1-r14 ENUMERATED {
dBm-130, dBm-128, dBm-126, dBm-124, dBm-122,
dBm-120, dBm-118, dBm-116, dBm-114, dBm-112,
dBm-110, dBm-108, dBm-106, dBm-104, dBm-102,
dBm-100, dBm-98, dBm-96, dBm-94, dBm-92,
dBm-90, dBm-88, dBm-86, dBm-84, dBm-82, dBm-80}
} OPTIONAL -- Need OR
}
RadioResourceConfigCommonSIB-NB-r13 ::= SEQUENCE {
rach-ConfigCommon-r13 RACH-ConfigCommon-NB-r13,
@ -1297,6 +1340,8 @@ RadioResourceConfigCommonSIB-NB-r13 ::= SEQUENCE {
uplinkPowerControlCommon-r13 UplinkPowerControlCommon-NB-r13,
...,
[[ nprach-Config-v1330 NPRACH-ConfigSIB-NB-v1330 OPTIONAL -- Need OR
]],
[[ nprach-Config-v1450 NPRACH-ConfigSIB-NB-v1450 OPTIONAL -- Cond EnhPowerControl
]]
}
@ -1470,10 +1515,10 @@ UE-Capability-NB-r13 ::= SEQUENCE {
pdcp-Parameters-r13 PDCP-Parameters-NB-r13 OPTIONAL,
phyLayerParameters-r13 PhyLayerParameters-NB-r13,
rf-Parameters-r13 RF-Parameters-NB-r13,
nonCriticalExtension UE-Capability-NB-v1430-IEs OPTIONAL
dummy SEQUENCE {} OPTIONAL
}
UE-Capability-NB-v1430-IEs ::= SEQUENCE {
UE-Capability-NB-Ext-r14-IEs ::= SEQUENCE {
ue-Category-NB-r14 ENUMERATED {nb2} OPTIONAL,
mac-Parameters-r14 MAC-Parameters-NB-r14 OPTIONAL,
phyLayerParameters-v1430 PhyLayerParameters-NB-v1430 OPTIONAL,

2
epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.4.0 (2017-09)
-- 3GPP TS 36.331 V15.0.1 (2018-01)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,6 +1,6 @@
# lte-rrc.cnf
# lte-rrc conformation file
# Copyright 2008 Vincent Helfre, 2009-2017 Pascal Quantin
# Copyright 2008 Vincent Helfre, 2009-2018 Pascal Quantin
#.OPT
PER
@ -9,13 +9,25 @@ UNALIGNED
#.USE_VALS_EXT
BandclassCDMA2000
CarrierFreq-NB-r13/carrierFreqOffset-r13
DelayBudgetReport-r14/type1
DelayBudgetReport-r14/type2
DRX-Config/setup/drx-InactivityTimer
DRX-Config-r13/drx-ULRetransmissionTimer-r13
DRX-Config-NB-r13/setup/drx-ULRetransmissionTimer-r13
PDCP-Config/eag_3/t-Reordering-r12
PDCP-Config/eag_4/statusFeedback-r13/setup/statusPDU-Periodicity-Type1-r13
PDCP-Config/eag_4/statusFeedback-r13/setup/statusPDU-Periodicity-Type2-r13
PollByte-r14
PowerRampingParameters-NB-v1450/powerRampingParametersCE1-r14/preambleInitialReceivedTargetPowerCE1-r14
Q-OffsetRange
RRM-Config/ue-InactiveTime
RRM-Config-NB/ue-InactiveTime
SIB-Type
SL-CommResourcePoolV2X-r14/sizeSubchannel-r14
SL-PeriodComm-r12
SupportedBandUTRA-FDD
SystemInformation-r8-IEs/sib-TypeAndInfo
T-PollRetransmit
T-Reordering
T-StatusProhibit
@ -169,7 +181,7 @@ SI-OrPSI-GERAN TYPE_PREFIX
#RAT-Type ::= ENUMERATED {
# eutra, utra, geran-cs, geran-ps, cdma2000-1XRTT,
# spare3, spare2, spare1, ...}
# nr, eutra-nr, spare1, ...}
# ueCapabilityRAT-Container
# Container for the UE capabilities of the indicated RAT. The encoding is defined in the specification of each RAT:
# For E-UTRA: the encoding of UE capabilities is defined in IE UE-EUTRA-Capability.
@ -191,6 +203,8 @@ SI-OrPSI-GERAN TYPE_PREFIX
# For CDMA2000-1XRTT: the octet string contains the A21 Mobile Subscription Information and the encoding of this is
# defined in A.S0008 [33]. The A21 Mobile Subscription Information contains the supported CDMA2000 1xRTT band
# class and band sub-class information.
# For NR: The octet string contains the IE UE-NR-Capability as defined in TS 38.331 [82].
# For EUTRA-NR: The octet string contains the IE UE-MRDC-Capability as defined in TS 38.331 [82]
#.FN_BODY UE-CapabilityRAT-Container/ueCapabilityRAT-Container VAL_PTR = &ue_cap_tvb
tvbuff_t *ue_cap_tvb=NULL;
@ -246,6 +260,14 @@ if(ue_cap_tvb){
/* cdma2000-1XRTT */
/* dissection of "A21 Mobile Subscription Information" could be added to packet-ansi_a.c */
break;
case RAT_Type_nr:
/* nr */
dissect_nr_rrc_UE_NR_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
break;
case RAT_Type_eutra_nr:
/* eutra-nr */
dissect_nr_rrc_UE_MRDC_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
break;
default:
break;
}
@ -938,6 +960,9 @@ CellSelectionInfoCE1-v1360/delta-RxLevMinCE1-v1360 STRINGS=VALS(lte_rrc_delta_Rx
#.TYPE_ATTR
CellSelectionInfo-v920/q-QualMinOffset-r9 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
MobilityControlInfo/eag_4/schedulingInfoSIB1-BR-r14 TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_schedulingInfoSIB1_BR_r13_vals_ext
#.TYPE_ATTR
TrafficPatternInfo-r14/timingOffset-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds
@ -1647,6 +1672,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionResumeComplete-r13");
#.FN_HDR ULInformationTransferMRDC
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ULInformationTransferMRDC");
#.FN_HDR SCPTMConfiguration-r13
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SCPTMConfiguration-r13");
@ -2302,6 +2331,142 @@ SL-V2X-InterFreqUE-Config-r14/offsetDFN-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(
#.TYPE_ATTR
P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.FN_BODY RRCConnectionReconfiguration-v15x0-IEs/endc-Config-r15/nr-SecondaryCellGroupConfig-r15 VAL_PTR = &rrc_reconfiguration_tvb
tvbuff_t *rrc_reconfiguration_tvb = NULL;
%(DEFAULT_BODY)s
if (rrc_reconfiguration_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nr_SecondaryCellGroupConfig_r15);
dissect_nr_rrc_RRCReconfiguration_PDU(rrc_reconfiguration_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RRCConnectionReconfiguration-v15x0-IEs/endc-Config-r15/nr-RadioBearerConfig-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nr_RadioBearerConfig_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RRCConnectionReconfiguration-v15x0-IEs/endc-Config-r15/nr-RadioBearerConfigS-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nr_RadioBearerConfigS_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RRCConnectionReconfigurationComplete-v15xy-IEs/scg-ConfigResponseNR-r15 VAL_PTR = &rrc_reconfiguration_complete_tvb
tvbuff_t *rrc_reconfiguration_complete_tvb = NULL;
%(DEFAULT_BODY)s
if (rrc_reconfiguration_complete_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_scg_ConfigResponseNR_r15);
dissect_nr_rrc_RRCReconfigurationComplete_PDU(rrc_reconfiguration_complete_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RRCConnectionResume-v15x0-IEs/nr-RadioBearerConfig-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nr_RadioBearerConfig_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RRCConnectionResume-v15x0-IEs/nr-RadioBearerConfigS-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nr_RadioBearerConfigS_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY FailureReportSCG-NR-r15/measResultSCG-r15 VAL_PTR = &meas_results_tvb
tvbuff_t *meas_results_tvb = NULL;
%(DEFAULT_BODY)s
if (meas_results_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_measResultSCG_r15);
dissect_nr_rrc_MeasResults_PDU(meas_results_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY ULInformationTransferMRDC-r15-IEs/ul-DCCH-MessageNR-r15 VAL_PTR = &nr_ul_dcch_tvb
tvbuff_t *nr_ul_dcch_tvb = NULL;
%(DEFAULT_BODY)s
if (nr_ul_dcch_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_ul_DCCH_MessageNR_r15);
dissect_nr_rrc_UL_DCCH_Message_PDU(nr_ul_dcch_tvb, actx->pinfo, subtree, NULL);
}
#
# EUTRA-InterNodeDefinitions
#
#.FN_BODY AS-Config/eag_4/sourceRB-ConfigNR-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sourceRB_ConfigNR_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY AS-Config/eag_4/sourceRB-ConfigSN-NR-r15 VAL_PTR = &radio_bearer_config_tvb
tvbuff_t *radio_bearer_config_tvb = NULL;
%(DEFAULT_BODY)s
if (radio_bearer_config_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sourceRB_ConfigSN_NR_r15);
dissect_nr_rrc_RadioBearerConfig_PDU(radio_bearer_config_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY AS-Config/eag_4/sourceOtherConfigSN-NR-r15 VAL_PTR = &rrc_reconfiguration_tvb
tvbuff_t *rrc_reconfiguration_tvb = NULL;
%(DEFAULT_BODY)s
if (rrc_reconfiguration_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sourceOtherConfigSN_NR_r15);
dissect_nr_rrc_RRCReconfiguration_PDU(rrc_reconfiguration_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY AS-Context-v1130/eag_2/sourceContextENDC-r15 VAL_PTR = &scg_config_info_tvb
tvbuff_t *scg_config_info_tvb = NULL;
%(DEFAULT_BODY)s
if (scg_config_info_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sourceContextENDC_r15);
dissect_nr_rrc_SCG_ConfigInfo_PDU(scg_config_info_tvb, actx->pinfo, subtree, NULL);
}
#
# EUTRA-Sidelink-Preconf
#

42
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -1,28 +1,15 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V14.4.0 Release 14) packet dissection
* (3GPP TS 36.331 V15.0.1 Release 15) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2017, Pascal Quantin
* Copyright 2009-2018, Pascal Quantin
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include "config.h"
@ -49,6 +36,7 @@
#include "packet-mac-lte.h"
#include "packet-rlc-lte.h"
#include "packet-pdcp-lte.h"
#include "packet-nr-rrc.h"
#include "packet-lte-rrc.h"
#define PNAME "LTE Radio Resource Control (RRC) protocol"
@ -296,6 +284,16 @@ static gint ett_lte_rrc_sib11_fragment = -1;
static gint ett_lte_rrc_sib11_fragments = -1;
static gint ett_lte_rrc_sib12_fragment = -1;
static gint ett_lte_rrc_sib12_fragments = -1;
static gint ett_lte_rrc_nr_SecondaryCellGroupConfig_r15 = -1;
static gint ett_lte_rrc_nr_RadioBearerConfig_r15 = -1;
static gint ett_lte_rrc_nr_RadioBearerConfigS_r15 = -1;
static gint ett_lte_rrc_scg_ConfigResponseNR_r15 = -1;
static gint ett_lte_rrc_measResultSCG_r15 = -1;
static gint ett_lte_rrc_ul_DCCH_MessageNR_r15 = -1;
static gint ett_lte_rrc_sourceRB_ConfigNR_r15 = -1;
static gint ett_lte_rrc_sourceRB_ConfigSN_NR_r15 = -1;
static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15 = -1;
static gint ett_lte_rrc_sourceContextENDC_r15 = -1;
static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT;
@ -4192,7 +4190,17 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_sib11_fragment,
&ett_lte_rrc_sib11_fragments,
&ett_lte_rrc_sib12_fragment,
&ett_lte_rrc_sib12_fragments
&ett_lte_rrc_sib12_fragments,
&ett_lte_rrc_nr_SecondaryCellGroupConfig_r15,
&ett_lte_rrc_nr_RadioBearerConfig_r15,
&ett_lte_rrc_nr_RadioBearerConfigS_r15,
&ett_lte_rrc_scg_ConfigResponseNR_r15,
&ett_lte_rrc_measResultSCG_r15,
&ett_lte_rrc_ul_DCCH_MessageNR_r15,
&ett_lte_rrc_sourceRB_ConfigNR_r15,
&ett_lte_rrc_sourceRB_ConfigSN_NR_r15,
&ett_lte_rrc_sourceOtherConfigSN_NR_r15,
&ett_lte_rrc_sourceContextENDC_r15
};
static ei_register_info ei[] = {

16
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
View File

@ -1,23 +1,11 @@
/* packet-llc-rrc-template.h
/* packet-lte-rrc-template.h
* Copyright 2009, Anders Broman <anders.broman@ericsson.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PACKET_LTE_RRC_H

1
epan/dissectors/asn1/nr-rrc/CMakeLists.txt
View File

@ -38,6 +38,7 @@ set( ASN_FILE_LIST
set( EXTRA_DIST
${ASN_FILE_LIST}
packet-${PROTOCOL_NAME}-template.c
packet-${PROTOCOL_NAME}-template.h
${PROTOCOL_NAME}.cnf
)

1
epan/dissectors/asn1/nr-rrc/Makefile.am
View File

@ -32,6 +32,7 @@ EXTRA_DIST = \
$(EXTRA_DIST_COMMON) \
$(ASN_FILE_LIST) \
packet-$(PROTOCOL_NAME)-template.c \
packet-$(PROTOCOL_NAME)-template.h \
$(PROTOCOL_NAME).cnf
SRC_FILES = \

1
epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn
View File

@ -179,5 +179,6 @@ CandidateRS-IndexInfo ::= SEQUENCE {
maxCellPrep INTEGER ::= 1
maxCellSCG INTEGER ::= 1
maxRS-IndexReport INTEGER ::= 1
MeasResultSSTD ::= SEQUENCE {}
END

2
epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn
View File

@ -2983,6 +2983,7 @@ AdditionalSpectrumEmission ::= INTEGER (1..32)
ARFCN-ValueNR ::= INTEGER
BandwidthParts ::= BandwidthPart
BSR-Configuration ::= BSR-Config
BWPerCC ::= CA-BandwidthClass
CarrierBandwidthNR ::= ENUMERATED {ffs}
ControlResourceId ::= ControlResourceSetId
CSI-RS-ConfigurationId ::= INTEGER
@ -2992,6 +2993,7 @@ FilterCoefficient ::= ENUMERATED {
fc0, fc1, fc2, fc3, fc4, fc5,
fc6, fc7, fc8, fc9, fc11, fc13,
fc15, fc17, fc19, spare1, ...}
FreqBandIndicatorNR ::= INTEGER
Hysteresis ::= INTEGER (0..30)
maxBands INTEGER ::= 256
maxCellReport INTEGER ::= 8

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

@ -27,85 +27,63 @@ T-Reassembly
T-StatusProhibit
#.EXPORTS
MeasResults_PDU
SCG-ConfigInfo_PDU
RadioBearerConfig_PDU
RRCReconfiguration_PDU
RRCReconfigurationComplete_PDU
UL-DCCH-Message_PDU
UE-MRDC-Capability_PDU
UE-NR-Capability_PDU
#.PDU
#UE-MRDC-Capability
#UE-NR-Capability
BCCH-BCH-Message @bcch.bch
DL-DCCH-Message @dl.dcch
MeasResults
RadioBearerConfig
RRCReconfiguration
RRCReconfigurationComplete
SCG-ConfigInfo
UE-MRDC-Capability
UE-NR-Capability
UL-DCCH-Message @ul.dcch
#.END
#.OMIT_ASSIGNMENT
AS-Context
BandCombination
BandCombinationList
BandNR
BandwidthPart-Config
BasebandParametersPerBand
BasebandParametersPerCC
BasebandProcessingCombination
BasebandProcessingCombination-MRDC
BasebandProcessingCombinationIndex
BeamManagement
CA-BandwidthClass
CandidateCellInfo
CandidateCellInfoList
CandidateRS-IndexInfo
CandidateRS-IndexInfoList
ConfigRestrictInfoSCG
ConfigRestrictModReqSCG
ControlResourceIndex
CSI-IM-ResourceConfig
CSI-IM-ResourceConfigId
DRX-Info
FailureReportSCG-ToOtherRAT
HandoverCommand
HandoverCommand-r15-IEs
HandoverPreparationInformation
HandoverPreparationInformation-r15-IEs
LinkedBasebandProcessingCombination
MAC-Parameters
MeasParameters-MRDC
MeasResult2NR
MeasResultList2NR
MeasResultServFreq2NR
MeasResultServFreqList2NR
MIMO-Capability
ModulationOrder
PDCP-Parameters
PhyLayerParameters
PhyLayerParameters-MRDC
PUCCH-F2-number-of-PRB
PUCCH-format0
PUCCH-format1
PUCCH-format2
PUCCH-format3
PUCCH-format4
RadioBearerConfiguration
RAT-Type
ReestabNCellInfo
ReestabNCellInfoList
RF-Parameters
RF-Parameters-MRDC
RLC-Parameters
RRM-Config
SIB1
SCG-Config
SCG-Config-r15-IEs
SCG-ConfigInfo
SCG-ConfigInfo-r15-IEs
ShortMAC-I
SubCarrierSpacing
SubcarrierSpacingRACH
SupportedBandCombination
SupportedBandListNR
SupportedBasebandProcessingCombination
UE-CapabilityRAT-Container
UE-CapabilityRAT-ContainerList
UE-MRDC-Capability
UE-NR-Capability
UECapabilityInformation
ZP-CSI-RS-Resource
ZP-CSI-RS-ResourceId
@ -190,13 +168,13 @@ ZP-CSI-RS-ResourceId
# }
# }
# #.FN_BODY UECapabilityInformation VAL_PTR = &parameter_tvb
# tvbuff_t *parameter_tvb;
# proto_tree *subtree;
#
# %(DEFAULT_BODY)s
#
# if (parameter_tvb) {
# subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_UECapabilityInformation);
# dissect_lte_rrc_UECapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
# }
#.FN_BODY UECapabilityInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_UECapabilityInformation);
dissect_lte_rrc_UECapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}

5
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
View File

@ -9,7 +9,6 @@
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0+
*
*/
#include "config.h"
@ -23,6 +22,7 @@
#include "packet-per.h"
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#define PNAME "NR Radio Resource Control (RRC) protocol"
#define PSNAME "NR RRC"
@ -43,8 +43,9 @@ static gint ett_nr_rrc = -1;
#include "packet-nr-rrc-ett.c"
static gint ett_nr_rrc_UECapabilityInformation = -1;
#if 0
/* Forward declarations */
int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
#if 0
static int dissect_UE_NR_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_UE_MRDC_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

16
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h Normal file
View File

@ -0,0 +1,16 @@
/* packet-nr-rrc-template.h
* Copyright 2018, Pascal Quantin
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PACKET_NR_RRC_H
#define PACKET_NR_RRC_H
#include "packet-nr-rrc-exp.h"
#endif /* PACKET_NR_RRC_H */

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

File diff suppressed because it is too large Load Diff

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

@ -6,26 +6,14 @@
/* Input file: packet-lte-rrc-template.h */
#line 1 "./asn1/lte-rrc/packet-lte-rrc-template.h"
/* packet-llc-rrc-template.h
/* packet-lte-rrc-template.h
* Copyright 2009, Anders Broman <anders.broman@ericsson.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PACKET_LTE_RRC_H
@ -53,6 +41,6 @@ int dissect_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU(tvbuff_t *tvb _U_,
int dissect_lte_rrc_UERadioPagingInformation_NB_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 29 "./asn1/lte-rrc/packet-lte-rrc-template.h"
#line 17 "./asn1/lte-rrc/packet-lte-rrc-template.h"
#endif /* PACKET_LTE_RRC_H */

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

File diff suppressed because it is too large Load Diff

37
epan/dissectors/packet-nr-rrc.h Normal file
View File

@ -0,0 +1,37 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-nr-rrc.h */
/* asn2wrs.py -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn */
/* Input file: packet-nr-rrc-template.h */
#line 1 "./asn1/nr-rrc/packet-nr-rrc-template.h"
/* packet-nr-rrc-template.h
* Copyright 2018, Pascal Quantin
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PACKET_NR_RRC_H
#define PACKET_NR_RRC_H
/*--- Included file: packet-nr-rrc-exp.h ---*/
#line 1 "./asn1/nr-rrc/packet-nr-rrc-exp.h"
int dissect_nr_rrc_SCG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasResults_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_);
int dissect_nr_rrc_UE_MRDC_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UE_NR_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
/*--- End of included file: packet-nr-rrc-exp.h ---*/
#line 15 "./asn1/nr-rrc/packet-nr-rrc-template.h"
#endif /* PACKET_NR_RRC_H */