diff options
-rw-r--r-- | asn1/ranap/RANAP-CommonDataTypes.asn | 5 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Constants.asn | 13 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Containers.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/RANAP-IEs.asn | 12 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Contents.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Descriptions.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/ranap.cnf | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ranap.c | 1 |
8 files changed, 22 insertions, 17 deletions
diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn index 14271c52bf..52fc2f4eab 100644 --- a/asn1/ranap/RANAP-CommonDataTypes.asn +++ b/asn1/ranap/RANAP-CommonDataTypes.asn @@ -1,6 +1,6 @@ -- RANAP-CommonDataTypes.asn -- --- 3GPP TS 25.413 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.5 Common Definitions @@ -40,6 +40,3 @@ 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 882e15041a..e75fe47299 100644 --- a/asn1/ranap/RANAP-Constants.asn +++ b/asn1/ranap/RANAP-Constants.asn @@ -1,6 +1,6 @@ -- RANAP-Constants.asn -- --- 3GPP TS 25.413 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.6 Constant Definitions @@ -35,7 +35,9 @@ 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 @@ -128,9 +130,10 @@ maxNrOfCSGs INTEGER ::= 256 -- ************************************************************** id-AreaIdentity INTEGER ::= 0 --- Ws Extension +-- 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 @@ -201,9 +204,10 @@ id-UE-ID INTEGER ::= 69 id-UL-GTP-PDU-SequenceNumber INTEGER ::= 70 id-RAB-FailedtoReportItem INTEGER ::= 71 id-RAB-FailedtoReportList INTEGER ::= 72 --- Ws Extension +-- 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 @@ -233,6 +237,7 @@ 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 @@ -364,6 +369,7 @@ 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 @@ -373,3 +379,4 @@ id-PDP-TypeInformation-extension INTEGER ::= 238 END + diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn index 68b47b606d..09ff24a370 100644 --- a/asn1/ranap/RANAP-Containers.asn +++ b/asn1/ranap/RANAP-Containers.asn @@ -1,6 +1,6 @@ -- RANAP-Containers.asn -- --- 3GPP TS 25.413 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- 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 456e41ae93..a6db347ccd 100644 --- a/asn1/ranap/RANAP-IEs.asn +++ b/asn1/ranap/RANAP-IEs.asn @@ -1,6 +1,6 @@ -- RANAP-IEs.asn -- --- 3GPP TS 25.413 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.4 Information Element Definitions @@ -828,7 +828,7 @@ GA-UncertaintyEllipse ::= SEQUENCE { } GERAN-BSC-Container ::= OCTET STRING - -- GERAN BSC Container as defined in [11] -- + -- GERAN BSC Container as defined in TS 48.008 [11] -- GERAN-Cell-ID ::= SEQUENCE { @@ -843,7 +843,7 @@ GERAN-Cell-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { } GERAN-Classmark ::= OCTET STRING - -- GERAN Classmark as defined in [11] -- + -- GERAN Classmark as defined in TS 48.008 [11] -- GlobalCN-ID ::= SEQUENCE { pLMNidentity PLMNidentity, @@ -1156,7 +1156,7 @@ NumberOfSteps ::= INTEGER (1..16) OldBSS-ToNewBSS-Information ::= OCTET STRING OMC-ID ::= OCTET STRING (SIZE (3..22)) --- Reference: GSM [25] +-- Reference: GSM TS 12.20 [25] -- P @@ -1679,7 +1679,7 @@ Source-ToTarget-TransparentContainer ::= OCTET STRING -- This IE is a transparent container, the IE shall be encoded not as an OCTET STRING but according to the type specifications of the target system. -- Note: In the current version of this specification, this IE may either carry the Source RNC to -- Target RNC Transparent Container or the Source eNB to Target eNB Transparent Container IE as --- defined in [49] +-- defined in TS 36.413 [49] SourceeNodeB-ToTargeteNodeB-TransparentContainer ::= OCTET STRING @@ -1833,7 +1833,7 @@ Target-ToSource-TransparentContainer ::= OCTET STRING -- This IE is a transparent container, the IE shall be encoded not as an OCTET STRING but according to the type specifications of the target system. -- Note: In the current version of this specification, this IE may either carry the Target RNC to -- Source RNC Transparent Container or the Target eNB to Source eNB Transparent Container IE as --- defined in [49] +-- defined in TS 36.413 [49] TargeteNodeB-ToSourceeNodeB-TransparentContainer ::= OCTET STRING diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn index 3c9b1991af..f4bc1c05e9 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 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.3 PDU Definitions diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn index a064aa8e6e..e4dd9ad32c 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 V9.4.0 (2010-09) +-- 3GPP TS 25.413 V9.6.0 (2011-06) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.2 Elementary Procedure Definitions diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index aa75bd282a..e1b2493c79 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -881,7 +881,7 @@ UE-History-Information N ranap.extension id-UE-History-Information MBMSSynchronisationInformation N ranap.extension id-MBMSSynchronisationInformation SubscriberProfileIDforRFP N ranap.extension id-SubscriberProfileIDforRFP CSG-Id N ranap.extension id-CSG-Id -#N ranap.extension id-GlobalCN-IDPS +GlobalCN-ID N ranap.extension id-GlobalCN-IDPS #N ranap.extension id-SourceExtendedRNC-ID #N ranap.extension id-SourceRNC-ID SupportedRAB-ParameterBitrateList N ranap.extension id-Ass-RAB-Parameter-SupportedGuaranteedBitrateList diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 3560afe593..e641f72bb2 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -15229,6 +15229,7 @@ proto_reg_handoff_ranap(void) dissector_add_uint("ranap.extension", id_MBMSSynchronisationInformation, new_create_dissector_handle(dissect_MBMSSynchronisationInformation_PDU, proto_ranap)); dissector_add_uint("ranap.extension", id_SubscriberProfileIDforRFP, new_create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_ranap)); dissector_add_uint("ranap.extension", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_ranap)); + dissector_add_uint("ranap.extension", id_GlobalCN_IDPS, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap)); dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap)); dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap)); dissector_add_uint("ranap.extension", id_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap)); |