diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-02-21 09:25:41 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-02-21 09:25:41 +0000 |
commit | f104bae88ac133ce0fb35bbd75db74ec2e3a6998 (patch) | |
tree | 5eac1ec3bb216bdb3d4eae367e39ac3611856d85 /asn1 | |
parent | d7277e2230bc4758305529d3c0a31b8b2f3f8b16 (diff) |
From David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).
svn path=/trunk/; revision=41104
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ranap/RANAP-CommonDataTypes.asn | 3 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Constants.asn | 27 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Containers.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/RANAP-IEs.asn | 40 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Contents.asn | 48 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Descriptions.asn | 3 | ||||
-rw-r--r-- | asn1/ranap/packet-ranap-template.c | 2 | ||||
-rw-r--r-- | asn1/ranap/ranap.cnf | 8 |
8 files changed, 69 insertions, 64 deletions
diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn index a049175a12..574f4e02ff 100644 --- a/asn1/ranap/RANAP-CommonDataTypes.asn +++ b/asn1/ranap/RANAP-CommonDataTypes.asn @@ -1,6 +1,6 @@ -- RANAP-CommonDataTypes.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.5 Common Definitions @@ -40,3 +40,4 @@ ProtocolIE-ID ::= INTEGER (0..65535) TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome, outcome } END + diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn index 68c066e8d8..5238205fef 100644 --- a/asn1/ranap/RANAP-Constants.asn +++ b/asn1/ranap/RANAP-Constants.asn @@ -1,6 +1,6 @@ -- RANAP-Constants.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.6 Constant Definitions @@ -35,9 +35,6 @@ id-RelocationCancel INTEGER ::= 4 id-SRNS-ContextTransfer INTEGER ::= 5 id-SecurityModeControl INTEGER ::= 6 id-DataVolumeReport INTEGER ::= 7 --- WS -id-Not-Used-8 INTEGER ::= 8 --- End WS id-Reset INTEGER ::= 9 id-RAB-ReleaseRequest INTEGER ::= 10 id-Iu-ReleaseRequest INTEGER ::= 11 @@ -124,7 +121,7 @@ maxGANSSSet INTEGER ::= 9 maxNrOfCSGs INTEGER ::= 256 maxNrOfEUTRAFreqs INTEGER ::= 8 maxNrOfCellIds INTEGER ::= 32 -maxNrOfRACs INTEGER ::= 8 +maxNrOfRAIs INTEGER ::= 8 maxNrOfLAIs INTEGER ::= 8 -- ************************************************************** @@ -134,10 +131,6 @@ maxNrOfLAIs INTEGER ::= 8 -- ************************************************************** id-AreaIdentity INTEGER ::= 0 --- WS Extension -id-Not-Used-1 INTEGER ::= 1 -id-Not-Used-2 INTEGER ::= 2 --- end WS extension id-CN-DomainIndicator INTEGER ::= 3 id-Cause INTEGER ::= 4 id-ChosenEncryptionAlgorithm INTEGER ::= 5 @@ -208,10 +201,6 @@ id-UE-ID INTEGER ::= 69 id-UL-GTP-PDU-SequenceNumber INTEGER ::= 70 id-RAB-FailedtoReportItem INTEGER ::= 71 id-RAB-FailedtoReportList INTEGER ::= 72 --- WS Extension -id-Not-Used-73 INTEGER ::= 73 -id-Not-Used-74 INTEGER ::= 74 ---end id-KeyStatus INTEGER ::= 75 id-DRX-CycleLengthCoefficient INTEGER ::= 76 id-IuSigConIdList INTEGER ::= 77 @@ -238,10 +227,6 @@ id-LastKnownServiceArea INTEGER ::= 97 id-SRB-TrCH-Mapping INTEGER ::= 98 id-InterSystemInformation-TransparentContainer INTEGER ::= 99 id-NewBSS-To-OldBSS-Information INTEGER ::= 100 --- Ws Extension -id-Not-Used-101 INTEGER ::= 101 -id-Not-Used-102 INTEGER ::= 102 --- end id-SourceRNC-PDCP-context-info INTEGER ::= 103 id-InformationTransferID INTEGER ::= 104 id-SNA-Access-Information INTEGER ::= 105 @@ -371,9 +356,6 @@ id-SRVCC-Operation-Possible INTEGER ::= 228 id-CSG-Id-List INTEGER ::= 229 id-PSRABtobeReplaced INTEGER ::= 230 id-E-UTRAN-Service-Handover INTEGER ::= 231 --- Ws Extension -id-Not-Used-232 INTEGER ::= 232 --- end id-UE-AggregateMaximumBitRate INTEGER ::= 233 id-CSG-Membership-Status INTEGER ::= 234 id-Cell-Access-Mode INTEGER ::= 235 @@ -387,10 +369,11 @@ id-Correlation-ID INTEGER ::= 242 id-IRAT-Measurement-Configuration INTEGER ::= 243 id-MDT-Configuration INTEGER ::= 244 id-Priority-Class-Indicator INTEGER ::= 245 --- Ws Extension -id-Not-Used-246 INTEGER ::= 246 id-RNSAPRelocationParameters INTEGER ::= 247 id-RABParametersList INTEGER ::= 248 id-Management-Based-MDT-Allowed INTEGER ::= 249 +id-HigherBitratesThan16MbpsFlag INTEGER ::= 250 +id-Trace-Collection-Entity-IP-Addess INTEGER ::= 251 +id-End-Of-CSFB INTEGER ::= 252 END diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn index 0b51c0a718..50082f70bf 100644 --- a/asn1/ranap/RANAP-Containers.asn +++ b/asn1/ranap/RANAP-Containers.asn @@ -1,6 +1,6 @@ -- RANAP-Containers.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06)) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.7 Container Definitions diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn index 6498551f4f..e235e6dfcf 100644 --- a/asn1/ranap/RANAP-IEs.asn +++ b/asn1/ranap/RANAP-IEs.asn @@ -1,6 +1,6 @@ -- RANAP-IEs.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.4 Information Element Definitions @@ -49,7 +49,7 @@ IMPORTS maxGANSSSet, maxNrOfEUTRAFreqs, maxNrOfCellIds, - maxNrOfRACs, + maxNrOfRAIs, maxNrOfLAIs, maxNrOfVol, @@ -112,7 +112,7 @@ FROM RANAP-Containers; -- A -AccuracyFulfilmentIndicator ::= ENUMERATED { +AccuracyFulfilmentIndicator ::= ENUMERATED{ requested-Accuracy-Fulfilled, requested-Accuracy-Not-Fulfilled, ... @@ -272,7 +272,7 @@ Ass-RAB-Parameters ::= SEQUENCE { Ass-RAB-Parameters-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 7 to indicate an extended assigned Guaranteed Bitrate -- - { ID id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList CRITICALITY reject EXTENSION Ass-RAB-Parameter-ExtendedGuaranteedBitrateList PRESENCE optional }| + { ID id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList CRITICALITY reject EXTENSION Ass-RAB-Parameter-ExtendedGuaranteedBitrateList PRESENCE optional }| -- Extension for Release 7 to indicate an extended assigned Maximum Bitrate -- { ID id-Ass-RAB-Parameter-ExtendedMaxBitrateList CRITICALITY reject EXTENSION Ass-RAB-Parameter-ExtendedMaxBitrateList PRESENCE optional }| -- Extension for Release 8 to indicate an supported assigned Maximum Bitrate -- @@ -693,6 +693,11 @@ EncryptionInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { EncryptionKey ::= BIT STRING (SIZE (128)) -- Reference: 33.102 +End-Of-CSFB ::= ENUMERATED{ + end-of-CSFB, + ... +} + EquipmentsToBeTraced ::= CHOICE { iMEIlist IMEIList, iMEISVlist IMEISVList, @@ -905,6 +910,12 @@ GuaranteedBitrate ::= INTEGER (0..16000000) -- H +HigherBitratesThan16MbpsFlag ::= ENUMERATED{ + allowed, + not-allowed, + ... +} + HS-DSCH-MAC-d-Flow-ID ::= INTEGER (0.. maxNrOfHSDSCHMACdFlows-1) -- I @@ -1239,12 +1250,11 @@ MDTAreaScope ::= CHOICE { cellbased CellBased, labased LABased, rabased RABased, - plmn-area-based PLMNAreaBased, + plmn-area-based NULL, ... } MDT-Configuration ::= SEQUENCE { - mdtRecordingSessionReference TraceRecordingSessionReference, mdtActivation MDT-Activation, mdtAreaScope MDTAreaScope, mdtMode MDTMode, @@ -1435,15 +1445,6 @@ LoggingDuration ::= ENUMERATED { ...} -PLMNAreaBased ::= SEQUENCE { - plmnID PLMNidentity, - iE-Extensions ProtocolExtensionContainer { {PLMNAreaBased-ExtIEs} } OPTIONAL, - ... -} - -PLMNAreaBased-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { - ... -} PLMNidentity ::= TBCD-STRING (SIZE (3)) @@ -1524,7 +1525,7 @@ RAB-AsymmetryIndicator::= ENUMERATED { } RABased ::= SEQUENCE { - racList RAC-List, + raiList RAI-List, iE-Extensions ProtocolExtensionContainer { {RABased-ExtIEs} } OPTIONAL, ... } @@ -1533,8 +1534,9 @@ RABased-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { ... } -RAC-List ::= SEQUENCE (SIZE (1..maxNrOfRACs)) OF - RAC + +RAI-List ::= SEQUENCE (SIZE (1..maxNrOfRAIs)) OF + RAI RABDataVolumeReport ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF SEQUENCE { @@ -1882,7 +1884,6 @@ RTLoadValue ::= INTEGER (0..100) -- S SAC ::= OCTET STRING (SIZE (2)) - SAI ::= SEQUENCE { pLMNidentity PLMNidentity, lAC LAC, @@ -1901,7 +1902,6 @@ SAPI ::= ENUMERATED { } SessionUpdateID ::= INTEGER (0.. 1048575) - Shared-Network-Information ::= SEQUENCE { pLMNs-in-shared-network PLMNs-in-shared-network, iE-Extensions ProtocolExtensionContainer { {Shared-Network-Information-ExtIEs} } OPTIONAL, diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn index b73a1a6f7e..ce4e6999b5 100644 --- a/asn1/ranap/RANAP-PDU-Contents.asn +++ b/asn1/ranap/RANAP-PDU-Contents.asn @@ -1,6 +1,6 @@ -- RANAP-PDU-Contents.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.3 PDU Definitions @@ -171,11 +171,12 @@ IMPORTS RABParametersList, MDT-Configuration, Priority-Class-Indicator, - Management-Based-MDT-Allowed + Management-Based-MDT-Allowed, + HigherBitratesThan16MbpsFlag, + End-Of-CSFB FROM RANAP-IEs - PrivateIE-Container{}, ProtocolExtensionContainer{}, ProtocolIE-ContainerList{}, @@ -397,7 +398,10 @@ FROM RANAP-Containers id-RNSAPRelocationParameters, id-RABParametersList, id-Priority-Class-Indicator, - id-Management-Based-MDT-Allowed + id-Management-Based-MDT-Allowed, + id-HigherBitratesThan16MbpsFlag, + id-Trace-Collection-Entity-IP-Addess, + id-End-Of-CSFB FROM RANAP-Constants; @@ -437,6 +441,7 @@ Iu-ReleaseCommandIEs RANAP-PROTOCOL-IES ::= { } Iu-ReleaseCommandExtensions RANAP-PROTOCOL-EXTENSION ::= { + { ID id-End-Of-CSFB CRITICALITY ignore EXTENSION End-Of-CSFB PRESENCE optional }, ... } @@ -1459,6 +1464,8 @@ RelocationCompleteIEs RANAP-PROTOCOL-IES ::= { } RelocationCompleteExtensions RANAP-PROTOCOL-EXTENSION ::= { +-- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates -- + { ID id-HigherBitratesThan16MbpsFlag CRITICALITY ignore EXTENSION HigherBitratesThan16MbpsFlag PRESENCE optional }, ... } @@ -1512,8 +1519,10 @@ RAB-SetupItem-EnhancedRelocCompleteReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { } EnhancedRelocationCompleteRequestExtensions RANAP-PROTOCOL-EXTENSION ::= { - { ID id-ChosenIntegrityProtectionAlgorithm CRITICALITY ignore EXTENSION ChosenIntegrityProtectionAlgorithm PRESENCE optional } | - { ID id-ChosenEncryptionAlgorithm CRITICALITY ignore EXTENSION ChosenEncryptionAlgorithm PRESENCE optional }, + { ID id-ChosenIntegrityProtectionAlgorithm CRITICALITY ignore EXTENSION ChosenIntegrityProtectionAlgorithm PRESENCE optional}| + { ID id-ChosenEncryptionAlgorithm CRITICALITY ignore EXTENSION ChosenEncryptionAlgorithm PRESENCE optional}| +-- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates -- + { ID id-HigherBitratesThan16MbpsFlag CRITICALITY ignore EXTENSION HigherBitratesThan16MbpsFlag PRESENCE optional}, ... } @@ -1740,9 +1749,11 @@ CN-InvokeTraceIEs RANAP-PROTOCOL-IES ::= { CN-InvokeTraceExtensions RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 6 to enable signalling based activation for Subscriber and Equipment Trace over Iu interface -- - { ID id-TracePropagationParameters CRITICALITY ignore EXTENSION TracePropagationParameters PRESENCE optional} | + { ID id-TracePropagationParameters CRITICALITY ignore EXTENSION TracePropagationParameters PRESENCE optional}| +-- Extension for Release 10 to support MDT-- + { ID id-MDT-Configuration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional}| -- Extension for Release 10 to support MDT-- - { ID id-MDT-Configuration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional} , + { ID id-Trace-Collection-Entity-IP-Addess CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}, ... } @@ -1886,23 +1897,25 @@ InitialUE-MessageIEs RANAP-PROTOCOL-IES ::= { InitialUE-MessageExtensions RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 5 to enable GERAN support over Iu-cs -- - { ID id-GERAN-Classmark CRITICALITY ignore EXTENSION GERAN-Classmark PRESENCE optional}| + { ID id-GERAN-Classmark CRITICALITY ignore EXTENSION GERAN-Classmark PRESENCE optional}| -- Extension for Release 6 to convey the selected PLMN id in shared networks -- - { ID id-SelectedPLMN-ID CRITICALITY ignore EXTENSION PLMNidentity PRESENCE optional}| + { ID id-SelectedPLMN-ID CRITICALITY ignore EXTENSION PLMNidentity PRESENCE optional}| -- Extension for Release 6 to enable rerouting in MOCN configuration for network sharing non-supporting UEs -- - { ID id-PermanentNAS-UE-ID CRITICALITY ignore EXTENSION PermanentNAS-UE-ID PRESENCE optional}| + { ID id-PermanentNAS-UE-ID CRITICALITY ignore EXTENSION PermanentNAS-UE-ID PRESENCE optional}| -- Extension for Release 6 to enable rerouting in MOCN configuration for network sharing non-supporting UEs -- - { ID id-NAS-SequenceNumber CRITICALITY ignore EXTENSION NAS-SequenceNumber PRESENCE optional}| + { ID id-NAS-SequenceNumber CRITICALITY ignore EXTENSION NAS-SequenceNumber PRESENCE optional}| -- Extension for Release 6 to indicate rerouting in MOCN configuration for network sharing non-supporting UEs -- - { ID id-RedirectAttemptFlag CRITICALITY ignore EXTENSION RedirectAttemptFlag PRESENCE optional}| + { ID id-RedirectAttemptFlag CRITICALITY ignore EXTENSION RedirectAttemptFlag PRESENCE optional}| -- Extension for Release 7 to indicate extended RNC-ID -- - { ID id-ExtendedRNC-ID CRITICALITY reject EXTENSION ExtendedRNC-ID PRESENCE optional}| + { ID id-ExtendedRNC-ID CRITICALITY reject EXTENSION ExtendedRNC-ID PRESENCE optional}| -- Extension for Release 8 to support CSG -- - { ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional}| + { ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional}| -- Extension for Release 9 to allow communication of the cell access mode -- - { ID id-Cell-Access-Mode CRITICALITY reject EXTENSION Cell-Access-Mode PRESENCE optional}| + { ID id-Cell-Access-Mode CRITICALITY reject EXTENSION Cell-Access-Mode PRESENCE optional}| -- Extension for Release 10 to support LIPA -- - { ID id-LGW-TransportLayerAddress CRITICALITY reject EXTENSION TransportLayerAddress PRESENCE optional}, + { ID id-LGW-TransportLayerAddress CRITICALITY reject EXTENSION TransportLayerAddress PRESENCE optional}| +-- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates -- + { ID id-HigherBitratesThan16MbpsFlag CRITICALITY ignore EXTENSION HigherBitratesThan16MbpsFlag PRESENCE optional}, ... } @@ -3482,3 +3495,4 @@ SRVCC-CSKeysResponseExtensions RANAP-PROTOCOL-EXTENSION ::= { END + diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn index e46c75f4a4..1403a17b34 100644 --- a/asn1/ranap/RANAP-PDU-Descriptions.asn +++ b/asn1/ranap/RANAP-PDU-Descriptions.asn @@ -1,6 +1,6 @@ -- RANAP-PDU-Descriptions.asn -- --- 3GPP TS 25.413 V10.2.0 (2011-06) +-- 3GPP TS 25.413 V10.4.0 (2011-12) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.2 Elementary Procedure Definitions @@ -614,3 +614,4 @@ sRVCCPreparation RANAP-ELEMENTARY-PROCEDURE ::= { } END + diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 2d67a541f5..6c43ec277f 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * References: 3GPP TS 25.413 version 6.6.0 Release + * References: 3GPP TS 25.413 version 10.4.0 Release 10 */ #ifdef HAVE_CONFIG_H diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 8163b0a631..311b1924c3 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -22,7 +22,7 @@ TargetRNC-ID_PDU RANAP-PDU SourceCellID SourceRNC-ToTargetRNC-TransparentContainer -TargetRNC-ToSourceRNC_TransparentContainer +TargetRNC-ToSourceRNC-TransparentContainer TargetRNC-ID #.MAKE_ENUM @@ -678,6 +678,9 @@ id-Not-Used-246 ProtocolIE-ID id-RNSAPRelocationParameters ProtocolIE-ID id-RABParametersList ProtocolIE-ID id-Management-Based-MDT-Allowed ProtocolIE-ID +id-HigherBitratesThan16MbpsFlag ProtocolIE-ID +id-Trace-Collection-Entity-IP-Addess ProtocolIE-ID +id-End-Of-CSFB ProtocolIE-ID #.END #.REGISTER_NEW @@ -936,6 +939,9 @@ Priority-Class-Indicator N ranap.extension id-Priority-Class-Indicator RNSAPRelocationParameters N ranap.extension id-RNSAPRelocationParameters RABParametersList N ranap.extension id-RABParametersList Management-Based-MDT-Allowed N ranap.extension id-Management-Based-MDT-Allowed +HigherBitratesThan16MbpsFlag N ranap.extension id-HigherBitratesThan16MbpsFlag +TransportLayerAddress N ranap.extension id-Trace-Collection-Entity-IP-Addess +End-Of-CSFB N ranap.extension id-End-Of-CSFB #RANAP-ELEMENTARY-PROCEDURE Iu-ReleaseCommand N ranap.proc.imsg id-Iu-Release |