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

RRC: upgrade dissector to v12.6.0 

Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6
Reviewed-on: https://code.wireshark.org/review/9838
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2015-07-31 22:20:34 +02:00
parent 26c933b8cc
commit 2e3be5410c
8 changed files with 32713 additions and 13290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/rrc/Class-definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 25.331 V11.8.0 (2013-12)
-- 3GPP TS 25.331 V12.6.0 (2015-06)
--
Class-definitions DEFINITIONS AUTOMATIC TAGS ::=

14
asn1/rrc/Constant-definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 25.331 V11.8.0 (2013-12)
-- 3GPP TS 25.331 V12.6.0 (2015-06)
--
Constant-definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -14,8 +14,11 @@ maxASCmap INTEGER ::= 7
maxASCpersist INTEGER ::= 6
maxCCTrCH INTEGER ::= 8
maxCellMeas INTEGER ::= 32
maxCellMeas-ext INTEGER ::= 80
maxCellMeas-ext2 INTEGER ::= 48
maxCellMeasOnSecULFreq INTEGER ::= 32
maxCellMeas-1 INTEGER ::= 31
maxCellMeas-ext-1 INTEGER ::= 79
maxCellMeasOnSecULFreq-1 INTEGER ::= 31
maxCNdomains INTEGER ::= 4
maxCommonHRNTI INTEGER ::= 4
@ -71,6 +74,7 @@ maxHSSCCHs INTEGER ::= 4
maxHSSCCHs-1 INTEGER ::= 3
maxHSSICH-TDD128 INTEGER ::= 4
maxHSSICH-TDD128-1 INTEGER ::= 3
maxIGPInfo INTEGER ::= 320
maxInterSysMessages INTEGER ::= 4
maxLoCHperRLC INTEGER ::= 2
maxLoggedMeasReport INTEGER ::= 128
@ -91,16 +95,19 @@ maxMBSFNClusters INTEGER ::= 16
maxMeasCSGRange INTEGER ::= 4
maxMeasEvent INTEGER ::= 8
maxMeasEventOnSecULFreq INTEGER ::= 8
maxMeasIdentity INTEGER ::= 32
maxMeasIntervals INTEGER ::= 3
maxMeasOccasionPattern INTEGER ::= 5
maxMeasOccasionPattern-1 INTEGER ::= 4
maxMeasParEvent INTEGER ::= 2
maxNonContiguousMultiCellCombinations INTEGER ::= 3
maxNumAccessGroups INTEGER ::= 16
maxNumCDMA2000Freqs INTEGER ::= 8
maxNumE-AGCH INTEGER ::= 4
maxNumE-HICH INTEGER ::= 4
maxNumEUTRAFreqs INTEGER ::= 8
maxNumEUTRAFreqs-FACH INTEGER ::= 4
maxNumEUTRAFreqs-FACH-ext INTEGER ::= 8
maxNumGSMCellGroup INTEGER ::= 16
maxNumGSMFreqRanges INTEGER ::= 32
maxNumFDDFreqs INTEGER ::= 8
@ -138,10 +145,12 @@ maxRBperRAB INTEGER ::= 8
maxRBperTrCh INTEGER ::= 16
maxReportedEUTRACellPerFreq INTEGER ::= 4
maxReportedEUTRAFreqs INTEGER ::= 4
maxReportedEUTRAFreqs-ext INTEGER ::= 8
maxReportedGSMCells INTEGER ::= 8
maxRL INTEGER ::= 8
maxRL-1 INTEGER ::= 7
maxRLCPDUsizePerLogChan INTEGER ::= 32
maxRMPfrequencies INTEGER ::= 8
maxRFC3095-CID INTEGER ::= 16384
maxROHC-PacketSizes-r4 INTEGER ::= 16
maxROHC-Profile-r4 INTEGER ::= 8
@ -152,6 +161,7 @@ maxSatClockModels INTEGER ::= 4
maxSCCPCH INTEGER ::= 16
maxSgnType INTEGER ::= 8
maxSIB INTEGER ::= 32
maxSIB2 INTEGER ::= 64
maxSIB-FACH INTEGER ::= 8
maxSIBperMsg INTEGER ::= 16
maxSIrequest INTEGER ::= 4
@ -168,6 +178,7 @@ maxTFCsub INTEGER ::= 1024
maxTFCI-2-Combs INTEGER ::= 512
maxTGPS INTEGER ::= 6
maxTrCH INTEGER ::= 32
maxTrCHConcat INTEGER ::= 3
-- maxTrCHpreconf should be 16 but has been set to 32 for compatibility
maxTrCHpreconf INTEGER ::= 32
maxTS INTEGER ::= 14
@ -177,5 +188,6 @@ maxTS-LCR INTEGER ::= 6
maxTS-LCR-1 INTEGER ::= 5
maxURA INTEGER ::= 8
maxURNTI-Group INTEGER ::= 8
maxWLANID INTEGER ::= 16
END

