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

NR RRC: upgrade dissector to v15.1.0 

Change-Id: If34d8627e8dee0e9dd7c1dc72701aec57df68853
Reviewed-on: https://code.wireshark.org/review/26774
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2018-04-06 12:26:31 +02:00 committed by Anders Broman
parent 485cec5bdf
commit 64d6a7b846
18 changed files with 30833 additions and 11743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,7 +394,7 @@ BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SCG_Config_Info);
dissect_nr_rrc_SCG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY CellGroupConfig VAL_PTR = &param_tvb
@ -428,6 +428,13 @@ BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
}
}
#.FN_BODY SIB1-message 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_SIB1_message);
dissect_nr_rrc_SIB1_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_HDR Reset
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset");

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

@ -47,6 +47,7 @@ static gint ett_f1ap = -1;
static gint ett_f1ap_ResourceCoordinationTransferContainer = -1;
static gint ett_f1ap_PLMN_Identity = -1;
static gint ett_f1ap_MIB_message = -1;
static gint ett_f1ap_SIB1_message = -1;
static gint ett_f1ap_SCG_Config_Info = -1;
static gint ett_f1ap_CellGroupConfig = -1;
static gint ett_f1ap_TransportLayerAddress = -1;
@ -190,6 +191,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_ResourceCoordinationTransferContainer,
&ett_f1ap_PLMN_Identity,
&ett_f1ap_MIB_message,
&ett_f1ap_SIB1_message,
&ett_f1ap_SCG_Config_Info,
&ett_f1ap_CellGroupConfig,
&ett_f1ap_TransportLayerAddress,

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

@ -40,7 +40,6 @@ HandoverPreparationInformation-NB_PDU
RLF-Report-r9_PDU
RLF-Report-v9e0_PDU
SCG-ConfigInfo-r12_PDU
UECapabilityInformation_PDU
UEPagingCoverageInformation_PDU
UEPagingCoverageInformation-NB_PDU
UE-EUTRA-Capability_PDU
@ -166,6 +165,14 @@ SI-OrPSI-GERAN TYPE_PREFIX
lte_rrc_call_dissector(nas_eps_handle, nas_eps_tvb, actx->pinfo, subtree);
}
#.FN_BODY UECapabilityEnquiry-v1510-IEs/requestedFreqBandsNR-MRDC-r15 VAL_PTR = &freq_band_list_tvb
tvbuff_t *freq_band_list_tvb = NULL;
%(DEFAULT_BODY)s
if (freq_band_list_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_requestedFreqBandsNR_MRDC_r15);
dissect_nr_rrc_FreqBandList_PDU(freq_band_list_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY UE-CapabilityRAT-Container
/* Initialise to invalid value */
private_data_set_rat_type(actx, 0xFF);
@ -2465,7 +2472,7 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
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);
dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(scg_config_info_tvb, actx->pinfo, subtree, NULL);
}
#

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

