aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-11-17 11:48:17 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-11-17 11:48:17 +0000
commit477d5ae2451b23918c8c8ac21ec430830f385681 (patch)
tree3946be3213b19e79dcee49694df4760ef1daeef4
parent8da161e15aacae595b852824bd383f04d31c7b65 (diff)
- Update to 3GPP TS 25.413 V9.4.0 (2010-09).
- Fill the value_strings. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34925 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--asn1/ranap/RANAP-CommonDataTypes.asn3
-rw-r--r--asn1/ranap/RANAP-Constants.asn18
-rw-r--r--asn1/ranap/RANAP-Containers.asn2
-rw-r--r--asn1/ranap/RANAP-IEs.asn10
-rw-r--r--asn1/ranap/RANAP-PDU-Contents.asn24
-rw-r--r--asn1/ranap/RANAP-PDU-Descriptions.asn2
-rw-r--r--asn1/ranap/ranap.cnf14
-rw-r--r--epan/dissectors/packet-ranap.c76
8 files changed, 132 insertions, 17 deletions
diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index ffce4f9875..14271c52bf 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
--
-- 9.3.5 Common Definitions
@@ -42,3 +42,4 @@ TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuc
END
+
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn
index fa38197319..882e15041a 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
--
-- 9.3.6 Constant Definitions
@@ -35,6 +35,7 @@ id-RelocationCancel INTEGER ::= 4
id-SRNS-ContextTransfer INTEGER ::= 5
id-SecurityModeControl INTEGER ::= 6
id-DataVolumeReport INTEGER ::= 7
+id-Not-Used-8 INTEGER ::= 8
id-Reset INTEGER ::= 9
id-RAB-ReleaseRequest INTEGER ::= 10
id-Iu-ReleaseRequest INTEGER ::= 11
@@ -127,6 +128,9 @@ maxNrOfCSGs INTEGER ::= 256
-- **************************************************************
id-AreaIdentity INTEGER ::= 0
+-- Ws Extension
+id-Not-Used-1 INTEGER ::= 1
+id-Not-Used-2 INTEGER ::= 2
id-CN-DomainIndicator INTEGER ::= 3
id-Cause INTEGER ::= 4
id-ChosenEncryptionAlgorithm INTEGER ::= 5
@@ -197,6 +201,9 @@ 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
id-KeyStatus INTEGER ::= 75
id-DRX-CycleLengthCoefficient INTEGER ::= 76
id-IuSigConIdList INTEGER ::= 77
@@ -223,6 +230,9 @@ 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
id-SourceRNC-PDCP-context-info INTEGER ::= 103
id-InformationTransferID INTEGER ::= 104
id-SNA-Access-Information INTEGER ::= 105
@@ -352,10 +362,14 @@ 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
id-UE-AggregateMaximumBitRate INTEGER ::= 233
id-CSG-Membership-Status INTEGER ::= 234
id-Cell-Access-Mode INTEGER ::= 235
id-IP-Source-Address INTEGER ::= 236
-id-CSFB-Information INTEGER ::= 237
+id-CSFB-Information INTEGER ::= 237
+id-PDP-TypeInformation-extension INTEGER ::= 238
+
END
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index 2fb2b0b50c..68b47b606d 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- 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 0087f78e9e..456e41ae93 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
--
-- 9.3.4 Information Element Definitions
@@ -1187,6 +1187,13 @@ PDP-Type ::= ENUMERATED {
ipv6,
...
}
+PDP-TypeInformation-extension ::= SEQUENCE (SIZE (1..maxNrOfPDPDirections)) OF
+ PDP-Type-extension
+
+PDP-Type-extension ::= ENUMERATED {
+ ipv4-and-ipv6,
+ ...
+}
PeriodicLocationInfo ::= SEQUENCE {
reportingAmount INTEGER (1..8639999, ...),
@@ -2127,3 +2134,4 @@ VerticalSpeedDirection ::= ENUMERATED {
VerticalAccuracyCode ::= INTEGER (0..127)
END
+
diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn
index 3a9bcd191d..3c9b1991af 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
--
-- 9.3.3 PDU Definitions
@@ -102,7 +102,8 @@ IMPORTS
OldBSS-ToNewBSS-Information,
PagingAreaID,
PagingCause,
- PDP-TypeInformation,
+ PDP-TypeInformation,
+ PDP-TypeInformation-extension,
PermanentNAS-UE-ID,
PLMNidentity,
PositionData,
@@ -264,7 +265,8 @@ FROM RANAP-Containers
id-OldBSS-ToNewBSS-Information,
id-PagingAreaID,
id-PagingCause,
- id-PDP-TypeInformation,
+ id-PDP-TypeInformation,
+ id-PDP-TypeInformation-extension,
id-PermanentNAS-UE-ID,
id-PositionData,
id-PositionDataSpecificToGERANIuMode,
@@ -683,7 +685,9 @@ RAB-SetupItem-RelocReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 5 to enable GERAN support over Iu-cs --
{ ID id-GERAN-BSC-Container CRITICALITY ignore EXTENSION GERAN-BSC-Container PRESENCE optional }|
-- Extension for Release 8 to enable handover restriction to E-UTRAN --
- { ID id-E-UTRAN-Service-Handover CRITICALITY ignore EXTENSION E-UTRAN-Service-Handover PRESENCE optional },
+ { ID id-E-UTRAN-Service-Handover CRITICALITY ignore EXTENSION E-UTRAN-Service-Handover PRESENCE optional }|
+-- Extension for Release 9 to enable a new value --
+ { ID id-PDP-TypeInformation-extension CRITICALITY ignore EXTENSION PDP-TypeInformation-extension PRESENCE optional },
...
}
@@ -2115,7 +2119,9 @@ RAB-SetupOrModifyItemSecond-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 4 to enable RAB Quality of Service negotiation over Iu --
{ ID id-Alt-RAB-Parameters CRITICALITY ignore EXTENSION Alt-RAB-Parameters PRESENCE optional } |
-- Extension for Release 5 to enable GERAN support over Iu-cs --
- { ID id-GERAN-BSC-Container CRITICALITY ignore EXTENSION GERAN-BSC-Container PRESENCE optional } ,
+ { ID id-GERAN-BSC-Container CRITICALITY ignore EXTENSION GERAN-BSC-Container PRESENCE optional } |
+-- Extension for Release Release 9 to enable a new value --
+ { ID id-PDP-TypeInformation-extension CRITICALITY ignore EXTENSION PDP-TypeInformation-extension PRESENCE optional },
...
}
@@ -2388,7 +2394,9 @@ RAB-SetupItem-EnhRelocInfoReq ::= SEQUENCE {
RAB-SetupItem-EnhRelocInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 8 to enable handover restriction to E-UTRAN --
- { ID id-E-UTRAN-Service-Handover CRITICALITY ignore EXTENSION E-UTRAN-Service-Handover PRESENCE optional },
+ { ID id-E-UTRAN-Service-Handover CRITICALITY ignore EXTENSION E-UTRAN-Service-Handover PRESENCE optional }|
+-- Extension for Release Release 9 to enable a new value --
+ { ID id-PDP-TypeInformation-extension CRITICALITY ignore EXTENSION PDP-TypeInformation-extension PRESENCE optional },
...
}
@@ -2876,7 +2884,9 @@ MBMSSessionStartIEs RANAP-PROTOCOL-IES ::= {
MBMSSessionStartExtensions RANAP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 6 to enable MBMS counting in broadcast mode --
{ ID id-MBMSCountingInformation CRITICALITY ignore EXTENSION MBMSCountingInformation PRESENCE optional } |
- { ID id-MBMSSynchronisationInformation CRITICALITY ignore EXTENSION MBMSSynchronisationInformation PRESENCE optional },
+ { ID id-MBMSSynchronisationInformation CRITICALITY ignore EXTENSION MBMSSynchronisationInformation PRESENCE optional } |
+-- Extension for Release Release 9 to enable a new value --
+ { ID id-PDP-TypeInformation-extension CRITICALITY ignore EXTENSION PDP-TypeInformation-extension PRESENCE optional },
...
}
diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index 242c794b6a..a064aa8e6e 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.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
-- 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 8f836537c2..ff9d5b698d 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -364,6 +364,7 @@ id-RelocationCancel ProcedureCode
id-SRNS-ContextTransfer ProcedureCode
id-SecurityModeControl ProcedureCode
id-DataVolumeReport ProcedureCode
+id-Not-Used-8 ProcedureCode
id-Reset ProcedureCode
id-RAB-ReleaseRequest ProcedureCode
id-Iu-ReleaseRequest ProcedureCode
@@ -405,6 +406,8 @@ id-SRVCCPreparation ProcedureCode
# ProtocolIE-ID
id-AreaIdentity ProtocolIE-ID
+id-Not-Used-1 ProtocolIE-ID
+id-Not-Used-2 ProtocolIE-ID
id-CN-DomainIndicator ProtocolIE-ID
id-Cause ProtocolIE-ID
id-ChosenEncryptionAlgorithm ProtocolIE-ID
@@ -474,7 +477,9 @@ id-TriggerID ProtocolIE-ID
id-UE-ID ProtocolIE-ID
id-UL-GTP-PDU-SequenceNumber ProtocolIE-ID
id-RAB-FailedtoReportItem ProtocolIE-ID
-id-RAB-FailedtoReportList ProtocolIE-ID
+id-RAB-FailedtoReportList ProtocolIE-ID
+id-Not-Used-73 ProtocolIE-ID
+id-Not-Used-74 ProtocolIE-ID
id-KeyStatus ProtocolIE-ID
id-DRX-CycleLengthCoefficient ProtocolIE-ID
id-IuSigConIdList ProtocolIE-ID
@@ -501,6 +506,8 @@ id-LastKnownServiceArea ProtocolIE-ID
id-SRB-TrCH-Mapping ProtocolIE-ID
id-InterSystemInformation-TransparentContainer ProtocolIE-ID
id-NewBSS-To-OldBSS-Information ProtocolIE-ID
+id-Not-Used-101 ProtocolIE-ID
+id-Not-Used-102 ProtocolIE-ID
id-SourceRNC-PDCP-context-info ProtocolIE-ID
id-InformationTransferID ProtocolIE-ID
id-SNA-Access-Information ProtocolIE-ID
@@ -569,6 +576,7 @@ id-RAT-Type ProtocolIE-ID
id-PeriodicLocationInfo ProtocolIE-ID
id-MBMSCountingInformation ProtocolIE-ID
id-ExtendedRNC-ID ProtocolIE-ID
+id-170-not-to-be-used-for-IE-ids ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedMaxBitrateInf ProtocolIE-ID
id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
@@ -580,6 +588,7 @@ id-Requested-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-LAofIdleModeUEs ProtocolIE-ID
id-newLAListofIdleModeUEs ProtocolIE-ID
id-LAListwithNoIdleModeUEsAnyMore ProtocolIE-ID
+id-183-not-to-be-used-for-IE-ids ProtocolIE-ID
id-GANSS-PositioningDataSet ProtocolIE-ID
id-RequestedGANSSAssistanceData ProtocolIE-ID
id-BroadcastGANSSAssistanceDataDecipheringKeys ProtocolIE-ID
@@ -629,11 +638,13 @@ id-SRVCC-Operation-Possible ProtocolIE-ID
id-CSG-Id-List ProtocolIE-ID
id-PSRABtobeReplaced ProtocolIE-ID
id-E-UTRAN-Service-Handover ProtocolIE-ID
+id-Not-Used-232 ProtocolIE-ID
id-UE-AggregateMaximumBitRate ProtocolIE-ID
id-CSG-Membership-Status ProtocolIE-ID
id-Cell-Access-Mode ProtocolIE-ID
id-IP-Source-Address ProtocolIE-ID
id-CSFB-Information ProtocolIE-ID
+id-PDP-TypeInformation-extension ProtocolIE-ID
#.END
#.REGISTER_NEW
@@ -880,6 +891,7 @@ CSG-Membership-Status N ranap.extension id-CSG-Membership-Status
Cell-Access-Mode N ranap.extension id-Cell-Access-Mode
IPMulticastAddress N ranap.extension id-IP-Source-Address
CSFB-Information N ranap.extension id-CSFB-Information
+PDP-TypeInformation-extension N ranap.extension id-PDP-TypeInformation-extension
#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 9e3ae8e7c1..4a4cfca54c 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -100,8 +100,6 @@
#define maxNrOfEDCHMACdFlows_1 7
#define maxGANSSSet 9
#define maxNrOfCSGs 256
-#define id_170_not_to_be_used_for_IE_ids 170
-#define id_183_not_to_be_used_for_IE_ids 183
typedef enum _ProcedureCode_enum {
id_RAB_Assignment = 0,
@@ -112,6 +110,7 @@ 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,
@@ -154,6 +153,8 @@ 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,
@@ -224,6 +225,8 @@ 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,
@@ -250,6 +253,8 @@ 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,
@@ -317,6 +322,7 @@ typedef enum _ProtocolIE_ID_enum {
id_RAT_Type = 167,
id_PeriodicLocationInfo = 168,
id_MBMSCountingInformation = 169,
+ id_170_not_to_be_used_for_IE_ids = 170,
id_ExtendedRNC_ID = 171,
id_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf = 172,
id_Alt_RAB_Parameter_ExtendedMaxBitrateInf = 173,
@@ -329,6 +335,7 @@ typedef enum _ProtocolIE_ID_enum {
id_LAofIdleModeUEs = 180,
id_newLAListofIdleModeUEs = 181,
id_LAListwithNoIdleModeUEsAnyMore = 182,
+ id_183_not_to_be_used_for_IE_ids = 183,
id_GANSS_PositioningDataSet = 184,
id_RequestedGANSSAssistanceData = 185,
id_BroadcastGANSSAssistanceDataDecipheringKeys = 186,
@@ -377,11 +384,13 @@ 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,
id_IP_Source_Address = 236,
- id_CSFB_Information = 237
+ id_CSFB_Information = 237,
+ id_PDP_TypeInformation_extension = 238
} ProtocolIE_ID_enum;
/*--- End of included file: packet-ranap-val.h ---*/
@@ -482,6 +491,7 @@ static int hf_ranap_OMC_ID_PDU = -1; /* OMC_ID */
static int hf_ranap_PagingAreaID_PDU = -1; /* PagingAreaID */
static int hf_ranap_PagingCause_PDU = -1; /* PagingCause */
static int hf_ranap_PDP_TypeInformation_PDU = -1; /* PDP_TypeInformation */
+static int hf_ranap_PDP_TypeInformation_extension_PDU = -1; /* PDP_TypeInformation_extension */
static int hf_ranap_PeriodicLocationInfo_PDU = -1; /* PeriodicLocationInfo */
static int hf_ranap_PermanentNAS_UE_ID_PDU = -1; /* PermanentNAS_UE_ID */
static int hf_ranap_PLMNidentity_PDU = -1; /* PLMNidentity */
@@ -851,6 +861,7 @@ static int hf_ranap_requestedGPSAssistanceData = -1; /* RequestedGPSAssistanceD
static int hf_ranap_MBMSIPMulticastAddressandAPNRequest_item = -1; /* TMGI */
static int hf_ranap_rAI = -1; /* RAI */
static int hf_ranap_PDP_TypeInformation_item = -1; /* PDP_Type */
+static int hf_ranap_PDP_TypeInformation_extension_item = -1; /* PDP_Type_extension */
static int hf_ranap_reportingAmount = -1; /* INTEGER_1_8639999_ */
static int hf_ranap_reportingInterval = -1; /* INTEGER_1_8639999_ */
static int hf_ranap_iMSI = -1; /* IMSI */
@@ -1140,6 +1151,7 @@ static gint ett_ranap_LocationRelatedDataRequestType = -1;
static gint ett_ranap_MBMSIPMulticastAddressandAPNRequest = -1;
static gint ett_ranap_PagingAreaID = -1;
static gint ett_ranap_PDP_TypeInformation = -1;
+static gint ett_ranap_PDP_TypeInformation_extension = -1;
static gint ett_ranap_PeriodicLocationInfo = -1;
static gint ett_ranap_PermanentNAS_UE_ID = -1;
static gint ett_ranap_PermittedEncryptionAlgorithms = -1;
@@ -1474,6 +1486,7 @@ 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" },
@@ -1544,6 +1557,8 @@ 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" },
@@ -1614,6 +1629,8 @@ 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" },
@@ -1640,6 +1657,8 @@ 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" },
@@ -1707,6 +1726,7 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_RAT_Type, "id-RAT-Type" },
{ id_PeriodicLocationInfo, "id-PeriodicLocationInfo" },
{ id_MBMSCountingInformation, "id-MBMSCountingInformation" },
+ { id_170_not_to_be_used_for_IE_ids, "id-170-not-to-be-used-for-IE-ids" },
{ id_ExtendedRNC_ID, "id-ExtendedRNC-ID" },
{ id_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf, "id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf" },
{ id_Alt_RAB_Parameter_ExtendedMaxBitrateInf, "id-Alt-RAB-Parameter-ExtendedMaxBitrateInf" },
@@ -1719,6 +1739,7 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
{ id_LAofIdleModeUEs, "id-LAofIdleModeUEs" },
{ id_newLAListofIdleModeUEs, "id-newLAListofIdleModeUEs" },
{ id_LAListwithNoIdleModeUEsAnyMore, "id-LAListwithNoIdleModeUEsAnyMore" },
+ { id_183_not_to_be_used_for_IE_ids, "id-183-not-to-be-used-for-IE-ids" },
{ id_GANSS_PositioningDataSet, "id-GANSS-PositioningDataSet" },
{ id_RequestedGANSSAssistanceData, "id-RequestedGANSSAssistanceData" },
{ id_BroadcastGANSSAssistanceDataDecipheringKeys, "id-BroadcastGANSSAssistanceDataDecipheringKeys" },
@@ -1767,11 +1788,13 @@ 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" },
{ id_IP_Source_Address, "id-IP-Source-Address" },
{ id_CSFB_Information, "id-CSFB-Information" },
+ { id_PDP_TypeInformation_extension, "id-PDP-TypeInformation-extension" },
{ 0, NULL }
};
@@ -5378,6 +5401,35 @@ dissect_ranap_PDP_TypeInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
+static const value_string ranap_PDP_Type_extension_vals[] = {
+ { 0, "ipv4-and-ipv6" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_ranap_PDP_Type_extension(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 const per_sequence_t PDP_TypeInformation_extension_sequence_of[1] = {
+ { &hf_ranap_PDP_TypeInformation_extension_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ranap_PDP_Type_extension },
+};
+
+static int
+dissect_ranap_PDP_TypeInformation_extension(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_PDP_TypeInformation_extension, PDP_TypeInformation_extension_sequence_of,
+ 1, maxNrOfPDPDirections, FALSE);
+
+ return offset;
+}
+
+
static int
dissect_ranap_INTEGER_1_8639999_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -10177,6 +10229,14 @@ static int dissect_PDP_TypeInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_PDP_TypeInformation_extension_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_PDP_TypeInformation_extension(tvb, offset, &asn1_ctx, tree, hf_ranap_PDP_TypeInformation_extension_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_PeriodicLocationInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -12336,6 +12396,10 @@ void proto_register_ranap(void) {
{ "PDP-TypeInformation", "ranap.PDP_TypeInformation",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_ranap_PDP_TypeInformation_extension_PDU,
+ { "PDP-TypeInformation-extension", "ranap.PDP_TypeInformation_extension",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_ranap_PeriodicLocationInfo_PDU,
{ "PeriodicLocationInfo", "ranap.PeriodicLocationInfo",
FT_NONE, BASE_NONE, NULL, 0,
@@ -13812,6 +13876,10 @@ void proto_register_ranap(void) {
{ "PDP-Type", "ranap.PDP_Type",
FT_UINT32, BASE_DEC, VALS(ranap_PDP_Type_vals), 0,
NULL, HFILL }},
+ { &hf_ranap_PDP_TypeInformation_extension_item,
+ { "PDP-Type-extension", "ranap.PDP_Type_extension",
+ FT_UINT32, BASE_DEC, VALS(ranap_PDP_Type_extension_vals), 0,
+ NULL, HFILL }},
{ &hf_ranap_reportingAmount,
{ "reportingAmount", "ranap.reportingAmount",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -14657,6 +14725,7 @@ void proto_register_ranap(void) {
&ett_ranap_MBMSIPMulticastAddressandAPNRequest,
&ett_ranap_PagingAreaID,
&ett_ranap_PDP_TypeInformation,
+ &ett_ranap_PDP_TypeInformation_extension,
&ett_ranap_PeriodicLocationInfo,
&ett_ranap_PermanentNAS_UE_ID,
&ett_ranap_PermittedEncryptionAlgorithms,
@@ -15140,6 +15209,7 @@ proto_reg_handoff_ranap(void)
dissector_add("ranap.extension", id_Cell_Access_Mode, new_create_dissector_handle(dissect_Cell_Access_Mode_PDU, proto_ranap));
dissector_add("ranap.extension", id_IP_Source_Address, new_create_dissector_handle(dissect_IPMulticastAddress_PDU, proto_ranap));
dissector_add("ranap.extension", id_CSFB_Information, new_create_dissector_handle(dissect_CSFB_Information_PDU, proto_ranap));
+ dissector_add("ranap.extension", id_PDP_TypeInformation_extension, new_create_dissector_handle(dissect_PDP_TypeInformation_extension_PDU, proto_ranap));
dissector_add("ranap.proc.imsg", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseCommand_PDU, proto_ranap));
dissector_add("ranap.proc.sout", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseComplete_PDU, proto_ranap));
dissector_add("ranap.proc.imsg", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationRequired_PDU, proto_ranap));