2263
asn1/rrc/InformationElements.asn
View File

File diff suppressed because it is too large Load Diff

127
asn1/rrc/Internode-definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 25.331 V11.8.0 (2013-12)
-- 3GPP TS 25.331 V12.6.0 (2015-06)
--
Internode-definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -123,19 +123,26 @@ FROM PDU-definitions
DRAC-StaticInformationList,
UL-CommonTransChInfo,
UL-CommonTransChInfo-r4,
UL-CommonTransChInfo-r12,
UL-AddReconfTransChInfoList,
UL-AddReconfTransChInfoList-r6,
UL-AddReconfTransChInfoList-r7,
UL-AddReconfTransChInfoList-r8,
-- Physical Channel IEs :
DCH-Enhancements-Info-FDD,
DL-CommonInformation-r12,
DL-InformationPerRL-List-r12,
DTX-DRX-Info-r12,
FrequencyInfo,
PrimaryCPICH-Info,
TPC-CombinationIndex,
ScramblingCodeChange,
Serving-HSDSCH-CellInformation-r12,
TGCFN,
TGPSI,
TGPS-ConfigurationParams,
TGPS-ConfigurationParams-r8,
UL-SecondaryCellInfoFDD-r12,
-- Measurement IEs :
Event1j-r6,
Hysteresis,
@ -156,6 +163,7 @@ FROM PDU-definitions
MeasurementType-r9,
MeasurementType-r10,
MeasurementType-r11,
MeasurementType-r12,
AdditionalMeasurementID-List,
AdditionalMeasurementID-List-r9,
PositionEstimate,
@ -552,7 +560,14 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
sRNC-RelocationInfo-r11-add-ext BIT STRING OPTIONAL,
nonCriticalExtensions SEQUENCE {} OPTIONAL
},
criticalExtensions SEQUENCE {}
criticalExtensions CHOICE {
r12 SEQUENCE {
sRNC-RelocationInfo-r12 SRNC-RelocationInfo-r12-IEs,
sRNC-RelocationInfo-r12-add-ext BIT STRING OPTIONAL,
nonCriticalExtensions SEQUENCE {} OPTIONAL
},
criticalExtensions SEQUENCE {}
}
}
}
}
@ -581,7 +596,7 @@ SRNC-RelocationInfo-r3-IEs ::= SEQUENCE {
count-C-List COUNT-C-List OPTIONAL,
integrityProtectionStatus IntegrityProtectionStatus,
-- In the IE srb-SpecificIntegrityProtInfo, the first information listed corresponds to
-- signalling radio bearer RB0 and after the order of occurrence is the same as the SRBs in
-- signalling radio bearer RB0 and after the order of occurrence is the same as the SRBs in
-- SRB-InformationSetupList
-- The target RNC may ignore the IE srb-SpecificIntegrityProtInfo if the
-- IE integrityProtectionStatus has the value "not started".
@ -1473,6 +1488,96 @@ SRNC-RelocationInfo-r11-IEs ::= SEQUENCE {
mbmsSelectedServiceInfo MBMS-SelectedServiceInfo OPTIONAL
}
SRNC-RelocationInfo-r12-IEs ::= SEQUENCE {
-- Non-RRC IEs
-- IE rb-IdentityForHOMessage includes the identity of the RB used by the source SRNC
-- to send the message contained in the IE "TargetRNC-ToSourceRNC-Container".
-- Only included if type is "UE involved"
rb-IdentityForHOMessage RB-Identity OPTIONAL,
stateOfRRC StateOfRRC,
stateOfRRC-Procedure StateOfRRC-Procedure,
-- Ciphering related information IEs
cipheringStatusList CipheringStatusList-r4,
latestConfiguredCN-Domain CN-DomainIdentity,
calculationTimeForCiphering CalculationTimeForCiphering OPTIONAL,
count-C-List COUNT-C-List OPTIONAL,
cipheringInfoPerRB-List CipheringInfoPerRB-List-r4 OPTIONAL,
-- Integrity protection related information IEs
integrityProtectionStatus IntegrityProtectionStatus,
srb-SpecificIntegrityProtInfo SRB-SpecificIntegrityProtInfoList OPTIONAL,
implementationSpecificParams ImplementationSpecificParams OPTIONAL,
-- User equipment IEs
u-RNTI U-RNTI,
c-RNTI C-RNTI OPTIONAL,
-- IE 'UE-RadioAccessCapability-r6' includes the Rel-5 radio access capability extensions
-- and earlier. Rel-6 and later extensions are included in IE 'UE-CapabilityContainer-IEs'.
ue-RadioAccessCapability UE-RadioAccessCapability-r6,
ue-RadioAccessCapability-ext UE-RadioAccessCapabBandFDDList OPTIONAL,
ue-Positioning-LastKnownPos UE-Positioning-LastKnownPos OPTIONAL,
uESpecificBehaviourInformation1idle
UESpecificBehaviourInformation1idle OPTIONAL,
uESpecificBehaviourInformation1interRAT
UESpecificBehaviourInformation1interRAT OPTIONAL,
-- IE ueCapabilityContainer is used for the transparent transfer of capability information
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
ueCapabilityContainer-RSC BIT STRING
(CONTAINING RRCConnectionSetupComplete-r3-add-ext-IEs) OPTIONAL,
-- Case 2: If the last received message was a UE CAPABILITY INFORMATION (UCI)
ueCapabilityContainer-UCI BIT STRING
(CONTAINING UECapabilityInformation-r3-add-ext-IEs) OPTIONAL,
-- Other IEs
ue-RATSpecificCapability InterRAT-UE-RadioAccessCapabilityList-r5 OPTIONAL,
-- UTRAN mobility IEs
ura-Identity URA-Identity OPTIONAL,
srns-t-305 T-305 OPTIONAL,
-- Core network IEs
cn-CommonGSM-MAP-NAS-SysInfo NAS-SystemInformationGSM-MAP,
cn-DomainInformationList CN-DomainInformationListFull OPTIONAL,
-- Measurement IEs
ongoingMeasRepList OngoingMeasRepList-r12 OPTIONAL,
interRATCellInfoIndication InterRATCellInfoIndication OPTIONAL,
-- Radio bearer IEs
predefinedConfigStatusList PredefinedConfigStatusList,
srb-InformationList SRB-InformationSetupList-r11,
rab-InformationList RAB-InformationSetupList-r11 OPTIONAL,
pdcp-ROHC-TargetMode PDCP-ROHC-TargetMode OPTIONAL,
-- Transport channel IEs
ul-CommonTransChInfo UL-CommonTransChInfo-r12 OPTIONAL,
ul-TransChInfoList UL-AddReconfTransChInfoList-r8 OPTIONAL,
dl-CommonTransChInfo DL-CommonTransChInfo-r4 OPTIONAL,
dl-TransChInfoList DL-AddReconfTransChInfoList-r11 OPTIONAL,
-- PhyCH IEs
tpc-CombinationInfoList TPC-CombinationInfoList OPTIONAL,
e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList OPTIONAL,
storedCompressedModeInfo StoredCompressedModeInfo-r8 OPTIONAL,
secondary-tpc-CombinationInfoList TPC-CombinationInfoList-r9 OPTIONAL,
secondary-e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList-r9 OPTIONAL,
serving-HSDSCH-CellInformation Serving-HSDSCH-CellInformation-r12 OPTIONAL,
dtx-drx-Info DTX-DRX-Info-r12 OPTIONAL,
ul-SecondaryCellInfoFDD UL-SecondaryCellInfoFDD-r12 OPTIONAL,
dch-Enhancements-Info-FDD DCH-Enhancements-Info-FDD OPTIONAL,
dl-CommonInformation DL-CommonInformation-r12 OPTIONAL,
dl-InformationPerRL-List DL-InformationPerRL-List-r12 OPTIONAL,
-- Measurement report
measurementReport BIT STRING
(CONTAINING MeasurementReport) OPTIONAL,
-- Other IEs
failureCause FailureCauseWithProtErr OPTIONAL,
ue-HistoryInformation UE-HistoryInformation OPTIONAL,
-- MBMS IEs
mbms-JoinedInformation MBMS-JoinedInformation-r6 OPTIONAL,
mbmsSelectedServiceInfo MBMS-SelectedServiceInfo OPTIONAL
}
-- IE definitions
CalculationTimeForCiphering ::= SEQUENCE {
@ -1703,6 +1808,12 @@ MeasurementCommandWithType-r11 ::= CHOICE {
release NULL
}
MeasurementCommandWithType-r12 ::= CHOICE {
setup MeasurementType-r12,
modify NULL,
release NULL
}
OngoingMeasRep ::= SEQUENCE {
measurementIdentity MeasurementIdentity,
-- TABULAR: The CHOICE Measurement in the tabular description is included
@ -1807,6 +1918,13 @@ OngoingMeasRep-r11 ::= SEQUENCE {
additionalMeasurementID-List AdditionalMeasurementID-List-r9 OPTIONAL
}
OngoingMeasRep-r12 ::= SEQUENCE {
measurementIdentity MeasurementIdentity-r9,
measurementCommandWithType MeasurementCommandWithType-r12,
measurementReportingMode MeasurementReportingMode OPTIONAL,
additionalMeasurementID-List AdditionalMeasurementID-List-r9 OPTIONAL
}
OngoingMeasRepList ::= SEQUENCE (SIZE (1..maxNoOfMeas)) OF
OngoingMeasRep
@ -1837,6 +1955,9 @@ OngoingMeasRepList-r10 ::= SEQUENCE (SIZE (1..maxNoOfMeas)) OF
OngoingMeasRepList-r11 ::= SEQUENCE (SIZE (1..maxNoOfMeas)) OF
OngoingMeasRep-r11
OngoingMeasRepList-r12 ::= SEQUENCE (SIZE (1..maxNoOfMeas)) OF
OngoingMeasRep-r12
PDCP-Capability-r4 ::= SEQUENCE {
losslessSRNS-RelocationSupport BOOLEAN,
supportForRfc2507 CHOICE {

1195
asn1/rrc/PDU-definitions.asn
View File

File diff suppressed because it is too large Load Diff

3
asn1/rrc/packet-rrc-template.c
View File

@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Ref: 3GPP TS 25.331 V11.8.0 (2013-12) + CR5591
* Ref: 3GPP TS 25.331 V12.6.0 (2015-06)
*/
/**
@ -88,6 +88,7 @@ static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_t
static int dissect_SysInfoType5_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
static int dissect_SysInfoType11_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
static int dissect_SysInfoType11bis_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
static int dissect_SysInfoType11ter_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
/* Include constants */

10
asn1/rrc/rrc.cnf
View File

@ -37,6 +37,10 @@ U-RNTI-Group
UL-DCCH-MessageType
UL-TS-ChannelisationCode
UL-TS-ChannelisationCode-VHCR
MinimumTEBS-threshold
UE-DTX-Cycle2-2ms-Secondary
SIB-Type2
WLANThreshBackhaulRate
#.EXPORTS
InterRATHandoverInfo
@ -80,6 +84,7 @@ BCCH-BCH-Message @bcch.bch
MCCH-Message @mcch
MSCH-Message @msch
SystemInformation-BCH @sysinfo
SystemInformation2-BCH @sysinfo2
System-Information-Container @sysinfo.cont
MasterInformationBlock @si.mib
SysInfoType1 @si.sib1
@ -95,6 +100,7 @@ SysInfoType9 @si.sib9
SysInfoType10 @si.sib10
SysInfoType11 @si.sib11
SysInfoType11bis @si.sib11bis
SysInfoType11ter @si.sib11ter
SysInfoType12 @si.sib12
SysInfoType13 @si.sib13
SysInfoType13-1 @si.sib13-1
@ -106,6 +112,7 @@ SysInfoType15 @si.sib15
SysInfoType15bis @si.sib15bis
SysInfoType15-1 @si.sib15-1
SysInfoType15-1bis @si.sib15-1bis
SysInfoType15-1ter @si.sib15-1ter
SysInfoType15-2 @si.sib15-2
SysInfoType15-2bis @si.sib15-2bis
SysInfoType15-2ter @si.sib15-2ter
@ -123,8 +130,11 @@ SysInfoType19 @si.sib19
SysInfoType20 @si.sib20
SysInfoType21 @si.sib21
SysInfoType22 @si.sib22
SysInfoType23 @si.sib23
SysInfoType24 @si.sib24
SysInfoTypeSB1 @si.sb1
SysInfoTypeSB2 @si.sb2
SysInfoTypeSB3 @si.sb3
HandoverToUTRANCommand @irat.ho_to_utran_cmd
InterRATHandoverInfo @irat.irat_ho_info
UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info

42389
epan/dissectors/packet-rrc.c
View File

File diff suppressed because it is too large Load Diff