diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-04-12 19:35:51 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-12 19:35:51 +0000 |
commit | d05485a32b55f781dd05bbdafcb574c625a648fb (patch) | |
tree | 7a1b92f0ce4888e8696a3ccb5e6f6e62a464a4da /asn1 | |
parent | 057b934cfaad47425c9465c0da9e47d501a39f98 (diff) |
Update to V9.2.0 (2010-03).
svn path=/trunk/; revision=32451
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/s1ap/S1AP-CommonDataTypes.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Constants.asn | 6 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Containers.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-IEs.asn | 84 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Contents.asn | 41 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Descriptions.asn | 4 | ||||
-rw-r--r-- | asn1/s1ap/packet-s1ap-template.c | 4 | ||||
-rw-r--r-- | asn1/s1ap/s1ap.cnf | 2 |
8 files changed, 79 insertions, 72 deletions
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn index b24a4d220f..b475a8621e 100644 --- a/asn1/s1ap/S1AP-CommonDataTypes.asn +++ b/asn1/s1ap/S1AP-CommonDataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.5 Common Definitions -- ************************************************************** -- @@ -33,6 +33,3 @@ ProtocolIE-ID ::= INTEGER (0..65535) TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome } END - - - diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn index 4ac7b26530..dbcabcbb9e 100644 --- a/asn1/s1ap/S1AP-Constants.asn +++ b/asn1/s1ap/S1AP-Constants.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.6 Constant Definitions -- ************************************************************** -- @@ -261,8 +261,6 @@ id-CellAccessMode ProtocolIE-ID ::= 145 id-CSGMembershipStatus ProtocolIE-ID ::= 146 id-LPPa-PDU ProtocolIE-ID ::= 147 id-Routing-ID ProtocolIE-ID ::= 148 +id-Time-Synchronization-Info ProtocolIE-ID ::= 149 END - - - diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn index c9c6fb85d1..bb996d1033 100644 --- a/asn1/s1ap/S1AP-Containers.asn +++ b/asn1/s1ap/S1AP-Containers.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.7 Container Definitions -- ************************************************************** -- @@ -199,6 +199,3 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE { } END - - - diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn index d9a0cb6e80..561b15029c 100644 --- a/asn1/s1ap/S1AP-IEs.asn +++ b/asn1/s1ap/S1AP-IEs.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.4 Information Element Definitions -- ************************************************************** -- @@ -18,7 +18,8 @@ BEGIN IMPORTS id-E-RABInformationListItem, id-E-RABItem, - id-Bearers-SubjectToStatusTransfer-Item, + id-Bearers-SubjectToStatusTransfer-Item, + id-Time-Synchronization-Info, maxNrOfCSGs, maxNrOfE-RABs, maxNrOfErrors, @@ -29,7 +30,6 @@ IMPORTS maxnoofEPLMNsPlusOne, maxnoofForbLACs, maxnoofForbTACs, - maxnoofTACs, maxnoofCells, maxnoofCellID, maxnoofEmergencyAreaID, @@ -85,9 +85,9 @@ Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= { Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE { e-RAB-ID E-RAB-ID, - uL-COUNTvalue COUNTvalue, - dL-COUNTvalue COUNTvalue, - receiveStatusofULPDCPSDUs ReceiveStatusofULPDCPSDUs OPTIONAL, + uL-COUNTvalue COUNTvalue, + dL-COUNTvalue COUNTvalue, + receiveStatusofULPDCPSDUs ReceiveStatusofULPDCPSDUs OPTIONAL, iE-Extensions ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL, ... } @@ -121,7 +121,7 @@ CancelledCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CancelledCellinEA CancelledCellinEAI-Item ::= SEQUENCE { eCGI EUTRAN-CGI, - numberOfBroadcasts NumberOfBroadcasts, + numberOfBroadcasts NumberOfBroadcasts, iE-Extensions ProtocolExtensionContainer { {CancelledCellinEAI-Item-ExtIEs} } OPTIONAL, ... } @@ -228,7 +228,8 @@ CauseNas ::= ENUMERATED { authentication-failure, detach, unspecified, - ... + ..., + csg-subscription-expiry } CellAccessMode ::= ENUMERATED { @@ -536,7 +537,7 @@ E-RABInformationListIEs S1AP-PROTOCOL-IES ::= { } E-RABInformationListItem ::= SEQUENCE { - e-RAB-ID E-RAB-ID, + e-RAB-ID E-RAB-ID, dL-Forwarding DL-Forwarding OPTIONAL, iE-Extensions ProtocolExtensionContainer { {E-RABInformationListItem-ExtIEs} } OPTIONAL, ... @@ -554,7 +555,7 @@ E-RABItemIEs S1AP-PROTOCOL-IES ::= { } E-RABItem ::= SEQUENCE { - e-RAB-ID E-RAB-ID, + e-RAB-ID E-RAB-ID, cause Cause, iE-Extensions ProtocolExtensionContainer { {E-RABItem-ExtIEs} } OPTIONAL, ... @@ -589,7 +590,7 @@ EUTRAN-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { ... } -EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..255) +EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..2047) ExtendedRNC-ID ::= INTEGER (4096..65535) @@ -642,7 +643,7 @@ GBR-QosInformation ::= SEQUENCE { e-RAB-MaximumBitrateUL BitRate, e-RAB-GuaranteedBitrateDL BitRate, e-RAB-GuaranteedBitrateUL BitRate, - iE-Extensions ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL, ... } @@ -657,7 +658,7 @@ GUMMEI ::= SEQUENCE { pLMN-Identity PLMNidentity, mME-Group-ID MME-Group-ID, mME-Code MME-Code, - iE-Extensions ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL, ... } @@ -672,7 +673,7 @@ HandoverRestrictionList ::= SEQUENCE { equivalentPLMNs EPLMNs OPTIONAL, forbiddenTAs ForbiddenTAs OPTIONAL, forbiddenLAs ForbiddenLAs OPTIONAL, - forbiddenInterRATs ForbiddenInterRATs OPTIONAL, + forbiddenInterRATs ForbiddenInterRATs OPTIONAL, iE-Extensions ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} } OPTIONAL, ... } @@ -781,7 +782,7 @@ OldBSS-ToNewBSS-Information ::= OCTET STRING OverloadAction ::= ENUMERATED { reject-non-emergency-mo-dt, reject-all-rrc-cr-signalling, -permit-emergency-sessions-only, +permit-emergency-sessions-and-mobile-terminated-services-only, ... } @@ -844,8 +845,8 @@ RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { } RIMTransfer ::= SEQUENCE { - rIMInformation RIMInformation, - rIMRoutingAddress RIMRoutingAddress OPTIONAL, + rIMInformation RIMInformation, + rIMRoutingAddress RIMRoutingAddress OPTIONAL, iE-Extensions ProtocolExtensionContainer { { RIMTransfer-ExtIEs} } OPTIONAL, ... } @@ -858,7 +859,8 @@ RIMInformation ::= OCTET STRING RIMRoutingAddress ::= CHOICE { gERAN-Cell-ID GERAN-Cell-ID, - ... + ..., + targetRNC-ID TargetRNC-ID } ReportArea ::= ENUMERATED { @@ -882,7 +884,7 @@ RRC-Establishment-Cause ::= ENUMERATED { ... } -Routing-ID ::= OCTET STRING (SIZE (4)) +Routing-ID ::= INTEGER (0..255) -- S @@ -913,8 +915,8 @@ SONInformation ::= CHOICE{ SONInformationRequest ::= ENUMERATED { x2TNL-Configuration-Info, - ... -} + ..., + time-Synchronization-Info} SONInformationReply ::= SEQUENCE { x2TNLConfigurationInfo X2TNLConfigurationInfo OPTIONAL, @@ -923,6 +925,8 @@ SONInformationReply ::= SEQUENCE { } SONInformationReply-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { +-- Extension for Release 9 to transfer Time synchronization information -- + {ID id-Time-Synchronization-Info CRITICALITY ignore EXTENSION TimeSynchronizationInfo PRESENCE optional}, ... } @@ -968,9 +972,9 @@ SRVCCHOIndication ::= ENUMERATED { SourceeNB-ToTargeteNB-TransparentContainer ::= SEQUENCE { rRC-Container RRC-Container, - e-RABInformationList E-RABInformationList OPTIONAL, + e-RABInformationList E-RABInformationList OPTIONAL, targetCell-ID EUTRAN-CGI, - subscriberProfileIDforRFP SubscriberProfileIDforRFP OPTIONAL, + subscriberProfileIDforRFP SubscriberProfileIDforRFP OPTIONAL, uE-HistoryInformation UE-HistoryInformation, iE-Extensions ProtocolExtensionContainer { {SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs} } OPTIONAL, ... @@ -1018,6 +1022,21 @@ SupportedTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { ... } +StratumLevel ::= INTEGER (0..3, ...) + +SynchronizationStatus ::= ENUMERATED { synchronous, asynchronous, ... } + +TimeSynchronizationInfo ::= SEQUENCE { + stratumLevel StratumLevel, + synchronizationStatus SynchronizationStatus, + iE-Extensions ProtocolExtensionContainer { { TimeSynchronizationInfo-ExtIEs} } OPTIONAL, + ... +} + +TimeSynchronizationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { + ... +} + S-TMSI ::= SEQUENCE { mMEC MME-Code, m-TMSI M-TMSI, @@ -1051,7 +1070,7 @@ TAI-Broadcast ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Broadcast-Item TAI-Broadcast-Item ::= SEQUENCE { tAI TAI, completedCellinTAI CompletedCellinTAI, - iE-Extensions ProtocolExtensionContainer { {TAI-Broadcast-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TAI-Broadcast-Item-ExtIEs} } OPTIONAL, ... } @@ -1064,7 +1083,7 @@ TAI-Cancelled ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Cancelled-Item TAI-Cancelled-Item ::= SEQUENCE { tAI TAI, cancelledCellinTAI CancelledCellinTAI, - iE-Extensions ProtocolExtensionContainer { {TAI-Cancelled-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TAI-Cancelled-Item-ExtIEs} } OPTIONAL, ... } @@ -1089,7 +1108,7 @@ TBCD-STRING ::= OCTET STRING (SIZE (3)) TargetID ::= CHOICE { targeteNB-ID TargeteNB-ID, targetRNC-ID TargetRNC-ID, - cGI CGI, + cGI CGI, ... } @@ -1109,7 +1128,7 @@ TargetRNC-ID ::= SEQUENCE { rAC RAC OPTIONAL, rNC-ID RNC-ID, extendedRNC-ID ExtendedRNC-ID OPTIONAL, - iE-Extensions ProtocolExtensionContainer { {TargetRNC-ID-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TargetRNC-ID-ExtIEs} } OPTIONAL, ... } @@ -1120,7 +1139,7 @@ TargetRNC-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { TargeteNB-ToSourceeNB-TransparentContainer ::= SEQUENCE { - rRC-Container RRC-Container, + rRC-Container RRC-Container, iE-Extensions ProtocolExtensionContainer { {TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs} } OPTIONAL, ... } @@ -1141,7 +1160,7 @@ TransportLayerAddress ::= BIT STRING (SIZE(1..160, ...)) TraceActivation ::= SEQUENCE { e-UTRAN-Trace-ID E-UTRAN-Trace-ID, - interfacesToTrace InterfacesToTrace, + interfacesToTrace InterfacesToTrace, traceDepth TraceDepth, traceCollectionEntityIPAddress TransportLayerAddress, iE-Extensions ProtocolExtensionContainer { { TraceActivation-ExtIEs} } OPTIONAL, @@ -1228,8 +1247,8 @@ UERadioCapability ::= OCTET STRING UESecurityCapabilities ::= SEQUENCE { encryptionAlgorithms EncryptionAlgorithms, - integrityProtectionAlgorithms IntegrityProtectionAlgorithms, - iE-Extensions ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} } OPTIONAL, + integrityProtectionAlgorithms IntegrityProtectionAlgorithms, + iE-Extensions ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} } OPTIONAL, ... } @@ -1273,6 +1292,3 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { -- Z END - - - diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn index f78c5ec5d8..3876538c4b 100644 --- a/asn1/s1ap/S1AP-PDU-Contents.asn +++ b/asn1/s1ap/S1AP-PDU-Contents.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.3 PDU Definitions -- ************************************************************** -- @@ -459,6 +459,7 @@ HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= { { ID id-E-RABAdmittedList CRITICALITY ignore TYPE E-RABAdmittedList PRESENCE mandatory } | { ID id-E-RABFailedToSetupListHOReqAck CRITICALITY ignore TYPE E-RABFailedtoSetupListHOReqAck PRESENCE optional } | { ID id-Target-ToSource-TransparentContainer CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE mandatory }| + { ID id-CSG-Id CRITICALITY ignore TYPE CSG-Id PRESENCE optional } | { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, ... } @@ -1795,7 +1796,7 @@ TraceFailureIndication ::= SEQUENCE { TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory} | { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} | - { ID id-E-UTRAN-Trace-ID CRITICALITY ignore TYPE E-UTRAN-Trace-ID PRESENCE mandatory} | + { ID id-E-UTRAN-Trace-ID CRITICALITY ignore TYPE E-UTRAN-Trace-ID PRESENCE mandatory} | { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} , ... } @@ -1906,7 +1907,7 @@ LocationReport ::= SEQUENCE { LocationReportIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory} | { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} | - { ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory} | + { ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory} | { ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory} | { ID id-RequestType CRITICALITY ignore TYPE RequestType PRESENCE mandatory} , ... @@ -1967,7 +1968,7 @@ WriteReplaceWarningRequest ::= SEQUENCE { WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| - { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| + { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| { ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional }| { ID id-RepetitionPeriod CRITICALITY reject TYPE RepetitionPeriod PRESENCE mandatory }| { ID id-ExtendedRepetitionPeriod CRITICALITY reject TYPE ExtendedRepetitionPeriod PRESENCE optional }| @@ -1991,10 +1992,10 @@ WriteReplaceWarningResponse ::= SEQUENCE { } WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= { - { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| - { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| - { ID id-BroadcastCompletedAreaList CRITICALITY ignore TYPE BroadcastCompletedAreaList PRESENCE optional }| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| + { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| + { ID id-BroadcastCompletedAreaList CRITICALITY ignore TYPE BroadcastCompletedAreaList PRESENCE optional }| + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, ... } @@ -2124,9 +2125,9 @@ KillRequest ::= SEQUENCE { } KillRequestIEs S1AP-PROTOCOL-IES ::= { - { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| - { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| - { ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional }, + { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| + { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| + { ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional }, ... } @@ -2142,10 +2143,10 @@ KillResponse ::= SEQUENCE { } KillResponseIEs S1AP-PROTOCOL-IES ::= { - { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| - { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| + { ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }| + { ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }| { ID id-BroadcastCancelledAreaList CRITICALITY ignore TYPE BroadcastCancelledAreaList PRESENCE mandatory }| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, ... } @@ -2167,10 +2168,10 @@ DownlinkUEAssociatedLPPaTransport ::= SEQUENCE { } DownlinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= { - { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory} | - { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} | - { ID id-Routing-ID CRITICALITY reject TYPE Routing-ID PRESENCE mandatory} | - { ID id-LPPa-PDU CRITICALITY reject TYPE LPPa-PDU PRESENCE mandatory} , + { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory } | + { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory } | + { ID id-Routing-ID CRITICALITY reject TYPE Routing-ID PRESENCE mandatory } | + { ID id-LPPa-PDU CRITICALITY reject TYPE LPPa-PDU PRESENCE mandatory } , ... } @@ -2188,7 +2189,7 @@ UplinkUEAssociatedLPPaTransport ::= SEQUENCE { UplinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory} | { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} | - { ID id-Routing-ID CRITICALITY reject TYPE Routing-ID PRESENCE mandatory} | + { ID id-Routing-ID CRITICALITY reject TYPE Routing-ID PRESENCE mandatory} | { ID id-LPPa-PDU CRITICALITY reject TYPE LPPa-PDU PRESENCE mandatory} , ... } @@ -2228,5 +2229,3 @@ UplinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= { } END - - diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn index 9258903d0d..615f7b079d 100644 --- a/asn1/s1ap/S1AP-PDU-Descriptions.asn +++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V9.1.0 (2009-12) +-- 3GPP TS 36.413 V9.2.0 (2010-03) -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** -- @@ -592,5 +592,3 @@ uplinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= { } END - - diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 8af8ff04dd..ecc87eaf7c 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -1,6 +1,6 @@ /* packet-s1ap.c * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection - * Copyright 2007-2009, Anders Broman <anders.broman@ericsson.com> + * Copyright 2007-2010, Anders Broman <anders.broman@ericsson.com> * * $Id$ * @@ -24,7 +24,7 @@ * * Based on the RANAP dissector * - * References: 3GPP TS 36.413 V8.5.0 (2009-03) + * References: 3GPP TS 36.413 V9.2.0 (2010-03) */ #ifdef HAVE_CONFIG_H diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index 2788a7d1aa..f62409681f 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -601,6 +601,7 @@ id-CellAccessMode ProtocolIE-ID id-CSGMembershipStatus ProtocolIE-ID id-LPPa-PDU ProtocolIE-ID id-Routing-ID ProtocolIE-ID +id-Time-Synchronization-Info ProtocolIE-ID #.END #.REGISTER_NEW @@ -742,6 +743,7 @@ Routing-ID N s1ap.ies id-Routing-ID #RAB-Parameters N s1ap.extension id-AlternativeRABConfiguration #Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N s1ap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf Data-Forwarding-Not-Possible N s1ap.extension id-Data-Forwarding-Not-Possible +TimeSynchronizationInfo N s1ap.extension id-Time-Synchronization-Info #S1AP-ELEMENTARY-PROCEDURE HandoverRequired N s1ap.proc.imsg id-HandoverPreparation |