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

LTE RRC: upgrade dissector to v11.8.0 

Change-Id: I2bb0861029d0d30ae372b0b8085fbedeb4932217
Reviewed-on: https://code.wireshark.org/review/2949
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-07-08 23:33:01 +02:00
parent b66f614e5d
commit cfee2019c6
5 changed files with 590 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.7.0 (2014-03)
-- 3GPP TS 36.331 V11.8.0 (2014-06)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

52
asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.7.0 (2014-03)
-- 3GPP TS 36.331 V11.8.0 (2014-06)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -1441,7 +1441,12 @@ UECapabilityEnquiry-r8-IEs ::= SEQUENCE {
UECapabilityEnquiry-v8a0-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UECapabilityEnquiry-v1180-IEs OPTIONAL
}
UECapabilityEnquiry-v1180-IEs ::= SEQUENCE {
requestedFrequencyBands-r11 SEQUENCE (SIZE (1..16)) OF FreqBandIndicator-r11 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-CapabilityRequest ::= SEQUENCE (SIZE (1..maxRAT-Capabilities)) OF RAT-Type
@ -4766,6 +4771,14 @@ UE-EUTRA-Capability-v1130-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v1170-IEs ::= SEQUENCE {
phyLayerParameters-v1170 PhyLayerParameters-v1170 OPTIONAL,
ue-Category-v1170 INTEGER (9..10) OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v1180-IEs OPTIONAL
}
UE-EUTRA-Capability-v1180-IEs ::= SEQUENCE {
rf-Parameters-v1180 RF-Parameters-v1180 OPTIONAL,
mbms-Parameters-r11 MBMS-Parameters-r11 OPTIONAL,
fdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL,
tdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -4797,6 +4810,10 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1130 ::= SEQUENCE {
...
}
UE-EUTRA-CapabilityAddXDD-Mode-v1180 ::= SEQUENCE {
mbms-Parameters-r11 MBMS-Parameters-r11
}
AccessStratumRelease ::= ENUMERATED {
rel8, rel9, rel10, rel11, spare4, spare3,
spare2, spare1, ...}
@ -4894,6 +4911,12 @@ RF-Parameters-v1130 ::= SEQUENCE {
supportedBandCombination-v1130 SupportedBandCombination-v1130 OPTIONAL
}
RF-Parameters-v1180 ::= SEQUENCE {
freqBandRetrieval-r11 ENUMERATED {supported} OPTIONAL,
reportedFrequencyBands-r11 SEQUENCE (SIZE (1.. maxBands)) OF FreqBandIndicator-r11 OPTIONAL,
supportedBandCombinationAdd-r11 SupportedBandCombinationAdd-r11 OPTIONAL
}
SupportedBandCombination-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-r10
SupportedBandCombinationExt-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParametersExt-r10
@ -4902,6 +4925,8 @@ SupportedBandCombination-v1090 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandC
SupportedBandCombination-v1130 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1130
SupportedBandCombinationAdd-r11 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-r11
BandCombinationParameters-r10 ::= SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r10
BandCombinationParametersExt-r10 ::= SEQUENCE {
@ -4917,6 +4942,16 @@ BandCombinationParameters-v1130 ::= SEQUENCE {
...
}
BandCombinationParameters-r11 ::= SEQUENCE {
bandParameterList-r11 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF
BandParameters-r11,
supportedBandwidthCombinationSet-r11 SupportedBandwidthCombinationSet-r10 OPTIONAL,
multipleTimingAdvance-r11 ENUMERATED {supported} OPTIONAL,
simultaneousRx-Tx-r11 ENUMERATED {supported} OPTIONAL,
bandInfoEUTRA-r11 BandInfoEUTRA,
...
}
SupportedBandwidthCombinationSet-r10 ::= BIT STRING (SIZE (1..maxBandwidthCombSet-r10))
BandParameters-r10 ::= SEQUENCE {
@ -4934,6 +4969,13 @@ BandParameters-v1130 ::= SEQUENCE {
supportedCSI-Proc-r11 ENUMERATED {n1, n3, n4}
}
BandParameters-r11 ::= SEQUENCE {
bandEUTRA-r11 FreqBandIndicator-r11,
bandParametersUL-r11 BandParametersUL-r10 OPTIONAL,
bandParametersDL-r11 BandParametersDL-r10 OPTIONAL,
supportedCSI-Proc-r11 ENUMERATED {n1, n3, n4} OPTIONAL
}
BandParametersUL-r10 ::= SEQUENCE (SIZE (1..maxBandwidthClass-r10)) OF CA-MIMO-ParametersUL-r10
CA-MIMO-ParametersUL-r10 ::= SEQUENCE {
@ -5144,6 +5186,11 @@ Other-Parameters-r11 ::= SEQUENCE {
ue-Rx-TxTimeDiffMeasurements-r11 ENUMERATED {supported} OPTIONAL
}
MBMS-Parameters-r11 ::= SEQUENCE {
mbms-SCell-r11 ENUMERATED {supported} OPTIONAL,
mbms-NonServingCell-r11 ENUMERATED {supported} OPTIONAL
}
UE-TimersAndConstants ::= SEQUENCE {
t300 ENUMERATED {
@ -5233,6 +5280,7 @@ TMGI-r9 ::= SEQUENCE {
maxBandComb-r10 INTEGER ::= 128 -- Maximum number of band combinations.
maxBandComb-r11 INTEGER ::= 256 -- Maximum number of additional band combinations.
maxBands INTEGER ::= 64 -- Maximum number of bands listed in EUTRA UE caps
maxBandwidthClass-r10 INTEGER ::= 16 -- Maximum number of supported CA BW classes per band
maxBandwidthCombSet-r10 INTEGER ::= 32 -- Maximum number of bandwidth combination sets per

5
asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.7.0 (2014-03)
-- 3GPP TS 36.331 V11.8.0 (2014-06)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
@ -19,6 +19,7 @@ IMPORTS
MeasId,
MeasIdToAddModList,
MeasObjectToAddModList,
MeasObjectToAddModList-v9e0,
MobilityStateParameters,
NeighCellConfig,
PhysCellId,
@ -32,7 +33,6 @@ IMPORTS
ReportConfigToAddModList,
RLF-Report-r9,
RSRP-Range,
-- TraceRecordingSessionRef-r10,
TraceReference-r10,
maxCellMeas,
maxMeasId
@ -85,6 +85,7 @@ VarMeasConfig ::= SEQUENCE {
measIdList MeasIdToAddModList OPTIONAL,
-- Measurement objects
measObjectList MeasObjectToAddModList OPTIONAL,
measObjectList-v9i0 MeasObjectToAddModList-v9e0 OPTIONAL,
-- Reporting configurations
reportConfigList ReportConfigToAddModList OPTIONAL,
-- Other parameters

2
asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -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 V11.7.0 Release 11) packet dissection
* (3GPP TS 36.331 V11.8.0 Release 11) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2014, Pascal Quantin
*

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

File diff suppressed because it is too large Load Diff