forked from osmocom/wireshark
LTE RRC: upgrade dissector to v12.5.0
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312 Reviewed-on: https://code.wireshark.org/review/7869 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin
parent
b1f1c1f0e2
commit
9aa624d117
|
|
@ -31,9 +31,11 @@ set( EXT_ASN_FILE_LIST
|
|||
)
|
||||
|
||||
set( ASN_FILE_LIST
|
||||
EUTRA-RRC-Definitions.asn
|
||||
EUTRA-UE-Variables.asn
|
||||
EUTRA-InterNodeDefinitions.asn
|
||||
EUTRA-RRC-Definitions.asn
|
||||
EUTRA-Sidelink-Preconf.asn
|
||||
EUTRA-UE-Variables.asn
|
||||
PC5-RRC-Definitions.asn
|
||||
)
|
||||
|
||||
set( EXTRA_DIST
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V12.4.0 (2014-12)
|
||||
-- 3GPP TS 36.331 V12.5.0 (2015-03)
|
||||
--
|
||||
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -27,11 +27,13 @@ IMPORTS
|
|||
PhysCellId,
|
||||
P-Max,
|
||||
PowerCoordinationInfo-r12,
|
||||
SidelinkUEInformation-r12,
|
||||
SL-CommConfig-r12,
|
||||
SL-DiscConfig-r12,
|
||||
RadioResourceConfigDedicated,
|
||||
RRCConnectionReconfigurationComplete,
|
||||
RSRP-Range,
|
||||
RSRQ-Range,
|
||||
RSRQ-Range-v12xy,
|
||||
RSRQ-Range-v1250,
|
||||
SCellToAddModList-r10,
|
||||
SCG-ConfigPartSCG-r12,
|
||||
SecurityAlgorithmConfig,
|
||||
|
|
@ -46,7 +48,7 @@ IMPORTS
|
|||
UECapabilityInformation,
|
||||
UE-CapabilityRAT-ContainerList,
|
||||
UE-RadioPagingInfo-r12,
|
||||
WLAN-OffloadConfig-r12
|
||||
WLAN-OffloadConfig-r12
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
|
|
@ -82,16 +84,16 @@ HandoverPreparationInformation ::= SEQUENCE {
|
|||
|
||||
HandoverPreparationInformation-r8-IEs ::= SEQUENCE {
|
||||
ue-RadioAccessCapabilityInfo UE-CapabilityRAT-ContainerList,
|
||||
as-Config AS-Config OPTIONAL, -- Cond HO
|
||||
as-Config AS-Config OPTIONAL, -- Cond HO
|
||||
rrm-Config RRM-Config OPTIONAL,
|
||||
as-Context AS-Context OPTIONAL, -- Cond HO
|
||||
as-Context AS-Context OPTIONAL, -- Cond HO
|
||||
nonCriticalExtension HandoverPreparationInformation-v920-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v920-IEs ::= SEQUENCE {
|
||||
ue-ConfigRelease-r9 ENUMERATED {
|
||||
rel9, rel10, rel11, spare5, spare4, spare3,
|
||||
spare2, spare1, ...} OPTIONAL, -- Cond HO2
|
||||
rel9, rel10, rel11, rel12, spare4, spare3,
|
||||
spare2, spare1, ...} OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension HandoverPreparationInformation-v9d0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -107,12 +109,12 @@ HandoverPreparationInformation-v9e0-IEs ::= SEQUENCE {
|
|||
|
||||
HandoverPreparationInformation-v1130-IEs ::= SEQUENCE {
|
||||
as-Context-v1130 AS-Context-v1130 OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension HandoverPreparationInformation-v12xy-IEs OPTIONAL
|
||||
nonCriticalExtension HandoverPreparationInformation-v1250-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v12xy-IEs ::= SEQUENCE {
|
||||
ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3
|
||||
as-Config-v12xy AS-Config-v12xy OPTIONAL, -- Cond HO2
|
||||
HandoverPreparationInformation-v1250-IEs ::= SEQUENCE {
|
||||
ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3
|
||||
as-Config-v1250 AS-Config-v1250 OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -148,30 +150,21 @@ SCG-ConfigInfo-r12 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
SCG-ConfigInfo-r12-IEs ::= SEQUENCE {
|
||||
-- Current dedicated MCG configuration
|
||||
radioResourceConfigDedMCG-r12 RadioResourceConfigDedicated OPTIONAL,
|
||||
securityAlgorithmConfig SecurityAlgorithmConfig OPTIONAL,
|
||||
sCellToAddModListMCG-r12 SCellToAddModList-r10 OPTIONAL,
|
||||
measGapConfig-r12 MeasGapConfig OPTIONAL,
|
||||
-- MeNB controlled SCG configuration relevant for SeNB
|
||||
powerCoordinationInfo-r12 PowerCoordinationInfo-r12 OPTIONAL,
|
||||
-- Current SCG configuration (as delta signalling is used upon SCG change)
|
||||
scg-RadioConfig-r12 SCG-ConfigPartSCG-r12 OPTIONAL,
|
||||
-- UE capability related information
|
||||
eutra-CapabilityInfo-r12 OCTET STRING (CONTAINING UECapabilityInformation) OPTIONAL,
|
||||
scg-ConfigRestrictInfo-r12 SCG-ConfigRestrictInfo-r12 OPTIONAL,
|
||||
-- AS-Context information
|
||||
mbmsInterestIndication-r11 OCTET STRING (CONTAINING
|
||||
mbmsInterestIndication-r12 OCTET STRING (CONTAINING
|
||||
MBMSInterestIndication-r11) OPTIONAL,
|
||||
-- RRM config alike fields
|
||||
measResultServCellListSCG-r12 MeasResultServCellListSCG-r12 OPTIONAL,
|
||||
-- Fields for different SCG configuration request
|
||||
drb-ToAddModListSCG-r12 DRB-InfoListSCG-r12 OPTIONAL,
|
||||
drb-ToReleaseListSCG-r12 DRB-ToReleaseList OPTIONAL,
|
||||
sCellToAddModListSCG-r12 SCellToAddModListSCG-r12 OPTIONAL,
|
||||
sCellToReleaseListSCG-r12 SCellToReleaseList-r10 OPTIONAL,
|
||||
-- Other fields
|
||||
p-Max P-Max OPTIONAL,
|
||||
p-Max-r12 P-Max OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -180,29 +173,34 @@ DRB-InfoListSCG-r12 ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-InfoSCG-r12
|
|||
DRB-InfoSCG-r12 ::= SEQUENCE {
|
||||
eps-BearerIdentity-r12 INTEGER (0..15) OPTIONAL, -- Cond DRB-Setup
|
||||
drb-Identity-r12 DRB-Identity,
|
||||
drb-Type-r12 ENUMERATED {split, scg} OPTIONAL -- Cond DRB-Setup
|
||||
drb-Type-r12 ENUMERATED {split, scg} OPTIONAL, -- Cond DRB-Setup
|
||||
...
|
||||
}
|
||||
|
||||
SCellToAddModListSCG-r12 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF Cell-ToAddMod-r12
|
||||
|
||||
Cell-ToAddMod-r12 ::= SEQUENCE {
|
||||
sCellIndex-r12 SCellIndex-r10,
|
||||
cellIdentification-r12 SEQUENCE {
|
||||
physCellId-r12 PhysCellId,
|
||||
dl-CarrierFreq-r12 ARFCN-ValueEUTRA
|
||||
dl-CarrierFreq-r12 ARFCN-ValueEUTRA-r9
|
||||
} OPTIONAL, -- Cond SCellAdd
|
||||
measResultCellToAdd-r12 SEQUENCE {
|
||||
rsrpResult-r12 RSRP-Range,
|
||||
rsrqResult-r12 RSRQ-Range
|
||||
} OPTIONAL -- Cond SCellAdd
|
||||
} OPTIONAL, -- Cond SCellAdd2
|
||||
...
|
||||
}
|
||||
|
||||
MeasResultServCellListSCG-r12 ::= SEQUENCE (SIZE (1..maxServCell-r10)) OF MeasResultServCellSCG-r12
|
||||
|
||||
MeasResultServCellSCG-r12 ::= SEQUENCE {
|
||||
servCellId-r12 ServCellIndex-r10,
|
||||
measResultSCell-r12 SEQUENCE {
|
||||
rsrpResultSCell-r12 RSRP-Range,
|
||||
rsrqResultSCell-r12 RSRQ-Range
|
||||
}
|
||||
},
|
||||
...
|
||||
}
|
||||
|
||||
SCG-ConfigRestrictInfo-r12 ::= SEQUENCE {
|
||||
|
|
@ -277,8 +275,10 @@ AS-Config-v9e0 ::= SEQUENCE {
|
|||
sourceDl-CarrierFreq-v9e0 ARFCN-ValueEUTRA-v9e0
|
||||
}
|
||||
|
||||
AS-Config-v12xy ::= SEQUENCE {
|
||||
sourceWlan-OffloadConfig-r12 WLAN-OffloadConfig-r12 OPTIONAL
|
||||
AS-Config-v1250 ::= SEQUENCE {
|
||||
sourceWlan-OffloadConfig-r12 WLAN-OffloadConfig-r12 OPTIONAL,
|
||||
sourceSL-CommConfig-r12 SL-CommConfig-r12 OPTIONAL,
|
||||
sourceSL-DiscConfig-r12 SL-DiscConfig-r12 OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -293,7 +293,10 @@ AS-Context-v1130 ::= SEQUENCE {
|
|||
MBMSInterestIndication-r11) OPTIONAL, -- Cond HO2
|
||||
powerPrefIndication-r11 OCTET STRING (CONTAINING
|
||||
UEAssistanceInformation-r11) OPTIONAL, -- Cond HO2
|
||||
...
|
||||
...,
|
||||
[[ sidelinkUEInformation-r12 OCTET STRING (CONTAINING
|
||||
SidelinkUEInformation-r12) OPTIONAL -- Cond HO2
|
||||
]]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -343,7 +346,7 @@ CandidateCellInfo-r10 ::= SEQUENCE {
|
|||
...,
|
||||
[[ dl-CarrierFreq-v1090 ARFCN-ValueEUTRA-v9e0 OPTIONAL
|
||||
]],
|
||||
[[ rsrqResult-v12xy RSRQ-Range-v12xy OPTIONAL
|
||||
[[ rsrqResult-v1250 RSRQ-Range-v1250 OPTIONAL
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,81 @@
|
|||
-- 3GPP TS 36.331 V12.5.0 (2015-03)
|
||||
--
|
||||
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
BEGIN
|
||||
|
||||
IMPORTS
|
||||
AdditionalSpectrumEmission,
|
||||
ARFCN-ValueEUTRA-r9,
|
||||
FilterCoefficient,
|
||||
maxSL-TxPool-r12,
|
||||
P-Max,
|
||||
SL-CP-Len-r12,
|
||||
SL-HoppingConfigComm-r12,
|
||||
SL-OffsetIndicatorSync-r12,
|
||||
SL-PeriodComm-r12,
|
||||
RSRP-RangeSL3-r12,
|
||||
SL-TF-ResourceConfig-r12,
|
||||
SL-TRPT-Subset-r12,
|
||||
P0-SL-r12,
|
||||
TDD-ConfigSL-r12
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
SL-Preconfiguration-r12 ::= SEQUENCE {
|
||||
preconfigGeneral-r12 SL-PreconfigGeneral-r12,
|
||||
preconfigSync-r12 SL-PreconfigSync-r12,
|
||||
preconfigComm-r12 SL-PreconfigCommPoolList4-r12,
|
||||
...
|
||||
}
|
||||
|
||||
SL-PreconfigGeneral-r12 ::= SEQUENCE {
|
||||
-- PDCP configuration
|
||||
rohc-Profiles-r12 SEQUENCE {
|
||||
profile0x0001-r12 BOOLEAN,
|
||||
profile0x0002-r12 BOOLEAN,
|
||||
profile0x0004-r12 BOOLEAN,
|
||||
profile0x0006-r12 BOOLEAN,
|
||||
profile0x0101-r12 BOOLEAN,
|
||||
profile0x0102-r12 BOOLEAN,
|
||||
profile0x0104-r12 BOOLEAN
|
||||
},
|
||||
-- Physical configuration
|
||||
carrierFreq-r12 ARFCN-ValueEUTRA-r9,
|
||||
maxTxPower-r12 P-Max,
|
||||
additionalSpectrumEmission-r12 AdditionalSpectrumEmission,
|
||||
sl-bandwidth-r12 ENUMERATED {n6, n15, n25, n50, n75, n100},
|
||||
tdd-ConfigSL-r12 TDD-ConfigSL-r12,
|
||||
reserved-r12 BIT STRING (SIZE (19)),
|
||||
...
|
||||
}
|
||||
|
||||
SL-PreconfigSync-r12 ::= SEQUENCE {
|
||||
syncCP-Len-r12 SL-CP-Len-r12,
|
||||
syncOffsetIndicator1-r12 SL-OffsetIndicatorSync-r12,
|
||||
syncOffsetIndicator2-r12 SL-OffsetIndicatorSync-r12,
|
||||
syncTxParameters-r12 P0-SL-r12,
|
||||
syncTxThreshOoC-r12 RSRP-RangeSL3-r12,
|
||||
filterCoefficient-r12 FilterCoefficient,
|
||||
syncRefMinHyst-r12 ENUMERATED {dB0, dB3, dB6, dB9, dB12},
|
||||
syncRefDiffHyst-r12 ENUMERATED {dB0, dB3, dB6, dB9, dB12, dBinf},
|
||||
...
|
||||
}
|
||||
|
||||
SL-PreconfigCommPoolList4-r12 ::= SEQUENCE (SIZE (1..maxSL-TxPool-r12)) OF SL-PreconfigCommPool-r12
|
||||
|
||||
SL-PreconfigCommPool-r12 ::= SEQUENCE {
|
||||
-- This IE is same as SL-CommResourcePool with rxParametersNCell absent
|
||||
sc-CP-Len-r12 SL-CP-Len-r12,
|
||||
sc-Period-r12 SL-PeriodComm-r12,
|
||||
sc-TF-ResourceConfig-r12 SL-TF-ResourceConfig-r12,
|
||||
sc-TxParameters-r12 P0-SL-r12,
|
||||
data-CP-Len-r12 SL-CP-Len-r12,
|
||||
data-TF-ResourceConfig-r12 SL-TF-ResourceConfig-r12,
|
||||
dataHoppingConfig-r12 SL-HoppingConfigComm-r12,
|
||||
dataTxParameters-r12 P0-SL-r12,
|
||||
trpt-Subset-r12 SL-TRPT-Subset-r12,
|
||||
...
|
||||
}
|
||||
|
||||
END
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V12.4.0 (2014-12)
|
||||
-- 3GPP TS 36.331 V12.5.0 (2015-03)
|
||||
--
|
||||
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ IMPORTS
|
|||
LogMeasInfo-r10,
|
||||
MeasCSI-RS-Id-r12,
|
||||
MeasId,
|
||||
MeasId-v12xy,
|
||||
MeasId-v1250,
|
||||
MeasIdToAddModList,
|
||||
MeasIdToAddModListExt-r12,
|
||||
MeasObjectToAddModList,
|
||||
|
|
@ -36,7 +36,6 @@ IMPORTS
|
|||
QuantityConfig,
|
||||
ReportConfigToAddModList,
|
||||
RLF-Report-r9,
|
||||
RSRP-Range,
|
||||
TargetMBSFN-AreaList-r12,
|
||||
TraceReference-r10,
|
||||
VisitedCellInfoList-r12,
|
||||
|
|
@ -126,7 +125,7 @@ VarMeasReportList-r12 ::= SEQUENCE (SIZE (1..maxMeasId-r12)) OF VarMeasReport
|
|||
VarMeasReport ::= SEQUENCE {
|
||||
-- List of measurement that have been triggered
|
||||
measId MeasId,
|
||||
measId-v12xy MeasId-v12xy OPTIONAL,
|
||||
measId-v1250 MeasId-v1250 OPTIONAL,
|
||||
cellsTriggeredList CellsTriggeredList OPTIONAL,
|
||||
csi-RS-TriggeredList-r12 CSI-RS-TriggeredList-r12 OPTIONAL,
|
||||
numberOfReportsSent INTEGER
|
||||
|
|
@ -168,7 +167,7 @@ VarShortMAC-Input ::= SEQUENCE {
|
|||
}
|
||||
|
||||
maxLogMeas-r10 INTEGER ::= 4060-- Maximum number of logged measurement entries
|
||||
-- that can be stored by the UE
|
||||
-- that can be stored by the UE
|
||||
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -24,9 +24,11 @@ EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
|
|||
EXT_ASN_FILE_LIST =
|
||||
|
||||
ASN_FILE_LIST = \
|
||||
EUTRA-InterNodeDefinitions.asn \
|
||||
EUTRA-RRC-Definitions.asn \
|
||||
EUTRA-Sidelink-Preconf.asn \
|
||||
EUTRA-UE-Variables.asn \
|
||||
EUTRA-InterNodeDefinitions.asn
|
||||
PC5-RRC-Definitions.asn
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(EXTRA_DIST_COMMON) \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
-- 3GPP TS 36.331 V12.5.0 (2015-03)
|
||||
--
|
||||
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
BEGIN
|
||||
|
||||
IMPORTS
|
||||
TDD-ConfigSL-r12
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
SBCCH-SL-BCH-Message ::= SEQUENCE {
|
||||
message SBCCH-SL-BCH-MessageType
|
||||
}
|
||||
|
||||
SBCCH-SL-BCH-MessageType ::= MasterInformationBlock-SL
|
||||
|
||||
|
||||
MasterInformationBlock-SL ::= SEQUENCE {
|
||||
sl-Bandwidth-r12 ENUMERATED {
|
||||
n6, n15, n25, n50, n75, n100},
|
||||
tdd-ConfigSL-r12 TDD-ConfigSL-r12,
|
||||
directFrameNumber-r12 BIT STRING (SIZE (10)),
|
||||
directSubframeNumber-r12 INTEGER (0..9),
|
||||
inCoverage-r12 BOOLEAN,
|
||||
reserved-r12 BIT STRING (SIZE (19))
|
||||
}
|
||||
|
||||
|
||||
|
||||
END
|
||||
|
|
@ -13,11 +13,13 @@ DRX-Config/setup/drx-InactivityTimer
|
|||
PDCP-Config/eag_3/t-Reordering-r12
|
||||
Q-OffsetRange
|
||||
RRM-Config/ue-InactiveTime
|
||||
SIB-Type
|
||||
SL-PeriodComm-r12
|
||||
SupportedBandUTRA-FDD
|
||||
T-PollRetransmit
|
||||
T-Reordering
|
||||
T-StatusProhibit
|
||||
WLAN-backhaulRate
|
||||
WLAN-backhaulRate-r12
|
||||
|
||||
#.EXPORTS
|
||||
HandoverCommand
|
||||
|
|
@ -44,6 +46,7 @@ UL-CCCH-Message @ul.ccch
|
|||
UL-DCCH-Message @ul.dcch
|
||||
UECapabilityInformation @ue_cap_info
|
||||
UE-EUTRA-Capability @ue_eutra_cap
|
||||
SBCCH-SL-BCH-Message @sbcch.sl_bch
|
||||
#.END
|
||||
|
||||
#.OMIT_ASSIGNMENT
|
||||
|
|
@ -56,10 +59,16 @@ DRB-InfoSCG-r12
|
|||
LogMeasInfoList2-r10
|
||||
MeasResultServCellListSCG-r12
|
||||
MeasResultServCellSCG-r12
|
||||
RSRP-RangeSL3-r12
|
||||
SCellToAddModListSCG-r12
|
||||
SCG-ConfigInfo-r12
|
||||
SCG-ConfigInfo-r12-IEs
|
||||
SCG-ConfigRestrictInfo-r12
|
||||
SL-PreconfigCommPool-r12
|
||||
SL-PreconfigCommPoolList4-r12
|
||||
SL-PreconfigGeneral-r12
|
||||
SL-PreconfigSync-r12
|
||||
SL-Preconfiguration-r12
|
||||
UERadioPagingInformation
|
||||
UERadioPagingInformation-r12-IEs
|
||||
VarConnEstFailReport-r11
|
||||
|
|
@ -252,7 +261,7 @@ if(ue_cap_tvb){
|
|||
proto_tree_add_bits_item(subtree, hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2, inter_band_tdd_ca_tvb, 1, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
#.FN_BODY PhyLayerParameters-v12xy/tdd-FDD-CA-PCellDuplex-r12 VAL_PTR = &pcellduplex_tvb
|
||||
#.FN_BODY PhyLayerParameters-v1250/tdd-FDD-CA-PCellDuplex-r12 VAL_PTR = &pcellduplex_tvb
|
||||
tvbuff_t *pcellduplex_tvb=NULL;
|
||||
proto_tree *subtree;
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -765,19 +774,19 @@ SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_C
|
|||
proto_tree_add_time(subtree, hf_lte_rrc_local_time, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, &ts);
|
||||
|
||||
#.TYPE_ATTR
|
||||
WLAN-Id-r12/wlan-Identifiers/ssid TYPE=FT_STRING DISPLAY=STR_ASCII
|
||||
WLAN-Identifiers-r12/ssid-r12 TYPE=FT_STRING DISPLAY=STR_ASCII
|
||||
|
||||
#.FN_BODY WLAN-Id-r12/wlan-Identifiers/ssid VAL_PTR=&ssid_tvb HF_INDEX=-1
|
||||
#.FN_BODY WLAN-Identifiers-r12/ssid-r12 VAL_PTR=&ssid_tvb HF_INDEX=-1
|
||||
tvbuff_t *ssid_tvb = NULL;
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
actx->created_item = proto_tree_add_item(tree, hf_index, ssid_tvb, 0, -1, ENC_ASCII|ENC_NA);
|
||||
|
||||
#.TYPE_ATTR
|
||||
WLAN-Id-r12/wlan-Identifiers/bssid TYPE=FT_ETHER
|
||||
WLAN-Identifiers-r12/bssid-r12 TYPE=FT_ETHER
|
||||
|
||||
#.TYPE_ATTR
|
||||
WLAN-Id-r12/wlan-Identifiers/hessid TYPE=FT_ETHER
|
||||
WLAN-Identifiers-r12/hessid-r12 TYPE=FT_ETHER
|
||||
|
||||
#.FN_BODY RRCConnectionReject-r8-IEs/waitTime
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -805,6 +814,26 @@ RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "s");
|
||||
|
||||
#.FN_BODY BLER-Result-r12/blocksReceived-r12/n-r12 VAL_PTR = &n_r12_tvb HF_INDEX = -1
|
||||
tvbuff_t *n_r12_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (n_r12_tvb) {
|
||||
actx->created_item = proto_tree_add_uint(tree, hf_index, n_r12_tvb, 0, 1, tvb_get_bits8(n_r12_tvb, 0, 3));
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
BLER-Result-r12/blocksReceived-r12/n-r12 TYPE=FT_UINT8 DISPLAY=BASE_CUSTOM STRINGS=VALS(lte_rrc_n_r12_vals)
|
||||
|
||||
#.FN_BODY BLER-Result-r12/blocksReceived-r12/m-r12 VAL_PTR = &m_r12_tvb HF_INDEX = -1
|
||||
tvbuff_t *m_r12_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (m_r12_tvb) {
|
||||
actx->created_item = proto_tree_add_item(tree, hf_index, m_r12_tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
BLER-Result-r12/blocksReceived-r12/m-r12 TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=CF_FUNC(lte_rrc_m_r12_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
BLER-Range-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_BLER_Range_r12_vals_ext
|
||||
|
||||
|
|
@ -922,11 +951,11 @@ CQI-ReportConfigSCell-r10/nomPDSCH-RS-EPRE-Offset-r10 STRINGS=VALS(lte_rrc_nomPD
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dB");
|
||||
|
||||
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/p0-NominalPUSCH-PersistentSubframeSet2-r12
|
||||
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/setup/p0-NominalPUSCH-PersistentSubframeSet2-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dBm");
|
||||
|
||||
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/p0-UE-PUSCH-PersistentSubframeSet2-r12
|
||||
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/setup/p0-UE-PUSCH-PersistentSubframeSet2-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dB");
|
||||
|
||||
|
|
@ -944,7 +973,7 @@ UplinkPowerControlCommonSCell-v11x0/deltaPreambleMsg3-r11 STRINGS=VALS(lte_rrc_d
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dBm");
|
||||
|
||||
#.FN_BODY UplinkPowerControlCommonPSCell-r12/p0-NominalPUCCH
|
||||
#.FN_BODY UplinkPowerControlCommonPSCell-r12/p0-NominalPUCCH-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dBm");
|
||||
|
||||
|
|
@ -960,11 +989,11 @@ UplinkPowerControlCommonSCell-v11x0/deltaPreambleMsg3-r11 STRINGS=VALS(lte_rrc_d
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dB");
|
||||
|
||||
#.FN_BODY UplinkPowerControlDedicated-v12x0/set2PowerControlParameter/setup/p0-NominalPUSCH-SubframeSet2-r12
|
||||
#.FN_BODY UplinkPowerControlDedicated-v1250/set2PowerControlParameter/setup/p0-NominalPUSCH-SubframeSet2-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dBm");
|
||||
|
||||
#.FN_BODY UplinkPowerControlDedicated-v12x0/set2PowerControlParameter/setup/p0-UE-PUSCH-SubframeSet2-r12
|
||||
#.FN_BODY UplinkPowerControlDedicated-v1250/set2PowerControlParameter/setup/p0-UE-PUSCH-SubframeSet2-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dB");
|
||||
|
||||
|
|
@ -1057,11 +1086,20 @@ ThresholdUTRA/utra-EcN0 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_thresh
|
|||
#.TYPE_ATTR
|
||||
RSRP-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRP_Range_vals_ext
|
||||
|
||||
#.TYPE_ATTR
|
||||
RSRP-RangeSL-r12 DISPLAY=BASE_DEC STRINGS=VALS(lte_rrc_RSRP_RangeSL_vals)
|
||||
|
||||
#.TYPE_ATTR
|
||||
RSRP-RangeSL2-r12 DISPLAY=BASE_DEC STRINGS=VALS(lte_rrc_RSRP_RangeSL2_vals)
|
||||
|
||||
#.TYPE_ATTR
|
||||
RSRP-RangeSL3-r12 DISPLAY=BASE_DEC STRINGS=VALS(lte_rrc_RSRP_RangeSL3_vals)
|
||||
|
||||
#.TYPE_ATTR
|
||||
RSRQ-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext
|
||||
|
||||
#.TYPE_ATTR
|
||||
RSRQ-Range-v12xy DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext
|
||||
RSRQ-Range-v1250 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext
|
||||
|
||||
#.TYPE_ATTR
|
||||
MeasResultForECID-r9/ue-RxTxTimeDiffResult-r9 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_ue_RxTxTimeDiffResult_fmt)
|
||||
|
|
@ -1154,6 +1192,14 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB17 ");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType18-r12
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB18 ");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType19-r12
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB19 ");
|
||||
|
||||
#.FN_HDR MBSFNAreaConfiguration-r9
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBSFNAreaConfiguration-r9");
|
||||
|
|
@ -1329,6 +1375,14 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "SCGFailureInformation-r12");
|
||||
|
||||
#.FN_HDR SidelinkUEInformation-r12
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "SidelinkUEInformation-r12");
|
||||
|
||||
#.FN_HDR MasterInformationBlock-SL
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock-SL");
|
||||
|
||||
#.FN_BODY Paging/systemInfoModification
|
||||
%(DEFAULT_BODY)s
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " (systemInfoModification)");
|
||||
|
|
@ -1451,7 +1505,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
}
|
||||
}
|
||||
|
||||
#.FN_BODY RLC-Config-v12xy/ul-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
|
||||
#.FN_BODY RLC-Config-v1250/ul-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
|
||||
gboolean ext_li_field;
|
||||
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -1459,7 +1513,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
mapping->rlc_ul_ext_li_field = ext_li_field;
|
||||
}
|
||||
|
||||
#.FN_BODY RLC-Config-v12xy/dl-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
|
||||
#.FN_BODY RLC-Config-v1250/dl-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
|
||||
gboolean ext_li_field;
|
||||
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -1567,7 +1621,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
/* Reset again */
|
||||
private_data_set_ra_preambles(actx, 0);
|
||||
|
||||
#.FN_BODY RACH-ConfigCommon-v12xy/txFailParams-r12/connEstFailOffset-r12
|
||||
#.FN_BODY RACH-ConfigCommon-v1250/txFailParams-r12/connEstFailOffset-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dB");
|
||||
|
||||
|
|
@ -1868,6 +1922,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, " (BSS load)");
|
||||
|
||||
#.FN_BODY WLAN-backhaulRate
|
||||
#.FN_BODY WLAN-backhaulRate-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, " Kbps");
|
||||
|
||||
#.FN_BODY P0-SL-r12
|
||||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "dBm");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-lte-rrc-template.c
|
||||
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
|
||||
* Radio Resource Control (RRC) protocol specification
|
||||
* (3GPP TS 36.331 V12.4.0 Release 12) packet dissection
|
||||
* (3GPP TS 36.331 V12.5.0 Release 12) packet dissection
|
||||
* Copyright 2008, Vincent Helfre
|
||||
* Copyright 2009-2015, Pascal Quantin
|
||||
*
|
||||
|
|
@ -730,6 +730,28 @@ lte_rrc_timeConnFailure_r10_fmt(gchar *s, guint32 v)
|
|||
g_snprintf(s, ITEM_LABEL_LENGTH, "%ums (%u)", 100*v, v);
|
||||
}
|
||||
|
||||
static const value_string lte_rrc_n_r12_vals[] = {
|
||||
{ 0, "0 <= Nr < 256"},
|
||||
{ 1, "256 <= Nr < 768"},
|
||||
{ 2, "768 <= Nr < 1792"},
|
||||
{ 3, "1792 <= Nr < 3840"},
|
||||
{ 4, "3840 <= Nr < 7936"},
|
||||
{ 5, "7936 <= Nr < 16128"},
|
||||
{ 6, "16128 <= Nr < 32512"},
|
||||
{ 7, "32512 <= Nr"},
|
||||
{ 0, NULL},
|
||||
};
|
||||
|
||||
static void
|
||||
lte_rrc_m_r12_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
if (v == 255) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "255 <= f(Nr) (255)");
|
||||
} else {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%u <= f(Nr) < %u (%u)", v, v+1, v);
|
||||
}
|
||||
}
|
||||
|
||||
static const value_string lte_rrc_BLER_Range_r12_vals[] = {
|
||||
{ 0, "BLER < 0.1%"},
|
||||
{ 1, "0.1% <= BLER < 0.123%"},
|
||||
|
|
@ -1766,6 +1788,54 @@ static const value_string lte_rrc_RSRP_Range_vals[] = {
|
|||
};
|
||||
static value_string_ext lte_rrc_RSRP_Range_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_RSRP_Range_vals);
|
||||
|
||||
static const value_string lte_rrc_RSRP_RangeSL_vals[] = {
|
||||
{ 0, "-infinity"},
|
||||
{ 1, "-115dBm"},
|
||||
{ 2, "-110dBm"},
|
||||
{ 3, "-105dBm"},
|
||||
{ 4, "-100dBm"},
|
||||
{ 5, "-95dBm"},
|
||||
{ 6, "-90dBm"},
|
||||
{ 7, "-85dBm"},
|
||||
{ 8, "-80dBm"},
|
||||
{ 9, "-75dBm"},
|
||||
{ 10, "-70dBm"},
|
||||
{ 11, "-65dBm"},
|
||||
{ 12, "-60dBm"},
|
||||
{ 13, "+infinity"},
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static const value_string lte_rrc_RSRP_RangeSL2_vals[] = {
|
||||
{ 0, "-infinity"},
|
||||
{ 1, "-110dBm"},
|
||||
{ 2, "-100dBm"},
|
||||
{ 3, "-90dBm"},
|
||||
{ 4, "-80dBm"},
|
||||
{ 5, "-70dBm"},
|
||||
{ 6, "-60dBm"},
|
||||
{ 7, "+infinity"},
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
#if 0
|
||||
static const value_string lte_rrc_RSRP_RangeSL3_vals[] = {
|
||||
{ 0, "-110dBm"},
|
||||
{ 1, "-105dBm"},
|
||||
{ 2, "-100dBm"},
|
||||
{ 3, "-95dBm"},
|
||||
{ 4, "-90dBm"},
|
||||
{ 5, "-85dBm"},
|
||||
{ 6, "-80dBm"},
|
||||
{ 7, "-75dBm"},
|
||||
{ 8, "-70dBm"},
|
||||
{ 9, "-65dBm"},
|
||||
{ 10, "-60dBm"},
|
||||
{ 11, "+infinity"},
|
||||
{ 0, NULL}
|
||||
};
|
||||
#endif
|
||||
|
||||
static const value_string lte_rrc_RSRQ_Range_vals[] = {
|
||||
{-34, "RSRQ < -36dB"},
|
||||
{-33, "-36dB <= RSRQ < -35.5dB"},
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. Changes will be overwritten. */
|
||||
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-lte-rrc.h */
|
||||
/* ../../tools/asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../../epan/dissectors EUTRA-RRC-Definitions.asn EUTRA-UE-Variables.asn EUTRA-InterNodeDefinitions.asn */
|
||||
/* ../../tools/asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../../epan/dissectors EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn EUTRA-Sidelink-Preconf.asn EUTRA-UE-Variables.asn PC5-RRC-Definitions.asn */
|
||||
|
||||
/* Input file: packet-lte-rrc-template.h */
|
||||
|
||||
|
|
@ -34,14 +34,14 @@
|
|||
|
||||
/*--- Included file: packet-lte-rrc-exp.h ---*/
|
||||
#line 1 "../../asn1/lte-rrc/packet-lte-rrc-exp.h"
|
||||
int dissect_lte_rrc_UE_EUTRA_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
int dissect_lte_rrc_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
int dissect_lte_rrc_HandoverPreparationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
int dissect_lte_rrc_UERadioAccessCapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_UE_EUTRA_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _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_UERadioAccessCapabilityInformation_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_);
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-exp.h ---*/
|
||||
#line 27 "../../asn1/lte-rrc/packet-lte-rrc-template.h"
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ sub extract_asn1 {
|
|||
}
|
||||
|
||||
if(($file_name_found == 0) && ($line =~ m/DEFINITIONS AUTOMATIC TAGS ::=/)){
|
||||
($output_file_name) = ($line =~ m/^([a-zA-Z\-]+)\s+DEFINITIONS AUTOMATIC TAGS ::=/);
|
||||
($output_file_name) = ($line =~ m/^([a-zA-Z0-9\-]+)\s+DEFINITIONS AUTOMATIC TAGS ::=/);
|
||||
$output_file_name = "$output_file_name".".asn";
|
||||
print "generating $output_file_name\n";
|
||||
open(OUTPUT_FILE, "> $output_file_name") or die "Can not open file $output_file_name";
|
||||
|
|
|
|||
Loading…
Reference in New Issue