@ -294,6 +294,7 @@ 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 gint ett_lte_rrc_requestedFreqBandsNR_MRDC_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;
@ -348,6 +349,7 @@ static const fragment_items lte_rrc_sib12_frag_items = {
/* Forward declarations */
static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_1_val = {
"Intra-subframe freq hopping for PUSCH scheduled by UL grant; DCI format 3a; Aperiodic CQI/PMI/RI report on PUSCH: Mode 2-0 & 2-2 - Supported",
@ -4200,7 +4202,8 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_sourceRB_ConfigNR_r15,
&ett_lte_rrc_sourceRB_ConfigSN_NR_r15,
&ett_lte_rrc_sourceOtherConfigSN_NR_r15,
&ett_lte_rrc_sourceContextENDC_r15
&ett_lte_rrc_sourceContextENDC_r15,
&ett_lte_rrc_requestedFreqBandsNR_MRDC_r15
};
static ei_register_info ei[] = {

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

@ -21,6 +21,7 @@ set( EXT_ASN_FILE_LIST
set( ASN_FILE_LIST
NR-InterNodeDefinitions.asn
NR-RRC-Definitions.asn
NR-UE-Variables.asn
)
set( EXTRA_DIST

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

@ -14,7 +14,8 @@ EXT_ASN_FILE_LIST =
ASN_FILE_LIST = \
NR-InterNodeDefinitions.asn \
NR-RRC-Definitions.asn
NR-RRC-Definitions.asn \
NR-UE-Variables.asn
EXTRA_DIST = \
$(EXTRA_DIST_COMMON) \

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

@ -1,27 +1,45 @@
-- 3GPP TS 38.331 V15.0.0 (2017-12)
-- 3GPP TS 38.331 V15.1.0 (2018-03)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
ARFCN-ValueNR,
CellIdentity,
CSI-RS-Index,
GapConfig,
maxBandComb,
maxBasebandProcComb,
maxNrofSCells,
maxNrofIndexesToReport,
MeasQuantityResults,
MeasResultSCG-Failure,
MeasResultCellListSFTD,
P-Max,
PhysCellId,
RadioBearerConfig,
RRCReconfiguration,
ServCellIndex,
SSB-Index,
ShortMAC-I,
UE-CapabilityRAT-ContainerList
FROM NR-RRC-Definitions;
-- TAG_NR-INTER-NODE-DEFINITIONS-STOP
-- TAG-HANDOVER-COMMAND-START
HandoverCommand ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
handoverCommand-r15 HandoverCommand-r15-IEs,
handoverCommand HandoverCommand-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
HandoverCommand-r15-IEs ::= SEQUENCE {
HandoverCommand-IEs ::= SEQUENCE {
handoverCommandMessage OCTET STRING (CONTAINING RRCReconfiguration),
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -32,14 +50,14 @@ HandoverCommand-r15-IEs ::= SEQUENCE {
HandoverPreparationInformation ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
handoverPreparationInformation-r15 HandoverPreparationInformation-r15-IEs,
handoverPreparationInformation HandoverPreparationInformation-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
HandoverPreparationInformation-r15-IEs ::= SEQUENCE {
HandoverPreparationInformation-IEs ::= SEQUENCE {
ue-CapabilityRAT-List UE-CapabilityRAT-ContainerList,
sourceConfig OCTET STRING (CONTAINING RRCReconfiguration),
rrm-Config RRM-Config OPTIONAL,
@ -51,7 +69,7 @@ AS-Context ::= SEQUENCE {
reestablishmentInfo SEQUENCE {
sourcePhysCellId PhysCellId,
targetCellShortMAC-I ShortMAC-I,
additionalReestabInfoList AdditionalReestabInfoList OPTIONAL
additionalReestabInfoList ReestabNCellInfoList OPTIONAL
} OPTIONAL,
-- FFS Whether to change e.g. move all re-establishment info to Xx
configRestrictInfo ConfigRestrictInfoSCG OPTIONAL,
@ -61,124 +79,229 @@ AS-Context ::= SEQUENCE {
ReestabNCellInfoList ::= SEQUENCE ( SIZE (1..maxCellPrep) ) OF ReestabNCellInfo
ReestabNCellInfo::= SEQUENCE{
cellIdentity CellIdentity,
key-gNodeB-Star BIT STRING (SIZE (256)),
shortMAC-I ShortMAC-I
cellIdentity CellIdentity,
key-gNodeB-Star BIT STRING (SIZE (256)),
shortMAC-I ShortMAC-I
}
RRM-Config ::= SEQUENCE {
ue-InactiveTime INTEGER,
ue-InactiveTime ENUMERATED {
s1, s2, s3, s5, s7, s10, s15, s20,
s25, s30, s40, s50, min1, min1s20c, min1s40,
min2, min2s30, min3, min3s30, min4, min5, min6,
min7, min8, min9, min10, min12, min14, min17, min20,
min24, min28, min33, min38, min44, min50, hr1,
hr1min30, hr2, hr2min30, hr3, hr3min30, hr4, hr5, hr6,
hr8, hr10, hr13, hr16, hr20, day1, day1hr12, day2,
day2hr12, day3, day4, day5, day7, day10, day14, day19,
day24, day30, dayMoreThan30} OPTIONAL ,
candidateCellInfoList CandidateCellInfoList OPTIONAL,
...
}
-- TAG-HANDOVER-PREPARATION-INFORMATION-STOP
-- TAG-SCG-CONFIG-START
-- TAG-CG-CONFIG-START
SCG-Config ::= SEQUENCE {
CG-Config ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
scg-Config-r15 SCG-Config-r15-IEs,
cg-Config CG-Config-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
SCG-Config-r15-IEs ::= SEQUENCE {
scg-CellGroupdConfig OCTET STRING (CONTAINING RRCReconfiguration) OPTIONAL,
p-maxFR1 P-Max OPTIONAL,
scg-RB-Config OCTET STRING (CONTAINING RadioBearerConfiguration) OPTIONAL,
configRestrictModReq ConfigRestrictModReqSCG OPTIONAL,
candidateCellInfoList CandidateCellInfoList OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
CG-Config-IEs ::= SEQUENCE {
scg-CellGroupConfig OCTET STRING (CONTAINING RRCReconfiguration) OPTIONAL,
scg-RB-Config OCTET STRING (CONTAINING RadioBearerConfig) OPTIONAL,
configRestrictModReq ConfigRestrictModReqSCG OPTIONAL,
drx-InfoSCG DRX-Info OPTIONAL,
candidateCellInfoListSN OCTET STRING (CONTAINING CandidateCellInfoList) OPTIONAL,
measConfigSN MeasConfigSN OPTIONAL,
selectedBandCombinationNR BandCombinationIndex OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
MeasConfigSN ::= SEQUENCE {
measuredFrequenciesFR1 SEQUENCE (SIZE (1..maxMeasFreqsMN)) OF NR-FreqInfo OPTIONAL,
...
}
NR-FreqInfo ::= SEQUENCE {
measuredFrequency ARFCN-ValueNR OPTIONAL,
...
}
ConfigRestrictModReqSCG ::= SEQUENCE {
requestedBC-List-NR SEQUENCE OF INTEGER OPTIONAL,
requestedBPC-List-NR SEQUENCE OF INTEGER OPTIONAL,
-- FFS Signalling details of BC and BPC restrictions requested by SgNB to be alleviated
requestedBC-MRDC BandCombinationIndex OPTIONAL,
requestedBPC-ListMRDC BPC-IndexList OPTIONAL,
requestedP-MaxFR1 P-Max OPTIONAL,
...
}
-- TAG-SCG-CONFIG-STOP
-- TAG-SCG-CONFIG-INFO-START
BandCombinationIndex ::= INTEGER (1..maxBandComb)
SCG-ConfigInfo ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
scg-ConfigInfo-r15 SCG-ConfigInfo-r15-IEs,
-- TAG-CG-CONFIG-STOP
-- TAG-CG-CONFIG-INFO-START
CG-ConfigInfo ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
cg-ConfigInfo CG-ConfigInfo-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
criticalExtensionsFuture SEQUENCE {}
}
}
SCG-ConfigInfo-r15-IEs ::= SEQUENCE {
eutra-CapabilityInfo OCTET STRING (CONTAINING UECapabilityInformation) OPTIONAL,
candidateCellInfoList CandidateCellInfoList OPTIONAL,
measResultSSTD MeasResultSSTD OPTIONAL,
configRestrictInfo ConfigRestrictInfoSCG OPTIONAL,
drx-InfoMCG DRX-Info OPTIONAL,
sourceConfigSCG OCTET STRING (CONTAINING RRCReconfiguration) OPTIONAL,
p-maxFR1 P-Max OPTIONAL,
mcg-RB-Config OCTET STRING (CONTAINING RadioBearerConfiguration) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
CG-ConfigInfo-IEs ::= SEQUENCE {
ue-CapabilityInfo OCTET STRING (CONTAINING UE-CapabilityRAT-ContainerList) OPTIONAL,-- Cond SN-Addition
candidateCellInfoListMN CandidateCellInfoList OPTIONAL,
candidateCellInfoListSN OCTET STRING (CONTAINING CandidateCellInfoList) OPTIONAL,
measResultCellListSFTD MeasResultCellListSFTD OPTIONAL,
scgFailureInfo SEQUENCE {
failureType ENUMERATED { t310-Expiry, randomAccessProblem,
rlc-MaxNumRetx, scg-ChangeFailure,
scg-reconfigFailure,
srb3-IntegrityFailure},
measResultSCG OCTET STRING (CONTAINING MeasResultSCG-Failure)
} OPTIONAL,
configRestrictInfo ConfigRestrictInfoSCG OPTIONAL,
drx-InfoMCG DRX-Info OPTIONAL,
measConfigMN MeasConfigMN OPTIONAL,
sourceConfigSCG OCTET STRING (CONTAINING RRCReconfiguration) OPTIONAL,
scg-RB-Config OCTET STRING (CONTAINING RadioBearerConfig) OPTIONAL,
mcg-RB-Config OCTET STRING (CONTAINING RadioBearerConfig) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
ConfigRestrictInfoSCG ::= SEQUENCE {
restrictedBandCombinationNR INTEGER OPTIONAL,
restrictedBasebandCombinationNR-NR SEQUENCE OF INTEGER OPTIONAL,
-- FFS Signalling details of BC and BPC restrictions to be observed by SgNB
-- FFS Signalling details regarding power coordination
maxMeasFreqsSCG-NR INTEGER OPTIONAL,
ConfigRestrictInfoSCG ::= SEQUENCE {
allowedBC-ListMRDC BandCombinationIndexList OPTIONAL,
allowedBPC-ListMRDC BPC-IndexList OPTIONAL,
powerCoordination-FR1 SEQUENCE {
p-maxNR P-Max OPTIONAL,
p-maxEUTRA P-Max OPTIONAL
} OPTIONAL,
servCellIndexRangeSCG SEQUENCE {
lowBound ServCellIndex,
upBound ServCellIndex
} OPTIONAL, -- Cond SN-Addition
maxMeasFreqsSCG-NR INTEGER(1..maxMeasFreqsMN) OPTIONAL,
...
}
BandCombinationIndexList ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationIndex
BPC-IndexList ::= SEQUENCE (SIZE (1..maxBasebandProcComb)) OF BPC-Index
BPC-Index ::= INTEGER (1..maxBasebandProcComb)
DRX-Info ::= SEQUENCE {
cycle INTEGER,
offset INTEGER
drx-LongCycleStartOffset CHOICE {
ms10 INTEGER(0..9),
ms20 INTEGER(0..19),
ms32 INTEGER(0..31),
ms40 INTEGER(0..39),
ms60 INTEGER(0..59),
ms64 INTEGER(0..63),
ms70 INTEGER(0..69),
ms80 INTEGER(0..79),
ms128 INTEGER(0..127),
ms160 INTEGER(0..159),
ms256 INTEGER(0..255),
ms320 INTEGER(0..319),
ms512 INTEGER(0..511),
ms640 INTEGER(0..639),
ms1024 INTEGER(0..1023),
ms1280 INTEGER(0..1279),
ms2048 INTEGER(0..2047),
ms2560 INTEGER(0..2559),
ms5120 INTEGER(0..5119),
ms10240 INTEGER(0..10239)
},
shortDRX SEQUENCE {
drx-ShortCycle ENUMERATED {
ms2, ms3, ms4, ms5, ms6, ms7, ms8, ms10, ms14, ms16, ms20, ms30, ms32,
ms35, ms40, ms64, ms80, ms128, ms160, ms256, ms320, ms512, ms640, spare9,
spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1 },
drx-ShortCycleTimer INTEGER (1..16)
} OPTIONAL
}
-- TAG-SCG-CONFIG-INFO-STOP
MeasConfigMN ::= SEQUENCE {
measuredFrequenciesMN SEQUENCE (SIZE (1..maxMeasFreqsMN)) OF NR-FreqInfo OPTIONAL,
measGapConfigFR1 GapConfig OPTIONAL,
gapPurpose ENUMERATED {perUE, perFR1} OPTIONAL,
...
}
-- TAG-CG-CONFIG-INFO-STOP
-- TAG-MEASUREMENT-TIMING-CONFIGURATION-START
MeasurementTimingConfiguration ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
measTimingConf MeasurementTimingConfiguration-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
MeasurementTimingConfiguration-IEs ::= SEQUENCE {
measTiming MeasTimingList OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
MeasTimingList ::= SEQUENCE (SIZE (1..maxMeasFreqsMN)) OF MeasTiming
MeasTiming ::= SEQUENCE {
carrierFreq ARFCN-ValueNR OPTIONAL,
ssb-MeasurementTimingConfiguration ENUMERATED {ffsTypeAndValue} OPTIONAL,
...
}
-- TAG-MEASUREMENT-TIMING-CONFIGURATION-STOP
-- TAG-CANDIDATE-CELL-INFO-LIST-START
CandidateCellInfoList ::= SEQUENCE (SIZE (1..maxCellSCG)) OF CandidateCellInfo
CandidateCellInfoList ::= SEQUENCE (SIZE (1.. maxNrofSCells)) OF CandidateCellInfo
CandidateCellInfo ::= SEQUENCE {
-- FFS whether to introduce something additional for transfer of SN configured measurements
CandidateCellInfo ::= SEQUENCE {
cellIdentification SEQUENCE {
physCellId PhysCellId,
dl-CarrierFreq ARFCN-ValueNR
},
measResultCell SEQUENCE {
rsrpResultCell RSRP-Range,
rsrqResultCell RSRQ-Range
-- FFS whether to support SINR
} OPTIONAL,
candidateRS-IndexList CandidateRS-IndexInfoList OPTIONAL,
measResultCell MeasQuantityResults OPTIONAL,
candidateRS-IndexListSSB CandidateRS-IndexInfoListSSB OPTIONAL,
candidateRS-IndexListCSI-RS CandidateRS-IndexInfoListCSI-RS OPTIONAL,
...
}
CandidateRS-IndexInfoList ::= SEQUENCE (SIZE (1..maxRS-IndexReport)) OF CandidateRS-IndexInfo -- WS modification: was CandidateBeamInfoList
CandidateRS-IndexInfoListSSB ::= SEQUENCE (SIZE (1..maxNrofIndexesToReport)) OF CandidateRS-IndexInfoSSB
CandidateRS-IndexInfo ::= SEQUENCE {
-- FFS whether to support CSI RS based beam results also
ssb-Index SSB-Index,
measResultSSB SEQUENCE {
rsrpResultCell RSRP-Range,
rsrqResultCell RSRQ-Range
-- FFS whether to support SINR
} OPTIONAL,
CandidateRS-IndexInfoSSB ::= SEQUENCE {
ssb-Index SSB-Index,
measResultSSB MeasQuantityResults OPTIONAL,
...
}
CandidateRS-IndexInfoListCSI-RS ::= SEQUENCE (SIZE (1..maxNrofIndexesToReport)) OF CandidateRS-IndexInfoCSI-RS
CandidateRS-IndexInfoCSI-RS ::= SEQUENCE {
csi-RS-Index CSI-RS-Index,
measResultCSI-RS MeasQuantityResults OPTIONAL,
...
}
-- TAG-CANDIDATE-CELL-INFO-LIST-STOP
-- TAG_NR-MULTIPLICITY-AND-CONSTRAINTS-START
-- WS modification: fake definitions for missing entries in ASN.1
maxCellPrep INTEGER ::= 1
maxCellSCG INTEGER ::= 1
maxRS-IndexReport INTEGER ::= 1
MeasResultSSTD ::= SEQUENCE {}
maxMeasFreqsMN INTEGER ::= 32 -- Maximum number of MN-configured measurement frequencies
-- WS modification: already defined in NR-RRC-Definitions
-- maxCellPrep INTEGER ::= 32 Maximum number of cells prepared for handover
-- TAG_NR-MULTIPLICITY-AND-CONSTRAINTS-STOP
-- TAG_NR-INTER-NODE-DEFINITIONS-END-START
END

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

File diff suppressed because it is too large Load Diff

59
epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn Normal file
View File

@ -0,0 +1,59 @@
-- 3GPP TS 38.331 V15.1.0 (2018-03)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
MeasId,
MeasIdToAddModList,
MeasObjectToAddModList,
PhysCellId,
ReportConfigToAddModList,
RSRP-Range,
QuantityConfig,
maxNrofCellMeas,
maxNrofMeasId
FROM NR-RRC-Definitions;
-- TAG-VAR-MEAS-CONFIG-START
VarMeasConfig ::= SEQUENCE {
-- Measurement identities
measIdList MeasIdToAddModList OPTIONAL,
-- Measurement objects
measObjectList MeasObjectToAddModList OPTIONAL,
-- Reporting configurations
reportConfigList ReportConfigToAddModList OPTIONAL,
-- Other parameters
quantityConfig QuantityConfig OPTIONAL,
s-MeasureConfig CHOICE {
ssb-RSRP RSRP-Range,
csi-RSRP RSRP-Range
} OPTIONAL
}
-- TAG-VAR-MEAS-CONFIG-STOP
-- TAG-VAR-MEAS-REPORT-START
VarMeasReportList ::= SEQUENCE (SIZE (1..maxNrofMeasId)) OF VarMeasReport
VarMeasReport ::= SEQUENCE {
-- List of measurement that have been triggered
measId MeasId,
cellsTriggeredList CellsTriggeredList OPTIONAL,
numberOfReportsSent INTEGER
}
CellsTriggeredList ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CHOICE {
physCellId PhysCellId,
-- Not needed for EN-DC.
physCellIdEUTRA ENUMERATED {ffsTypeAndValue}
}
-- TAG-VAR-MEAS-REPORT-STOP
END

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

@ -8,32 +8,41 @@ UNALIGNED
#.END
#.USE_VALS_EXT
DRX-Config/setup/drx-onDurationTimer
DRX-Config/setup/drx-InactivityTimer
DRX-Config/setup/drx-RetransmissionTimerDL
DRX-Config/setup/drx-RetransmissionTimerUL
DRX-Config/setup/drx-LongCycleStartOffset
DRX-Config/setup/shortDRX/drx-ShortCycle
DRX-Config/setup/drx-SlotOffset
PDCP-Config/moreThanOneRLC/ul-DataSplitThreshold/setup
CA-BandwidthClassNR
ConfiguredGrantConfig/configuredGrantTimer
ConfiguredGrantConfig/periodicity
DRX-Config/drx-onDurationTimer/milliSeconds
DRX-Config/drx-InactivityTimer
DRX-Config/drx-RetransmissionTimerDL
DRX-Config/drx-RetransmissionTimerUL
DRX-Config/drx-LongCycleStartOffset
DRX-Config/shortDRX/drx-ShortCycle
DRX-Config/drx-SlotOffset
DRX-Info/drx-LongCycleStartOffset
DRX-Info/shortDRX/drx-ShortCycle
PDCP-Config/t-Reordering
PollByte
PollPDU
Q-OffsetRange
RACH-ConfigCommon/preambleReceivedTargetPower
SPS-Config/uplink/priodicity
ServingCellConfig/bwp-InactivityTimer
SPS-Config/periodicity
SRS-PeriodicityAndOffset
T-PollRetransmit
T-Reassembly
T-StatusProhibit
UL-DataSplitThreshold
#.EXPORTS
CellGroupConfig_PDU
CG-ConfigInfo_PDU
ConfigRestrictInfoSCG_PDU
FreqBandList_PDU
MeasResults_PDU
MIB_PDU
SCG-ConfigInfo_PDU
RadioBearerConfig_PDU
RRCReconfiguration_PDU
RRCReconfigurationComplete_PDU
SIB1_PDU
UL-DCCH-Message_PDU
UE-MRDC-Capability_PDU
UE-NR-Capability_PDU
@ -41,13 +50,16 @@ UE-NR-Capability_PDU
#.PDU
BCCH-BCH-Message @bcch.bch
CellGroupConfig
CG-ConfigInfo
ConfigRestrictInfoSCG
DL-DCCH-Message @dl.dcch
FreqBandList
MIB
MeasResults
RadioBearerConfig
RRCReconfiguration
RRCReconfigurationComplete
SCG-ConfigInfo
SIB1
UE-MRDC-Capability
UE-NR-Capability
UL-DCCH-Message @ul.dcch
@ -55,46 +67,33 @@ UL-DCCH-Message @ul.dcch
#.OMIT_ASSIGNMENT
AS-Context
BandwidthPart-Config
BeamManagement
CellIdentity
CellsTriggeredList
CG-Config
CG-Config-IEs
ConfigRestrictModReqSCG
ControlResourceIndex
CSI-IM-ResourceConfig
CSI-IM-ResourceConfigId
FailureReportSCG-ToOtherRAT
GSCN-ValueNR
HandoverCommand
HandoverCommand-r15-IEs
HandoverCommand-IEs
HandoverPreparationInformation
HandoverPreparationInformation-r15-IEs
MeasResult2NR
MeasResultList2NR
MeasResultServFreq2NR
MeasResultServFreqList2NR
PUCCH-F2-number-of-PRB
PUCCH-format0
PUCCH-format1
PUCCH-format2
PUCCH-format3
PUCCH-format4
RAT-Type
HandoverPreparationInformation-IEs
MeasConfigSN
MeasTiming
MeasTimingList
MeasurementTimingConfiguration
MeasurementTimingConfiguration-IEs
ReestabNCellInfo
ReestabNCellInfoList
RRM-Config
SIB1
SCG-Config
SCG-Config-r15-IEs
ShortMAC-I
SubcarrierSpacingRACH
SupportedBandCombination
UE-CapabilityRAT-Container
UE-CapabilityRAT-ContainerList
ZP-CSI-RS-Resource
ZP-CSI-RS-ResourceId
VarMeasConfig
VarMeasReportList
VarMeasReport
#.NO_EMIT ONLY_VALS
#.MAKE_ENUM
#RAT-Type TYPE_PREFIX
RAT-Type TYPE_PREFIX
#.FN_HDR BCCH-BCH-Message
proto_item *ti;
@ -139,46 +138,33 @@ ZP-CSI-RS-ResourceId
#.FN_HDR RRCReconfigurationComplete
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC Reconfiguration Complete");
# #.FN_BODY UE-CapabilityRAT-Container
# /* Initialise to invalid value */
# private_data_set_rat_type(actx, 0xFF);
# %(DEFAULT_BODY)s
# #.FN_BODY RAT-Type VAL_PTR = &rat_type
# guint32 rat_type;
# %(DEFAULT_BODY)s
# private_data_set_rat_type(actx, (guint8)rat_type);
# #.FN_BODY UE-CapabilityRAT-Container/ueCapabilityRAT-Container VAL_PTR = &ue_cap_tvb
# tvbuff_t *ue_cap_tvb=NULL;
# %(DEFAULT_BODY)s
# #.FN_FTR UE-CapabilityRAT-Container/ueCapabilityRAT-Container
# if (ue_cap_tvb) {
# proto_tree *subtree;
#
# subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_UE_CapabilityRAT_Container);
# switch(private_data_get_rat_type(actx)){
# case RAT_Type_nr:
# /* eutra */
# dissect_nr_rrc_UE_NR_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
# break;
# case RAT_Type_mrdc:
# /* utra */
# dissect_nr_rrc_UE_MRDC_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
# break;
# default:
# break;
# }
# }
#.FN_BODY UECapabilityInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;
#.FN_BODY UE-CapabilityRAT-Container
/* Initialise to invalid value */
private_data_set_rat_type(actx, 0xFF);
%(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 RAT-Type VAL_PTR = &rat_type
guint32 rat_type;
%(DEFAULT_BODY)s
private_data_set_rat_type(actx, (guint8)rat_type);
#.FN_BODY UE-CapabilityRAT-Container/ue-CapabilityRAT-Container VAL_PTR = &ue_cap_tvb
tvbuff_t *ue_cap_tvb=NULL;
%(DEFAULT_BODY)s
#.FN_FTR UE-CapabilityRAT-Container/ue-CapabilityRAT-Container
if (ue_cap_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_UE_CapabilityRAT_Container);
switch(private_data_get_rat_type(actx)){
case RAT_Type_nr:
dissect_nr_rrc_UE_NR_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
break;
case RAT_Type_eutra_nr:
dissect_nr_rrc_UE_MRDC_Capability_PDU(ue_cap_tvb, actx->pinfo, subtree, NULL);
break;
default:
break;
}
}

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

@ -1,7 +1,7 @@
/* packet-nr-rrc-template.c
* NR;
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 38.331 V15.0.0 Release 15) packet dissection
* (3GPP TS 38.331 V15.1.0 Release 15) packet dissection
* Copyright 2018, Pascal Quantin
*
* Wireshark - Network traffic analyzer
@ -43,7 +43,6 @@ static gint ett_nr_rrc = -1;
#include "packet-nr-rrc-ett.c"
static gint ett_nr_rrc_UECapabilityInformation = -1;
#if 0
typedef struct {
guint8 rat_type;
} nr_rrc_private_data_t;
@ -68,7 +67,6 @@ static void private_data_set_rat_type(asn1_ctx_t *actx, guint8 rat_type)
nr_rrc_private_data_t *private_data = (nr_rrc_private_data_t*)nr_rrc_get_private_data(actx);
private_data->rat_type = rat_type;
}
#endif
#include "packet-nr-rrc-fn.c"

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

@ -255,7 +255,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
x2ap_data->triggering_message == successful_outcome)) {
dissect_nr_rrc_RRCReconfigurationComplete_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
} else {
dissect_nr_rrc_SCG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY SgNBtoMeNBContainer VAL_PTR = &parameter_tvb
@ -265,7 +265,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_SgNBtoMeNBContainer);
dissect_nr_rrc_SCG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
#.FN_HDR MCGSplitSRB/rrcContainer
struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);

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

@ -338,6 +338,7 @@ static gint ett_f1ap = -1;
static gint ett_f1ap_ResourceCoordinationTransferContainer = -1;
static gint ett_f1ap_PLMN_Identity = -1;
static gint ett_f1ap_MIB_message = -1;
static gint ett_f1ap_SIB1_message = -1;
static gint ett_f1ap_SCG_Config_Info = -1;
static gint ett_f1ap_CellGroupConfig = -1;
static gint ett_f1ap_TransportLayerAddress = -1;
@ -430,7 +431,7 @@ static gint ett_f1ap_SuccessfulOutcome = -1;
static gint ett_f1ap_UnsuccessfulOutcome = -1;
/*--- End of included file: packet-f1ap-ett.c ---*/
#line 54 "./asn1/f1ap/packet-f1ap-template.c"
#line 55 "./asn1/f1ap/packet-f1ap-template.c"
enum{
INITIATING_MESSAGE,
@ -1146,7 +1147,7 @@ dissect_f1ap_SCG_Config_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SCG_Config_Info);
dissect_nr_rrc_SCG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
@ -1443,8 +1444,17 @@ dissect_f1ap_MIB_message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_f1ap_SIB1_message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 432 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SIB1_message);
dissect_nr_rrc_SIB1_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
@ -1506,7 +1516,6 @@ dissect_f1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
return offset;
}
@ -1707,7 +1716,7 @@ static const per_sequence_t Reset_sequence[] = {
static int
dissect_f1ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 433 "./asn1/f1ap/f1ap.cnf"
#line 440 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1775,7 +1784,7 @@ static const per_sequence_t ResetAcknowledge_sequence[] = {
static int
dissect_f1ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 435 "./asn1/f1ap/f1ap.cnf"
#line 442 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1806,7 +1815,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_f1ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 475 "./asn1/f1ap/f1ap.cnf"
#line 482 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1823,7 +1832,7 @@ static const per_sequence_t F1SetupRequest_sequence[] = {
static int
dissect_f1ap_F1SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 437 "./asn1/f1ap/f1ap.cnf"
#line 444 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1864,7 +1873,7 @@ static const per_sequence_t F1SetupResponse_sequence[] = {
static int
dissect_f1ap_F1SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 439 "./asn1/f1ap/f1ap.cnf"
#line 446 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1895,7 +1904,7 @@ static const per_sequence_t F1SetupFailure_sequence[] = {
static int
dissect_f1ap_F1SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 441 "./asn1/f1ap/f1ap.cnf"
#line 448 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1912,7 +1921,7 @@ static const per_sequence_t GNBDUConfigurationUpdate_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 443 "./asn1/f1ap/f1ap.cnf"
#line 450 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1971,7 +1980,7 @@ static const per_sequence_t GNBDUConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 445 "./asn1/f1ap/f1ap.cnf"
#line 452 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1988,7 +1997,7 @@ static const per_sequence_t GNBDUConfigurationUpdateFailure_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 447 "./asn1/f1ap/f1ap.cnf"
#line 454 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2005,7 +2014,7 @@ static const per_sequence_t GNBCUConfigurationUpdate_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 449 "./asn1/f1ap/f1ap.cnf"
#line 456 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2036,7 +2045,7 @@ static const per_sequence_t GNBCUConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 451 "./asn1/f1ap/f1ap.cnf"
#line 458 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2067,7 +2076,7 @@ static const per_sequence_t GNBCUConfigurationUpdateFailure_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 453 "./asn1/f1ap/f1ap.cnf"
#line 460 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2084,7 +2093,7 @@ static const per_sequence_t UEContextSetupRequest_sequence[] = {
static int
dissect_f1ap_UEContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 455 "./asn1/f1ap/f1ap.cnf"
#line 462 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2208,7 +2217,7 @@ static const per_sequence_t UEContextSetupResponse_sequence[] = {
static int
dissect_f1ap_UEContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 457 "./asn1/f1ap/f1ap.cnf"
#line 464 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2295,7 +2304,7 @@ static const per_sequence_t UEContextSetupFailure_sequence[] = {
static int
dissect_f1ap_UEContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 459 "./asn1/f1ap/f1ap.cnf"
#line 466 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2312,7 +2321,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = {
static int
dissect_f1ap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 477 "./asn1/f1ap/f1ap.cnf"
#line 484 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2329,7 +2338,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = {
static int
dissect_f1ap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 461 "./asn1/f1ap/f1ap.cnf"
#line 468 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2346,7 +2355,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = {
static int
dissect_f1ap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 463 "./asn1/f1ap/f1ap.cnf"
#line 470 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2363,7 +2372,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = {
static int
dissect_f1ap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 465 "./asn1/f1ap/f1ap.cnf"
#line 472 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2422,7 +2431,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = {
static int
dissect_f1ap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 467 "./asn1/f1ap/f1ap.cnf"
#line 474 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2467,7 +2476,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = {
static int
dissect_f1ap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 469 "./asn1/f1ap/f1ap.cnf"
#line 476 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2484,7 +2493,7 @@ static const per_sequence_t UEContextModificationRequired_sequence[] = {
static int
dissect_f1ap_UEContextModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 471 "./asn1/f1ap/f1ap.cnf"
#line 478 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2543,7 +2552,7 @@ static const per_sequence_t UEContextModificationConfirm_sequence[] = {
static int
dissect_f1ap_UEContextModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 473 "./asn1/f1ap/f1ap.cnf"
#line 480 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2574,7 +2583,7 @@ static const per_sequence_t DLRRCMessageTransfer_sequence[] = {
static int
dissect_f1ap_DLRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 479 "./asn1/f1ap/f1ap.cnf"
#line 486 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DLRRCMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2591,7 +2600,7 @@ static const per_sequence_t ULRRCMessageTransfer_sequence[] = {
static int
dissect_f1ap_ULRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 481 "./asn1/f1ap/f1ap.cnf"
#line 488 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ULRRCMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2608,7 +2617,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_f1ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 483 "./asn1/f1ap/f1ap.cnf"
#line 490 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -3349,7 +3358,7 @@ static int dissect_F1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-f1ap-fn.c ---*/
#line 104 "./asn1/f1ap/packet-f1ap-template.c"
#line 105 "./asn1/f1ap/packet-f1ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
@ -4139,7 +4148,7 @@ void proto_register_f1ap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-f1ap-hfarr.c ---*/
#line 185 "./asn1/f1ap/packet-f1ap-template.c"
#line 186 "./asn1/f1ap/packet-f1ap-template.c"
};
/* List of subtrees */
@ -4148,6 +4157,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_ResourceCoordinationTransferContainer,
&ett_f1ap_PLMN_Identity,
&ett_f1ap_MIB_message,
&ett_f1ap_SIB1_message,
&ett_f1ap_SCG_Config_Info,
&ett_f1ap_CellGroupConfig,
&ett_f1ap_TransportLayerAddress,
@ -4240,7 +4250,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_UnsuccessfulOutcome,
/*--- End of included file: packet-f1ap-ettarr.c ---*/
#line 197 "./asn1/f1ap/packet-f1ap-template.c"
#line 199 "./asn1/f1ap/packet-f1ap-template.c"
};
/* Register protocol */
@ -4354,7 +4364,7 @@ proto_reg_handoff_f1ap(void)
/*--- End of included file: packet-f1ap-dis-tab.c ---*/
#line 222 "./asn1/f1ap/packet-f1ap-template.c"
#line 224 "./asn1/f1ap/packet-f1ap-template.c"
}
/*

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

@ -294,7 +294,7 @@ static int hf_lte_rrc_DL_DCCH_Message_PDU = -1; /* DL_DCCH_Message */
static int hf_lte_rrc_UL_CCCH_Message_PDU = -1; /* UL_CCCH_Message */
static int hf_lte_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */
static int hf_lte_rrc_SC_MCCH_Message_r13_PDU = -1; /* SC_MCCH_Message_r13 */
static int hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */
static int hf_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */
static int hf_lte_rrc_lte_rrc_RLF_Report_r9_PDU = -1; /* RLF_Report_r9 */
static int hf_lte_rrc_lte_rrc_RLF_Report_v9e0_PDU = -1; /* RLF_Report_v9e0 */
static int hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU = -1; /* UE_EUTRA_Capability */
@ -1492,7 +1492,7 @@ static int hf_lte_rrc_requestReducedIntNonContComb_r13 = -1; /* T_requestReduce
static int hf_lte_rrc_nonCriticalExtension_162 = -1; /* UECapabilityEnquiry_v1430_IEs */
static int hf_lte_rrc_requestDiffFallbackCombList_r14 = -1; /* BandCombinationList_r14 */
static int hf_lte_rrc_nonCriticalExtension_163 = -1; /* UECapabilityEnquiry_v1510_IEs */
static int hf_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; /* OCTET_STRING */
static int hf_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; /* T_requestedFreqBandsNR_MRDC_r15 */
static int hf_lte_rrc_nonCriticalExtension_164 = -1; /* T_nonCriticalExtension_55 */
static int hf_lte_rrc_UE_CapabilityRequest_item = -1; /* RAT_Type */
static int hf_lte_rrc_criticalExtensions_46 = -1; /* T_criticalExtensions_46 */
@ -8951,6 +8951,7 @@ 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 gint ett_lte_rrc_requestedFreqBandsNR_MRDC_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;
@ -9005,6 +9006,7 @@ static const fragment_items lte_rrc_sib12_frag_items = {
/* Forward declarations */
static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_1_val = {
"Intra-subframe freq hopping for PUSCH scheduled by UL grant; DCI format 3a; Aperiodic CQI/PMI/RI report on PUSCH: Mode 2-0 & 2-2 - Supported",
@ -39681,7 +39683,7 @@ dissect_lte_rrc_T_sourceContextENDC_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_
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);
dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(scg_config_info_tvb, actx->pinfo, subtree, NULL);
}
@ -43883,7 +43885,7 @@ dissect_lte_rrc_PowerCoordinationInfo_r12(tvbuff_t *tvb _U_, int offset _U_, asn
static int
dissect_lte_rrc_T_eutra_CapabilityInfo_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_UECapabilityInformation_PDU);
NO_BOUND, NO_BOUND, FALSE, dissect_UECapabilityInformation_PDU);
return offset;
}
@ -44554,7 +44556,7 @@ dissect_lte_rrc_UEPagingCoverageInformation(tvbuff_t *tvb _U_, int offset _U_, a
static int
dissect_lte_rrc_T_ue_RadioAccessCapabilityInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_UECapabilityInformation_PDU);
NO_BOUND, NO_BOUND, FALSE, dissect_UECapabilityInformation_PDU);
return offset;
}
@ -55639,6 +55641,23 @@ dissect_lte_rrc_BandCombinationList_r14(tvbuff_t *tvb _U_, int offset _U_, asn1_
}
static int
dissect_lte_rrc_T_requestedFreqBandsNR_MRDC_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
tvbuff_t *freq_band_list_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &freq_band_list_tvb);
if (freq_band_list_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_requestedFreqBandsNR_MRDC_r15);
dissect_nr_rrc_FreqBandList_PDU(freq_band_list_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
static const per_sequence_t T_nonCriticalExtension_55_sequence[] = {
{ NULL, 0, 0, NULL }
};
@ -55653,7 +55672,7 @@ dissect_lte_rrc_T_nonCriticalExtension_55(tvbuff_t *tvb _U_, int offset _U_, asn
static const per_sequence_t UECapabilityEnquiry_v1510_IEs_sequence[] = {
{ &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING },
{ &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_requestedFreqBandsNR_MRDC_r15 },
{ &hf_lte_rrc_nonCriticalExtension_164, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_nonCriticalExtension_55 },
{ NULL, 0, 0, NULL }
};
@ -88167,11 +88186,11 @@ static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
static int dissect_UECapabilityInformation_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, FALSE, pinfo);
offset = dissect_lte_rrc_UECapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU);
offset = dissect_lte_rrc_UECapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UECapabilityInformation_PDU);
offset += 7; offset >>= 3;
return offset;
}
@ -88522,7 +88541,7 @@ static int dissect_UE_RadioPagingInfo_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info
/*--- End of included file: packet-lte-rrc-fn.c ---*/
#line 3082 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3084 "./asn1/lte-rrc/packet-lte-rrc-template.c"
static int
dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
@ -88957,7 +88976,7 @@ void proto_register_lte_rrc(void) {
{ "SC-MCCH-Message-r13", "lte-rrc.SC_MCCH_Message_r13_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU,
{ &hf_lte_rrc_UECapabilityInformation_PDU,
{ "UECapabilityInformation", "lte-rrc.UECapabilityInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
@ -93752,7 +93771,7 @@ void proto_register_lte_rrc(void) {
{ &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15,
{ "requestedFreqBandsNR-MRDC-r15", "lte-rrc.requestedFreqBandsNR_MRDC_r15",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING", HFILL }},
NULL, HFILL }},
{ &hf_lte_rrc_nonCriticalExtension_164,
{ "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -111939,7 +111958,7 @@ void proto_register_lte_rrc(void) {
"CarrierFreq_NB_r13", HFILL }},
/*--- End of included file: packet-lte-rrc-hfarr.c ---*/
#line 3442 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3444 "./asn1/lte-rrc/packet-lte-rrc-template.c"
{ &hf_lte_rrc_eutra_cap_feat_group_ind_1,
{ "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
@ -115353,7 +115372,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_PCI_ARFCN_NB_r14,
/*--- End of included file: packet-lte-rrc-ettarr.c ---*/
#line 4169 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 4171 "./asn1/lte-rrc/packet-lte-rrc-template.c"
&ett_lte_rrc_featureGroupIndicators,
&ett_lte_rrc_featureGroupIndRel9Add,
@ -115388,7 +115407,8 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_sourceRB_ConfigNR_r15,
&ett_lte_rrc_sourceRB_ConfigSN_NR_r15,
&ett_lte_rrc_sourceOtherConfigSN_NR_r15,
&ett_lte_rrc_sourceContextENDC_r15
&ett_lte_rrc_sourceContextENDC_r15,
&ett_lte_rrc_requestedFreqBandsNR_MRDC_r15
};
static ei_register_info ei[] = {
@ -115458,7 +115478,7 @@ void proto_register_lte_rrc(void) {
register_dissector("lte-rrc.ul.ccch", dissect_UL_CCCH_Message_PDU, proto_lte_rrc);
register_dissector("lte-rrc.ul.dcch", dissect_UL_DCCH_Message_PDU, proto_lte_rrc);
register_dissector("lte-rrc.sc.mcch", dissect_SC_MCCH_Message_r13_PDU, proto_lte_rrc);
register_dissector("lte-rrc.ue_cap_info", dissect_lte_rrc_UECapabilityInformation_PDU, proto_lte_rrc);
register_dissector("lte-rrc.ue_cap_info", dissect_UECapabilityInformation_PDU, proto_lte_rrc);
register_dissector("lte-rrc.ue_eutra_cap", dissect_lte_rrc_UE_EUTRA_Capability_PDU, proto_lte_rrc);
register_dissector("lte-rrc.sbcch.sl.bch", dissect_SBCCH_SL_BCH_Message_PDU, proto_lte_rrc);
register_dissector("lte-rrc.sbcch.sl.bch.v2x", dissect_SBCCH_SL_BCH_Message_V2X_r14_PDU, proto_lte_rrc);
@ -115475,7 +115495,7 @@ void proto_register_lte_rrc(void) {
/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
#line 4257 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 4260 "./asn1/lte-rrc/packet-lte-rrc-template.c"
lte_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal);
lte_rrc_system_info_value_changed_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal);

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

@ -28,7 +28,6 @@ int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

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

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
/* 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 */
/* asn2wrs.py -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn NR-UE-Variables.asn */
/* Input file: packet-nr-rrc-template.h */
@ -22,14 +22,17 @@
/*--- 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_CG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_ConfigRestrictInfoSCG_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_MIB_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_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CellGroupConfig_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_FreqBandList_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_);

4
epan/dissectors/packet-x2ap.c
View File

@ -6622,7 +6622,7 @@ dissect_x2ap_MeNBtoSgNBContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
x2ap_data->triggering_message == successful_outcome)) {
dissect_nr_rrc_RRCReconfigurationComplete_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
} else {
dissect_nr_rrc_SCG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
@ -7802,7 +7802,7 @@ dissect_x2ap_SgNBtoMeNBContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_SgNBtoMeNBContainer);
dissect_nr_rrc_SCG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_nr_rrc_CG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);