summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/ranap/RANAP-CommonDataTypes.asn3
-rw-r--r--asn1/ranap/RANAP-Constants.asn27
-rw-r--r--asn1/ranap/RANAP-Containers.asn2
-rw-r--r--asn1/ranap/RANAP-IEs.asn40
-rw-r--r--asn1/ranap/RANAP-PDU-Contents.asn48
-rw-r--r--asn1/ranap/RANAP-PDU-Descriptions.asn3
-rw-r--r--asn1/ranap/packet-ranap-template.c2
-rw-r--r--asn1/ranap/ranap.cnf8
-rw-r--r--epan/dissectors/packet-ranap.c203
9 files changed, 185 insertions, 151 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
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index c29b029e52..2809c4ebe2 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -30,7 +30,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
@@ -103,7 +103,7 @@
#define maxNrOfCSGs 256
#define maxNrOfEUTRAFreqs 8
#define maxNrOfCellIds 32
-#define maxNrOfRACs 8
+#define maxNrOfRAIs 8
#define maxNrOfLAIs 8
typedef enum _ProcedureCode_enum {
@@ -115,7 +115,6 @@ typedef enum _ProcedureCode_enum {
id_SRNS_ContextTransfer = 5,
id_SecurityModeControl = 6,
id_DataVolumeReport = 7,
- id_Not_Used_8 = 8,
id_Reset = 9,
id_RAB_ReleaseRequest = 10,
id_Iu_ReleaseRequest = 11,
@@ -158,8 +157,6 @@ typedef enum _ProcedureCode_enum {
typedef enum _ProtocolIE_ID_enum {
id_AreaIdentity = 0,
- id_Not_Used_1 = 1,
- id_Not_Used_2 = 2,
id_CN_DomainIndicator = 3,
id_Cause = 4,
id_ChosenEncryptionAlgorithm = 5,
@@ -230,8 +227,6 @@ typedef enum _ProtocolIE_ID_enum {
id_UL_GTP_PDU_SequenceNumber = 70,
id_RAB_FailedtoReportItem = 71,
id_RAB_FailedtoReportList = 72,
- id_Not_Used_73 = 73,
- id_Not_Used_74 = 74,
id_KeyStatus = 75,
id_DRX_CycleLengthCoefficient = 76,
id_IuSigConIdList = 77,
@@ -258,8 +253,6 @@ typedef enum _ProtocolIE_ID_enum {
id_SRB_TrCH_Mapping = 98,
id_InterSystemInformation_TransparentContainer = 99,
id_NewBSS_To_OldBSS_Information = 100,
- id_Not_Used_101 = 101,
- id_Not_Used_102 = 102,
id_SourceRNC_PDCP_context_info = 103,
id_InformationTransferID = 104,
id_SNA_Access_Information = 105,
@@ -389,7 +382,6 @@ typedef enum _ProtocolIE_ID_enum {
id_CSG_Id_List = 229,
id_PSRABtobeReplaced = 230,
id_E_UTRAN_Service_Handover = 231,
- id_Not_Used_232 = 232,
id_UE_AggregateMaximumBitRate = 233,
id_CSG_Membership_Status = 234,
id_Cell_Access_Mode = 235,
@@ -403,10 +395,12 @@ typedef enum _ProtocolIE_ID_enum {
id_IRAT_Measurement_Configuration = 243,
id_MDT_Configuration = 244,
id_Priority_Class_Indicator = 245,
- id_Not_Used_246 = 246,
id_RNSAPRelocationParameters = 247,
id_RABParametersList = 248,
- id_Management_Based_MDT_Allowed = 249
+ id_Management_Based_MDT_Allowed = 249,
+ id_HigherBitratesThan16MbpsFlag = 250,
+ id_Trace_Collection_Entity_IP_Addess = 251,
+ id_End_Of_CSFB = 252
} ProtocolIE_ID_enum;
/*--- End of included file: packet-ranap-val.h ---*/
@@ -462,6 +456,7 @@ static int hf_ranap_DRX_CycleLengthCoefficient_PDU = -1; /* DRX_CycleLengthCoef
static int hf_ranap_E_DCH_MAC_d_Flow_ID_PDU = -1; /* E_DCH_MAC_d_Flow_ID */
static int hf_ranap_EncryptionInformation_PDU = -1; /* EncryptionInformation */
static int hf_ranap_EncryptionKey_PDU = -1; /* EncryptionKey */
+static int hf_ranap_End_Of_CSFB_PDU = -1; /* End_Of_CSFB */
static int hf_ranap_E_UTRAN_Service_Handover_PDU = -1; /* E_UTRAN_Service_Handover */
static int hf_ranap_ExtendedRNC_ID_PDU = -1; /* ExtendedRNC_ID */
static int hf_ranap_FrequenceLayerConvergenceFlag_PDU = -1; /* FrequenceLayerConvergenceFlag */
@@ -470,6 +465,7 @@ static int hf_ranap_GERAN_BSC_Container_PDU = -1; /* GERAN_BSC_Container */
static int hf_ranap_GERAN_Classmark_PDU = -1; /* GERAN_Classmark */
static int hf_ranap_GlobalCN_ID_PDU = -1; /* GlobalCN_ID */
static int hf_ranap_GlobalRNC_ID_PDU = -1; /* GlobalRNC_ID */
+static int hf_ranap_HigherBitratesThan16MbpsFlag_PDU = -1; /* HigherBitratesThan16MbpsFlag */
static int hf_ranap_HS_DSCH_MAC_d_Flow_ID_PDU = -1; /* HS_DSCH_MAC_d_Flow_ID */
static int hf_ranap_IncludeVelocity_PDU = -1; /* IncludeVelocity */
static int hf_ranap_InformationExchangeID_PDU = -1; /* InformationExchangeID */
@@ -912,8 +908,7 @@ static int hf_ranap_MBMSIPMulticastAddressandAPNRequest_item = -1; /* TMGI */
static int hf_ranap_cellbased = -1; /* CellBased */
static int hf_ranap_labased = -1; /* LABased */
static int hf_ranap_rabased = -1; /* RABased */
-static int hf_ranap_plmn_area_based = -1; /* PLMNAreaBased */
-static int hf_ranap_mdtRecordingSessionReference = -1; /* TraceRecordingSessionReference */
+static int hf_ranap_plmn_area_based = -1; /* NULL */
static int hf_ranap_mdtActivation = -1; /* MDT_Activation */
static int hf_ranap_mdtAreaScope = -1; /* MDTAreaScope */
static int hf_ranap_mdtMode = -1; /* MDTMode */
@@ -935,15 +930,14 @@ static int hf_ranap_laiList = -1; /* LAI_List */
static int hf_ranap_LAI_List_item = -1; /* LAI */
static int hf_ranap_loggingInterval = -1; /* LoggingInterval */
static int hf_ranap_loggingDuration = -1; /* LoggingDuration */
-static int hf_ranap_plmnID = -1; /* PLMNidentity */
static int hf_ranap_PLMNs_in_shared_network_item = -1; /* PLMNs_in_shared_network_item */
static int hf_ranap_lA_LIST = -1; /* LA_LIST */
static int hf_ranap_PositioningDataSet_item = -1; /* PositioningMethodAndUsage */
static int hf_ranap_positioningDataDiscriminator = -1; /* PositioningDataDiscriminator */
static int hf_ranap_positioningDataSet = -1; /* PositioningDataSet */
static int hf_ranap_shared_network_information = -1; /* Shared_Network_Information */
-static int hf_ranap_racList = -1; /* RAC_List */
-static int hf_ranap_RAC_List_item = -1; /* RAC */
+static int hf_ranap_raiList = -1; /* RAI_List */
+static int hf_ranap_RAI_List_item = -1; /* RAI */
static int hf_ranap_RABDataVolumeReport_item = -1; /* RABDataVolumeReport_item */
static int hf_ranap_dl_UnsuccessfullyTransmittedDataVolume = -1; /* UnsuccessfullyTransmittedDataVolume */
static int hf_ranap_dataVolumeReference = -1; /* DataVolumeReference */
@@ -1270,14 +1264,13 @@ static gint ett_ranap_PermittedIntegrityProtectionAlgorithms = -1;
static gint ett_ranap_LABased = -1;
static gint ett_ranap_LAI_List = -1;
static gint ett_ranap_LoggedMDT = -1;
-static gint ett_ranap_PLMNAreaBased = -1;
static gint ett_ranap_PLMNs_in_shared_network = -1;
static gint ett_ranap_PLMNs_in_shared_network_item = -1;
static gint ett_ranap_PositioningDataSet = -1;
static gint ett_ranap_PositionData = -1;
static gint ett_ranap_ProvidedData = -1;
static gint ett_ranap_RABased = -1;
-static gint ett_ranap_RAC_List = -1;
+static gint ett_ranap_RAI_List = -1;
static gint ett_ranap_RABDataVolumeReport = -1;
static gint ett_ranap_RABDataVolumeReport_item = -1;
static gint ett_ranap_RAB_Parameter_ExtendedGuaranteedBitrateList = -1;
@@ -1614,7 +1607,6 @@ static const value_string ranap_ProcedureCode_vals[] = {
{ id_SRNS_ContextTransfer, "id-SRNS-ContextTransfer" },
{ id_SecurityModeControl, "id-SecurityModeControl" },
{ id_DataVolumeReport, "id-DataVolumeReport" },
- { id_Not_Used_8, "id-Not-Used-8" },
{ id_Reset, "id-Reset" },
{ id_RAB_ReleaseRequest, "id-RAB-ReleaseRequest" },
{ id_Iu_ReleaseRequest, "id-Iu-ReleaseRequest" },
@@ -1685,8 +1677,6 @@ dissect_ranap_ProtocolExtensionID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_AreaIdentity, "id-AreaIdentity" },
- { id_Not_Used_1, "id-Not-Used-1" },
- { id_Not_Used_2, "id-Not-Used-2" },
{ id_CN_DomainIndicator, "id-CN-DomainIndicator" },
{ id_Cause, "id-Cause" },
{ id_ChosenEncryptionAlgorithm, "id-ChosenEncryptionAlgorithm" },
@@ -1757,8 +1747,6 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_UL_GTP_PDU_SequenceNumber, "id-UL-GTP-PDU-SequenceNumber" },
{ id_RAB_FailedtoReportItem, "id-RAB-FailedtoReportItem" },
{ id_RAB_FailedtoReportList, "id-RAB-FailedtoReportList" },
- { id_Not_Used_73, "id-Not-Used-73" },
- { id_Not_Used_74, "id-Not-Used-74" },
{ id_KeyStatus, "id-KeyStatus" },
{ id_DRX_CycleLengthCoefficient, "id-DRX-CycleLengthCoefficient" },
{ id_IuSigConIdList, "id-IuSigConIdList" },
@@ -1785,8 +1773,6 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_SRB_TrCH_Mapping, "id-SRB-TrCH-Mapping" },
{ id_InterSystemInformation_TransparentContainer, "id-InterSystemInformation-TransparentContainer" },
{ id_NewBSS_To_OldBSS_Information, "id-NewBSS-To-OldBSS-Information" },
- { id_Not_Used_101, "id-Not-Used-101" },
- { id_Not_Used_102, "id-Not-Used-102" },
{ id_SourceRNC_PDCP_context_info, "id-SourceRNC-PDCP-context-info" },
{ id_InformationTransferID, "id-InformationTransferID" },
{ id_SNA_Access_Information, "id-SNA-Access-Information" },
@@ -1916,7 +1902,6 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_CSG_Id_List, "id-CSG-Id-List" },
{ id_PSRABtobeReplaced, "id-PSRABtobeReplaced" },
{ id_E_UTRAN_Service_Handover, "id-E-UTRAN-Service-Handover" },
- { id_Not_Used_232, "id-Not-Used-232" },
{ id_UE_AggregateMaximumBitRate, "id-UE-AggregateMaximumBitRate" },
{ id_CSG_Membership_Status, "id-CSG-Membership-Status" },
{ id_Cell_Access_Mode, "id-Cell-Access-Mode" },
@@ -1930,10 +1915,12 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_IRAT_Measurement_Configuration, "id-IRAT-Measurement-Configuration" },
{ id_MDT_Configuration, "id-MDT-Configuration" },
{ id_Priority_Class_Indicator, "id-Priority-Class-Indicator" },
- { id_Not_Used_246, "id-Not-Used-246" },
{ id_RNSAPRelocationParameters, "id-RNSAPRelocationParameters" },
{ id_RABParametersList, "id-RABParametersList" },
{ id_Management_Based_MDT_Allowed, "id-Management-Based-MDT-Allowed" },
+ { id_HigherBitratesThan16MbpsFlag, "id-HigherBitratesThan16MbpsFlag" },
+ { id_Trace_Collection_Entity_IP_Addess, "id-Trace-Collection-Entity-IP-Addess" },
+ { id_End_Of_CSFB, "id-End-Of-CSFB" },
{ 0, NULL }
};
@@ -4189,6 +4176,21 @@ dissect_ranap_EncryptionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
+static const value_string ranap_End_Of_CSFB_vals[] = {
+ { 0, "end-of-CSFB" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_ranap_End_Of_CSFB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static int
dissect_ranap_IMEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -4581,6 +4583,22 @@ dissect_ranap_GTP_TEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
}
+static const value_string ranap_HigherBitratesThan16MbpsFlag_vals[] = {
+ { 0, "allowed" },
+ { 1, "not-allowed" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_ranap_HigherBitratesThan16MbpsFlag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static int
dissect_ranap_HS_DSCH_MAC_d_Flow_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -5807,22 +5825,38 @@ dissect_ranap_LABased(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
}
-static const per_sequence_t RAC_List_sequence_of[1] = {
- { &hf_ranap_RAC_List_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ranap_RAC },
+static const per_sequence_t RAI_sequence[] = {
+ { &hf_ranap_lAI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_LAI },
+ { &hf_ranap_rAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_RAC },
+ { &hf_ranap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ranap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
};
static int
-dissect_ranap_RAC_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ranap_RAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_ranap_RAI, RAI_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t RAI_List_sequence_of[1] = {
+ { &hf_ranap_RAI_List_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ranap_RAI },
+};
+
+static int
+dissect_ranap_RAI_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
- ett_ranap_RAC_List, RAC_List_sequence_of,
- 1, maxNrOfRACs, FALSE);
+ ett_ranap_RAI_List, RAI_List_sequence_of,
+ 1, maxNrOfRAIs, FALSE);
return offset;
}
static const per_sequence_t RABased_sequence[] = {
- { &hf_ranap_racList , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_RAC_List },
+ { &hf_ranap_raiList , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_RAI_List },
{ &hf_ranap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ranap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -5836,16 +5870,10 @@ dissect_ranap_RABased(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
}
-static const per_sequence_t PLMNAreaBased_sequence[] = {
- { &hf_ranap_plmnID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_PLMNidentity },
- { &hf_ranap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ranap_ProtocolExtensionContainer },
- { NULL, 0, 0, NULL }
-};
static int
-dissect_ranap_PLMNAreaBased(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_ranap_PLMNAreaBased, PLMNAreaBased_sequence);
+dissect_ranap_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_null(tvb, offset, actx, tree, hf_index);
return offset;
}
@@ -5863,7 +5891,7 @@ static const per_choice_t MDTAreaScope_choice[] = {
{ 0, &hf_ranap_cellbased , ASN1_EXTENSION_ROOT , dissect_ranap_CellBased },
{ 1, &hf_ranap_labased , ASN1_EXTENSION_ROOT , dissect_ranap_LABased },
{ 2, &hf_ranap_rabased , ASN1_EXTENSION_ROOT , dissect_ranap_RABased },
- { 3, &hf_ranap_plmn_area_based, ASN1_EXTENSION_ROOT , dissect_ranap_PLMNAreaBased },
+ { 3, &hf_ranap_plmn_area_based, ASN1_EXTENSION_ROOT , dissect_ranap_NULL },
{ 0, NULL, 0, NULL }
};
@@ -5877,16 +5905,6 @@ dissect_ranap_MDTAreaScope(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
}
-
-static int
-dissect_ranap_TraceRecordingSessionReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
- 0U, 65535U, NULL, FALSE);
-
- return offset;
-}
-
-
static const value_string ranap_LoggingInterval_vals[] = {
{ 0, "s1d28" },
{ 1, "s2d56" },
@@ -5968,7 +5986,6 @@ dissect_ranap_MDTMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
static const per_sequence_t MDT_Configuration_sequence[] = {
- { &hf_ranap_mdtRecordingSessionReference, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_TraceRecordingSessionReference },
{ &hf_ranap_mdtActivation , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_MDT_Activation },
{ &hf_ranap_mdtAreaScope , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_MDTAreaScope },
{ &hf_ranap_mdtMode , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_MDTMode },
@@ -6149,22 +6166,6 @@ dissect_ranap_OMC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
}
-static const per_sequence_t RAI_sequence[] = {
- { &hf_ranap_lAI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_LAI },
- { &hf_ranap_rAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ranap_RAC },
- { &hf_ranap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ranap_ProtocolExtensionContainer },
- { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_ranap_RAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_ranap_RAI, RAI_sequence);
-
- return offset;
-}
-
-
static const value_string ranap_PagingAreaID_vals[] = {
{ 0, "lAI" },
{ 1, "rAI" },
@@ -7225,6 +7226,16 @@ dissect_ranap_UE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
+
+static int
+dissect_ranap_TraceRecordingSessionReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 65535U, NULL, FALSE);
+
+ return offset;
+}
+
+
static const value_string ranap_TraceDepth_vals[] = {
{ 0, "minimum" },
{ 1, "medium" },
@@ -10887,6 +10898,14 @@ static int dissect_EncryptionKey_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_End_Of_CSFB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_ranap_End_Of_CSFB(tvb, offset, &asn1_ctx, tree, hf_ranap_End_Of_CSFB_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_E_UTRAN_Service_Handover_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -10951,6 +10970,14 @@ static int dissect_GlobalRNC_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_HigherBitratesThan16MbpsFlag_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_ranap_HigherBitratesThan16MbpsFlag(tvb, offset, &asn1_ctx, tree, hf_ranap_HigherBitratesThan16MbpsFlag_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_HS_DSCH_MAC_d_Flow_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13340,6 +13367,10 @@ void proto_register_ranap(void) {
{ "EncryptionKey", "ranap.EncryptionKey",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_ranap_End_Of_CSFB_PDU,
+ { "End-Of-CSFB", "ranap.End_Of_CSFB",
+ FT_UINT32, BASE_DEC, VALS(ranap_End_Of_CSFB_vals), 0,
+ NULL, HFILL }},
{ &hf_ranap_E_UTRAN_Service_Handover_PDU,
{ "E-UTRAN-Service-Handover", "ranap.E_UTRAN_Service_Handover",
FT_UINT32, BASE_DEC, VALS(ranap_E_UTRAN_Service_Handover_vals), 0,
@@ -13372,6 +13403,10 @@ void proto_register_ranap(void) {
{ "GlobalRNC-ID", "ranap.GlobalRNC_ID",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_ranap_HigherBitratesThan16MbpsFlag_PDU,
+ { "HigherBitratesThan16MbpsFlag", "ranap.HigherBitratesThan16MbpsFlag",
+ FT_UINT32, BASE_DEC, VALS(ranap_HigherBitratesThan16MbpsFlag_vals), 0,
+ NULL, HFILL }},
{ &hf_ranap_HS_DSCH_MAC_d_Flow_ID_PDU,
{ "HS-DSCH-MAC-d-Flow-ID", "ranap.HS_DSCH_MAC_d_Flow_ID",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -15143,11 +15178,7 @@ void proto_register_ranap(void) {
{ &hf_ranap_plmn_area_based,
{ "plmn-area-based", "ranap.plmn_area_based",
FT_NONE, BASE_NONE, NULL, 0,
- "PLMNAreaBased", HFILL }},
- { &hf_ranap_mdtRecordingSessionReference,
- { "mdtRecordingSessionReference", "ranap.mdtRecordingSessionReference",
- FT_UINT32, BASE_DEC, NULL, 0,
- "TraceRecordingSessionReference", HFILL }},
+ NULL, HFILL }},
{ &hf_ranap_mdtActivation,
{ "mdtActivation", "ranap.mdtActivation",
FT_UINT32, BASE_DEC, VALS(ranap_MDT_Activation_vals), 0,
@@ -15232,10 +15263,6 @@ void proto_register_ranap(void) {
{ "loggingDuration", "ranap.loggingDuration",
FT_UINT32, BASE_DEC, VALS(ranap_LoggingDuration_vals), 0,
NULL, HFILL }},
- { &hf_ranap_plmnID,
- { "plmnID", "ranap.plmnID",
- FT_BYTES, BASE_NONE, NULL, 0,
- "PLMNidentity", HFILL }},
{ &hf_ranap_PLMNs_in_shared_network_item,
{ "PLMNs-in-shared-network item", "ranap.PLMNs_in_shared_network_item",
FT_NONE, BASE_NONE, NULL, 0,
@@ -15260,13 +15287,13 @@ void proto_register_ranap(void) {
{ "shared-network-information", "ranap.shared_network_information",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_ranap_racList,
- { "racList", "ranap.racList",
+ { &hf_ranap_raiList,
+ { "raiList", "ranap.raiList",
FT_UINT32, BASE_DEC, NULL, 0,
- "RAC_List", HFILL }},
- { &hf_ranap_RAC_List_item,
- { "RAC", "ranap.RAC",
- FT_BYTES, BASE_NONE, NULL, 0,
+ "RAI_List", HFILL }},
+ { &hf_ranap_RAI_List_item,
+ { "RAI", "ranap.RAI",
+ FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_ranap_RABDataVolumeReport_item,
{ "RABDataVolumeReport item", "ranap.RABDataVolumeReport_item",
@@ -16195,14 +16222,13 @@ void proto_register_ranap(void) {
&ett_ranap_LABased,
&ett_ranap_LAI_List,
&ett_ranap_LoggedMDT,
- &ett_ranap_PLMNAreaBased,
&ett_ranap_PLMNs_in_shared_network,
&ett_ranap_PLMNs_in_shared_network_item,
&ett_ranap_PositioningDataSet,
&ett_ranap_PositionData,
&ett_ranap_ProvidedData,
&ett_ranap_RABased,
- &ett_ranap_RAC_List,
+ &ett_ranap_RAI_List,
&ett_ranap_RABDataVolumeReport,
&ett_ranap_RABDataVolumeReport_item,
&ett_ranap_RAB_Parameter_ExtendedGuaranteedBitrateList,
@@ -16701,6 +16727,9 @@ proto_reg_handoff_ranap(void)
dissector_add_uint("ranap.extension", id_RNSAPRelocationParameters, new_create_dissector_handle(dissect_RNSAPRelocationParameters_PDU, proto_ranap));
dissector_add_uint("ranap.extension", id_RABParametersList, new_create_dissector_handle(dissect_RABParametersList_PDU, proto_ranap));
dissector_add_uint("ranap.extension", id_Management_Based_MDT_Allowed, new_create_dissector_handle(dissect_Management_Based_MDT_Allowed_PDU, proto_ranap));
+ dissector_add_uint("ranap.extension", id_HigherBitratesThan16MbpsFlag, new_create_dissector_handle(dissect_HigherBitratesThan16MbpsFlag_PDU, proto_ranap));
+ dissector_add_uint("ranap.extension", id_Trace_Collection_Entity_IP_Addess, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_ranap));
+ dissector_add_uint("ranap.extension", id_End_Of_CSFB, new_create_dissector_handle(dissect_End_Of_CSFB_PDU, proto_ranap));
dissector_add_uint("ranap.proc.imsg", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseCommand_PDU, proto_ranap));
dissector_add_uint("ranap.proc.sout", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseComplete_PDU, proto_ranap));
dissector_add_uint("ranap.proc.imsg", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationRequired_PDU, proto_ranap));
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 14:19:57 +0000