diff --git a/demo/DIAMETER_Types.ttcn b/demo/DIAMETER_Types.ttcn
index bd733eee4192a7637e448f008513da40d9b695d6..571e45d7aa98caa134dd13710f9e9a348266d21b 100644
--- a/demo/DIAMETER_Types.ttcn
+++ b/demo/DIAMETER_Types.ttcn
@@ -40,7 +40,7 @@ module DIAMETER_Types {
//
// File: BaseTypes_IETF_RFC3588.ddf
// Description: DDF for the Diameter base types
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc
index c73ecab1dbf0813c58496e9792dbf7200e5d1b52..f7f7e5f3ac337619eec6e20b6a1c8d0f6a4bdc23 100644
Binary files a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc and b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc differ
diff --git a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc
index 3bd56d64c6dbe5781cc0dd46d1e53a0a52205c2c..c68861af6d3aebdec82dc3d44529b08da84ea95e 100644
Binary files a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc and b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc differ
diff --git a/src/AAAInterface_3GPP_TS29272_940.ddf b/src/AAAInterface_3GPP_TS29272_940.ddf
index e0c3a9931babe5e01a813f10d862a5213499bf2f..c7f0a6935e5b885ddd624de1dc2b7918855d6714 100644
--- a/src/AAAInterface_3GPP_TS29272_940.ddf
+++ b/src/AAAInterface_3GPP_TS29272_940.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_940.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/AAAInterface_3GPP_TS29272_950.ddf b/src/AAAInterface_3GPP_TS29272_950.ddf
index bbf49a712492c0e69b2d3c2a9098e88cf74226c4..2f6bb0773b9db35a3c3c124d5f8def8ae4823d85 100644
--- a/src/AAAInterface_3GPP_TS29272_950.ddf
+++ b/src/AAAInterface_3GPP_TS29272_950.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_950.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.5.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29272_970.ddf b/src/AAAInterface_3GPP_TS29272_970.ddf
index bbb353a40f94113267826f2c928eec3f6e3d820c..2b97450446c3a4b6c427b413d02cbaa408e8c01a 100644
--- a/src/AAAInterface_3GPP_TS29272_970.ddf
+++ b/src/AAAInterface_3GPP_TS29272_970.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_970.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29272_a30.ddf b/src/AAAInterface_3GPP_TS29272_a30.ddf
index 421a71068be13ebd652079f26795dfac62f9d0bb..0f71f853f05ff3e53b752859ee4d434c540b03ae 100644
--- a/src/AAAInterface_3GPP_TS29272_a30.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a30.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_a30.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29272_a60.ddf b/src/AAAInterface_3GPP_TS29272_a60.ddf
index fc91d0e04b1fd5ca49e30bab822920d5d13927dd..90d61d04826ea87512f2f230c4e526111c5d369f 100644
--- a/src/AAAInterface_3GPP_TS29272_a60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a60.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_a60.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.6.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29272_b60.ddf b/src/AAAInterface_3GPP_TS29272_b60.ddf
index 00bfd6fb63a6152f6a31aa7b5c9cd28fa6a6f59f..b4b0dffc7df8d395712b96d581904fce1864561a 100644
--- a/src/AAAInterface_3GPP_TS29272_b60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_b60.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_b60.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.6.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29272_bd0.ddf b/src/AAAInterface_3GPP_TS29272_bd0.ddf
index f0f21782955e1454fe5cc6939fdeeaf487eac043..e928eecb85650f38ba17c7a9438729068db0a77e 100644
--- a/src/AAAInterface_3GPP_TS29272_bd0.ddf
+++ b/src/AAAInterface_3GPP_TS29272_bd0.ddf
@@ -11,7 +11,7 @@
//
// File: AAAInterface_3GPP_TS29272_bd0.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.13.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
diff --git a/src/AAAInterface_3GPP_TS29273_840.ddf b/src/AAAInterface_3GPP_TS29273_840.ddf
index 58db0be9419ac67e34f2e4ffb284e027aff9dc7c..bf7a04927761d0096c40b6b9fc35824b28922d8a 100644
--- a/src/AAAInterface_3GPP_TS29273_840.ddf
+++ b/src/AAAInterface_3GPP_TS29273_840.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_840.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V8.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/AAAInterface_3GPP_TS29273_940.ddf b/src/AAAInterface_3GPP_TS29273_940.ddf
index c44f0234374d9db8cdfc22ca702c369d73d10b06..c36fa2c0cc60903a5c5e5fe3142b562eacbed26d 100644
--- a/src/AAAInterface_3GPP_TS29273_940.ddf
+++ b/src/AAAInterface_3GPP_TS29273_940.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_940.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V9.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/AAAInterface_3GPP_TS29273_b30.ddf b/src/AAAInterface_3GPP_TS29273_b30.ddf
index d469dd445d2e5f5e7514704f9d8ad99a4274b5be..16675a4465e4fe273bb904a175432b54c7c7a394 100644
--- a/src/AAAInterface_3GPP_TS29273_b30.ddf
+++ b/src/AAAInterface_3GPP_TS29273_b30.ddf
@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_940.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V11.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/AVP.sh b/src/AVP.sh
old mode 100755
new mode 100644
diff --git a/src/Acision_Specific.ddf b/src/Acision_Specific.ddf
index 279121a056cfca1a2a5579c0ec7e47102fda6433..8887e9bea891beb9fd1a2984ed3a7922b69b856c 100644
--- a/src/Acision_Specific.ddf
+++ b/src/Acision_Specific.ddf
@@ -37,7 +37,7 @@
//
// File: Acision_Specific.ddf
// Description: Acision specific AVP definitions
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
// Reference:
//
diff --git a/src/Alcatel_Lucent_Specific_AVPs.ddf b/src/Alcatel_Lucent_Specific_AVPs.ddf
index 3c45a46ffefc5c71aeb2ac401c6d01e749f801c7..f0c9f401f9dd835d6b9ba6a63aa8265d88af2f9a 100644
--- a/src/Alcatel_Lucent_Specific_AVPs.ddf
+++ b/src/Alcatel_Lucent_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
//
// File: Alcatel_Lucent_Specific_AVPs.ddf
// Description: Alcatel Lucent (ALU) specific AVP definitions
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/BaseTypes_IETF_RFC3588.ddf b/src/BaseTypes_IETF_RFC3588.ddf
index 4745f15e7c803736f50be407be71ae65d088941f..dd0a763c773d9cad419d28e27a76db7b69f22883 100644
--- a/src/BaseTypes_IETF_RFC3588.ddf
+++ b/src/BaseTypes_IETF_RFC3588.ddf
@@ -37,7 +37,7 @@
//
// File: BaseTypes_IETF_RFC3588.ddf
// Description: DDF for the Diameter base types
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/Base_IETF_RFC3588.ddf b/src/Base_IETF_RFC3588.ddf
index 537ba156e8d647a4141b68296ad53611d23fe12a..d367fea3f156a11a98b568cd87f0c5ccfc835f26 100644
--- a/src/Base_IETF_RFC3588.ddf
+++ b/src/Base_IETF_RFC3588.ddf
@@ -37,7 +37,7 @@
//
// File: Base_IETF_RFC3588.ddf
// Description: DDF for the Diameter base AVPs
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CLCInterface_Vodafone_Rev2.ddf b/src/CLCInterface_Vodafone_Rev2.ddf
index 17727c83424f88ec8e2d78c873ea8bed7a5bf66c..650e20b016ffbfdbaa51d169e58a577b1d5ffd9c 100644
--- a/src/CLCInterface_Vodafone_Rev2.ddf
+++ b/src/CLCInterface_Vodafone_Rev2.ddf
@@ -39,7 +39,7 @@
// Description: DDF for CLC according to Intelligent Packet Core
// Vodafone Diameter CCA Specification for the CLCI
// Version 2
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_850.ddf b/src/ChargingApplications_3GPP_TS32299_850.ddf
index 2b3f26a12efcb25f4df3c771f82c20686fd12018..3e2db612ede8a81651a9ca17fe956d1cf29ad1ac 100644
--- a/src/ChargingApplications_3GPP_TS32299_850.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_850.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplication_3GPP_TS32299_850.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V8.5.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_870.ddf b/src/ChargingApplications_3GPP_TS32299_870.ddf
index 5387f6cf5d75147fcded1ba128d55edfe8875a92..5ca0966eea3195b52d4d3906d0900157de1a60c0 100644
--- a/src/ChargingApplications_3GPP_TS32299_870.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_870.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplication_3GPP_TS32299_870.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V8.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_900.ddf b/src/ChargingApplications_3GPP_TS32299_900.ddf
index 73b616055ec402ba9a01ccc6cdcf819e0b5b1e58..e56d38f311eb4bd64a0086a5cd287216c14eee52 100644
--- a/src/ChargingApplications_3GPP_TS32299_900.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_900.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplication_3GPP_TS32299_900.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V9.0.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_940.ddf b/src/ChargingApplications_3GPP_TS32299_940.ddf
index 5b614ca314418b83d137e76ed36b4b2ca92729b9..16439d1ab167240d099c52e3f638261d961f1fd6 100644
--- a/src/ChargingApplications_3GPP_TS32299_940.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_940.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplications_3GPP_TS32299_940.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V9.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_9b0.ddf b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
index 917f34b03685cf2e4760aca528e635275c588835..02b16a612ad03d2177efff1bac5869f906bb6a19 100644
--- a/src/ChargingApplications_3GPP_TS32299_9b0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplications_3GPP_TS32299_9110.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V9.11.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
index 72b0299891637e8b8b99fe9b41bda1c24852804b..1670d2238452785ee46bb33a0c0424238e95fdf0 100644
--- a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplication_3GPP_TS32299_AdviceOfCharge.ddf
// Description: DDF for Diameter Charging Application
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_a60.ddf b/src/ChargingApplications_3GPP_TS32299_a60.ddf
index 3023d44960cfa7b991aeee440039719908d8dc42..9953ae6a1cd79b1ec10cc3a1ce9907796cd29cfa 100644
--- a/src/ChargingApplications_3GPP_TS32299_a60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_a60.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplications_3GPP_TS32299_a60.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V10.6.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_be0.ddf b/src/ChargingApplications_3GPP_TS32299_be0.ddf
index cb8ad94e8f272c49841120c973c555bfe7ef4c7f..3994569a23ff1b6c67cce621f9a5678043de4085 100644
--- a/src/ChargingApplications_3GPP_TS32299_be0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_be0.ddf
@@ -11,7 +11,7 @@
//
// File: ChargingApplications_3GPP_TS32299_be0.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 11.15.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_c60.ddf b/src/ChargingApplications_3GPP_TS32299_c60.ddf
index c8f7cd901c355c11fa252a3e81e6674a55ae1fa6..bbb7b7042f87aa6daba0c40e24ae67a50c28fed6 100644
--- a/src/ChargingApplications_3GPP_TS32299_c60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_c60.ddf
@@ -37,7 +37,7 @@
//
// File: ChargingApplications_3GPP_TS32299_a60.ddf
// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V12.6.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ChargingApplications_3GPP_TS32299_d40.ddf b/src/ChargingApplications_3GPP_TS32299_d40.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..2207a8025cbf5fddf33c4943349a55f66294a8ef
--- /dev/null
+++ b/src/ChargingApplications_3GPP_TS32299_d40.ddf
@@ -0,0 +1,2358 @@
+/******************************************************************************
+* Copyright (c) 2004, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Timea Moder - initial implementation and initial documentation
+******************************************************************************/
+//
+// File: ChargingApplications_3GPP_TS32299_a60.ddf
+// Description: DDF for Diameter Charging Application 3GPP TS 32.299 V13.4.0
+// Rev: R40A
+// Prodnr: CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: DCA
+// APPLICATION-REVISION: V13_4_0
+
+// AVP implementations according to:
+// 3GPP TS 32.299 V13.4.0 - Telecommunication management; Charging management;
+//
+//
+// Dependant applications
+// 3GPP TS 29.229 - Cx and Dx interfaces based on the Diameter protocol
+// IETF RFC 3588 - Diameter Base Protocol
+// RFC 4006 - Diameter Credit Control Application
+//
+// Notes:
+//
+
+
+// 3GPP TS 32.299 V13.4.0
+type enumerated Command_Code
+{
+ Accounting (271),
+ Re_Auth (258)
+}
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Access-Network-Information (1263) 3GPP (10415)
+// 7.2.1
+type AVP_OctetString Access_Network_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Access-Transfer-Information (2709) 3GPP (10415)
+// 7.2.1A
+type AVP_Grouped Access_Transfer_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Access-Transfer-Type (2710) 3GPP (10415)
+// 7.2.1.B
+type enumerated Access_Transfer_Type
+{
+ PS_to_CS_Transfer (0),
+ CS_to_PS_Transfer (1),
+ PS_to_PS_Transfer (2),
+ CS_to_CS_Transfer (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Account-Expiration (2309) 3GPP (10415)
+// 7.2.2
+type AVP_Time Account_Expiration;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Accumulated-Cost (2052) 3GPP (10415)
+// 7.2.3
+type AVP_Grouped Accumulated_Cost;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Adaptations (1217) 3GPP (10415)
+// 7.2.4
+type enumerated Adaptations
+{
+ YES (0),
+ NO (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Additional-Content-Information (1207) 3GPP (10415)
+// 7.2.5
+type AVP_Grouped Additional_Content_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Additional-Type-Information (1205) 3GPP (10415)
+// 7.2.6
+type AVP_UTF8String Additional_Type_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Address-Data (897) 3GPP (10415)
+// 7.2.7
+type AVP_UTF8String Address_Data;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Address-Domain (898) 3GPP (10415)
+// 7.2.8
+type AVP_Grouped Address_Domain;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Address-Type (899) 3GPP (10415)
+// 7.2.9
+type enumerated Address_Type
+{
+ E_MAIL_ADDRESS (0),
+ MSISDN (1),
+ IPV4_ADDRESS (2),
+ IPV6_ADDRESS (3),
+ NUMERIC_SHORTCODE (4),
+ ALPHANUMERIC_SHORTCODE (5),
+ OTHER (6),
+ IMSI (7)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Addressee-Type (1208) 3GPP (10415)
+// 7.2.10
+type enumerated Addressee_Type
+{
+ TO (0),
+ CC (1),
+ BCC (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AF-Correlation-Information (1276) 3GPP (10415)
+// 7.2.11
+type AVP_Grouped AF_Correlation_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Alternate-Charged-Party-Address (1280) 3GPP (10415)
+// 7.2.12
+type AVP_UTF8String Alternate_Charged_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Announcement-Identifier (3905) 3GPP (10415)
+// 7.2.12aA
+type AVP_Unsigned32 Announcement_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Announcement-Information (3904) 3GPP (10415)
+// 7.2.12aB
+type AVP_Grouped Announcement_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Announcement-Order (3906) 3GPP (10415)
+// 7.2.12aC
+type AVP_Unsigned32 Announcement_Order;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Announcing-UE-HPLMN-Identifier (3426) 3GPP (10415)
+// 7.2.12A
+type AVP_UTF8String Announcing_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Announcing-UE-VPLMN-Identifier (3427) 3GPP (10415)
+// 7.2.12B
+type AVP_UTF8String Announcing_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Cost-Information (2053) 3GPP (10415)
+// 7.2.13
+type AVP_Grouped AoC_Cost_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Format (2310) 3GPP (10415)
+// 7.2.14
+type enumerated AoC_Format
+{
+ MONETARY (0),
+ NON_MONETARY (1),
+ CAI (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Information (2054) 3GPP (10415)
+// 7.2.15
+type AVP_Grouped AoC_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Request-Type (2055) 3GPP (10415)
+// 7.2.16
+type enumerated AoC_Request_Type
+{
+ AoC_NOT_REQUESTED (0),
+ AoC_FULL (1),
+ AoC_COST_ONLY (2),
+ AoC_TARIFF_ONLY (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Service (2311) 3GPP (10415)
+// 7.2.17
+type AVP_Grouped AoC_Service;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Service-Obligatory-Type (2312) 3GPP (10415)
+// 7.2.18
+type enumerated AoC_Service_Obligatory_Type
+{
+ NON_BINDING (0),
+ BINDING (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Service-Type (2313) 3GPP (10415)
+// 7.2.19
+type enumerated AoC_Service_Type
+{
+ NONE (0),
+ AOC_S (1),
+ AOC_D (2),
+ AOC_E (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: AoC-Subscription-Information (2314) 3GPP (10415)
+// 7.2.20
+type AVP_Grouped AoC_Subscription_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Applic-ID (1218) 3GPP (10415)
+// 7.2.21
+type AVP_UTF8String Applic_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Application-provided-Called-Party-Address (837) 3GPP (10415)
+// 7.2.22
+type AVP_UTF8String Application_provided_Called_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Application-Server (836) 3GPP (10415)
+// 7.2.23
+type AVP_UTF8String Application_Server;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Application-Server-Information (850) 3GPP (10415)
+// 7.2.24
+type AVP_Grouped Application_Server_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Application-Specific-Data (3458) 3GPP (10415)
+// 7.2.24A
+type AVP_OctetString Application_Specific_Data;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Associated-Party-Address (2035) 3GPP (10415)
+// 7.2.25
+type AVP_UTF8String Associated_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Associated-URI (856) 3GPP (10415)
+// 7.2.26
+type AVP_UTF8String Associated_URI;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Authorised-QoS (849) 3GPP (10415)
+// 7.2.27
+type AVP_UTF8String Authorised_QoS;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Aux-Applic-Info (1219) 3GPP (10415)
+// 7.2.28
+type AVP_UTF8String Aux_Applic_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Base-Time-Interval (1265) 3GPP (10415)
+// 7.2.29
+type AVP_Unsigned32 Base_Time_Interval;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Basic-Service-Code (3411) 3GPP (10415)
+// 7.2.29A
+type AVP_Grouped Basic_Service_Code;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Bearer-Capability (3412) 3GPP (10415)
+// 7.2.29B
+type AVP_OctetString Bearer_Capability;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Bearer-Service (854) 3GPP (10415)
+// 7.2.30
+type AVP_OctetString Bearer_Service;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: BSSID (2716) 3GPP (10415)
+// 7.2.30A
+type AVP_UTF8String BSSID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Called-Asserted-Identity (1250) 3GPP (10415)
+// 7.2.31
+type AVP_UTF8String Called_Asserted_Identity;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Called-Identity (3916) 3GPP (10415)
+// 7.2.31A
+type AVP_UTF8String Called_Identity;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Called-Identity-Change (3917) 3GPP (10415)
+// 7.2.31B
+type AVP_Grouped Called_Identity_Change;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Called-Party-Address (832) 3GPP (10415)
+// 7.2.32
+type AVP_UTF8String Called_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Calling-Party-Address (831) 3GPP (10415)
+// 7.2.33
+type AVP_UTF8String Calling_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Carrier-Select-Routing-Information (2023) 3GPP (10415)
+// 7.2.34
+type AVP_UTF8String Carrier_Select_Routing_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Cause-Code (861) 3GPP (10415)
+// 7.2.35
+type AVP_Integer32 Cause_Code;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: CG-Address (846) 3GPP (10415)
+// 7.2.36
+type AVP_Address CG_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Change-Condition (2037) 3GPP (10415)
+// 7.2.37
+type AVP_Integer32 Change_Condition;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Change-Time (2038) 3GPP (10415)
+// 7.2.38
+type AVP_Time Change_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Charge-Reason-Code (2118) 3GPP (10415)
+// 7.2.38A
+type enumerated Charge_Reason_Code
+{
+ UNKNOWN (0),
+ USAGE (1),
+ COMMUNICATION_ATTEMPT_CHARGE (2),
+ SETUP_CHARGE (3),
+ ADD_ON_CHARGE (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Charged-Party (857) 3GPP (10415)
+// 7.2.39
+type AVP_UTF8String Charged_Party;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Charging-Characteristics-Selection-Mode (2066) 3GPP (10415)
+// 7.2.39A
+type enumerated Charging_Characteristics_Selection_Mode
+{
+ SERVING_NODE_SUPPLIED (0),
+ SUBSCRIPTION_SPECIFIC (1),
+ APN_SPECIFIC (2),
+ HOME_DEFAULT (3),
+ ROAMING_DEFAULT (4),
+ VISITING_DEFAULT (5)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Class-Identifier (1214) 3GPP (10415)
+// 7.2.40
+type enumerated Class_Identifier
+{
+ PERSONAL (0),
+ ADVERTISMENT (1),
+ INFORMATIONAL (2),
+ AUTO (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Client-Address (2018) 3GPP (10415)
+// 7.2.41
+type AVP_Address Client_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: CN-Operator-Selection-Entity (3421) 3GPP (10415)
+// 7.2.41A
+type enumerated CN_Operator_Selection_Entity
+{
+ SN_selected_by_UE (0),
+ SN_selected_by_network (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Content-Class (1220) 3GPP (10415)
+// 7.2.42
+type enumerated Content_Class
+{
+ TEXT (0),
+ IMAGE_BASIC (1),
+ IMAGE_RICH (2),
+ VIDEO_BASIC (3),
+ VIDEO_RICH (4),
+ MEGAPIXEL (5),
+ CONTENT_BASIC (6),
+ CONTENT_RICH (7)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Content-Disposition (828) 3GPP (10415)
+// 7.2.43
+type AVP_UTF8String Content_Disposition;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Content-Length (827) 3GPP (10415)
+// 7.2.44
+type AVP_Unsigned32 Content_Length;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Content-Size (1206) 3GPP (10415)
+// 7.2.45
+type AVP_Unsigned32 Content_Size;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Content-Type (826) 3GPP (10415)
+// 7.2.46
+type AVP_UTF8String Content_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Coverage-Status (3428) 3GPP (10415)
+// 7.2.46aA
+type enumerated Coverage_Status
+{
+ OUT_OF_COVERAGE (0),
+ IN_COVERAGE (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Coverage-Info (3459) 3GPP (10415)
+// 7.2.46aaA
+type AVP_Grouped Coverage_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: CSG-Access-Mode (2317) 3GPP (10415)
+// 7.2.46A
+type enumerated CSG_Access_Mode
+{
+ CLOSED_MODE (0),
+ HYBRID_MODE (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: CSG-Membership-Indication (2318) 3GPP (10415)
+// 7.2.46B
+type enumerated CSG_Membership_Indication
+{
+ NOT_CSG_MEMBER (0),
+ CSG_MEMBER (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Current-Tariff (2056) 3GPP (10415)
+// 7.2.47
+type AVP_Grouped Current_Tariff;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: CUG-Information (2304) 3GPP (10415)
+// 7.2.48
+type AVP_OctetString CUG_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Data-Coding-Scheme (2001) 3GPP (10415)
+// 7.2.49
+type AVP_Integer32 Data_Coding_Scheme;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: DCD-Information (2115) 3GPP (10415)
+// 7.2.50
+type AVP_Grouped DCD_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Deferred-Location-Event-Type (1230) 3GPP (10415)
+// 7.2.51
+type AVP_UTF8String Deferred_Location_Event_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Delivery-Report-Requested (1216) 3GPP (10415)
+// 7.2.52
+type enumerated Delivery_Report_Requested
+{
+ NO (0),
+ YES (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Destination-Interface (2002) 3GPP (10415)
+// 7.2.53
+type AVP_Grouped Destination_Interface;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Diagnostics (2039) 3GPP (10415)
+// 7.2.54
+type AVP_Integer32 Diagnostics;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Domain-Name (1200) 3GPP (10415)
+// 7.2.55
+type AVP_UTF8String Domain_Name;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: DRM-Content (1221) 3GPP (10415)
+// 7.2.56
+type enumerated DRM_Content
+{
+ NO (0),
+ YES (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Dynamic-Address-Flag (2051) 3GPP (10415)
+// 7.2.57
+type enumerated Dynamic_Address_Flag
+{
+ STATIC (0),
+ DYNAMIC (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Dynamic-Address-Flag-Extension (2068) 3GPP (10415)
+// 7.2.57A
+type enumerated Dynamic_Address_Flag_Extension
+{
+ STATIC (0),
+ DYNAMIC (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Early-Media-Description (1272) 3GPP (10415)
+// 7.2.58
+type AVP_Grouped Early_Media_Description;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Enhanced-Diagnostics (3901) 3GPP (10415)
+// 7.2.58A
+type AVP_Grouped Enhanced_Diagnostics;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Envelope (1266) 3GPP (10415)
+// 7.2.59
+type AVP_Grouped Envelope;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Envelope-End-Time (1267) 3GPP (10415)
+// 7.2.60
+type AVP_Time Envelope_End_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Envelope-Reporting (1268) 3GPP (10415)
+// 7.2.61
+type enumerated Envelope_Reporting
+{
+ DO_NOT_REPORT_ENVELOPES (0),
+ REPORT_ENVELOPES (1),
+ REPORT_ENVELOPES_WITH_VOLUME (2),
+ REPORT_ENVELOPES_WITH_EVENTS (3),
+ REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Envelope-Start-Time (1269) 3GPP (10415)
+// 7.2.62
+type AVP_Time Envelope_Start_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ePDG-Address (3425) 3GPP (10415)
+// 7.2.62A
+type AVP_Address ePDG_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Event (825) 3GPP (10415)
+// 7.2.63
+type AVP_UTF8String Event;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Event-Charging-TimeStamp (1258) 3GPP (10415)
+// 7.2.64
+type AVP_Time Event_Charging_TimeStamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Event-Type (823) 3GPP (10415)
+// 7.2.65
+type AVP_Grouped Event_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Expires (888) 3GPP (10415)
+// 7.2.66
+type AVP_Unsigned32 Expires;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: File-Repair-Supported (1224) 3GPP (10415)
+// 7.2.67
+type enumerated File_Repair_Supported
+{
+ SUPPORTED (1),
+ NOT_SUPPORTED (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: From-Address (2708) 3GPP (10415)
+// 7.2.67A
+type AVP_UTF8String From_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Forwarding-Pending (3415) 3GPP (10415)
+// 7.2.67aA
+type enumerated Forwarding_Pending
+{
+ Forwarding_not_Pending (0),
+ Forwarding_Pending (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: GGSN-Address (847) 3GPP (10415)
+// 7.2.68
+type AVP_Address GGSN_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IM-Information (2110) 3GPP (10415)
+// 7.2.69
+type AVP_Grouped IM_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Incremental-Cost (2062) 3GPP (10415)
+// 7.2.70
+type AVP_Grouped Incremental_Cost;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Instance-Id (3402) 3GPP (10415)
+// 7.2.70A
+type AVP_UTF8String Instance_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Interface-Id (2003) 3GPP (10415)
+// 7.2.71
+type AVP_UTF8String Interface_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Interface-Port (2004) 3GPP (10415)
+// 7.2.72
+type AVP_UTF8String Interface_Port;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Interface-Text (2005) 3GPP (10415)
+// 7.2.73
+type AVP_UTF8String Interface_Text;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Interface-Type (2006) 3GPP (10415)
+// 7.2.74
+type enumerated Interface_Type
+{
+ UNKNOWN (0),
+ MOBILE_ORIGINATING (1),
+ MOBILE_TERMINATING (2),
+ APPLICATION_ORIGINATING (3),
+ APPLICATION_TERMINATION (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Application-Reference-Identifier (2601) 3GPP (10415)
+// 7.2.74A
+type AVP_UTF8String IMS_Application_Reference_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Inter-UE-Transfer (3902) 3GPP (10415)
+// 7.2.74aA
+type enumerated Inter_UE_Transfer
+{
+ INTRA_UE_TRANSFER (0),
+ INTER_UE_TRANSFER (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Charging-Identifier (841) 3GPP (10415)
+// 7.2.75
+type AVP_UTF8String IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Communication-Service-Identifier (1281) 3GPP (10415)
+// 7.2.76
+type AVP_UTF8String IMS_Communication_Service_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Emergency-Indicator (2322) 3GPP (10415)
+// 7.2.76A
+type enumerated IMS_Emergency_Indicator
+{
+ Non_Emergency (0),
+ Emergency (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Information (876) 3GPP (10415)
+// 7.2.77
+type AVP_Grouped IMS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMS-Visited-Network-Identifier (2713) 3GPP (10415)
+// 7.2.77A
+type AVP_UTF8String IMS_Visited_Network_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IMSI-Unauthenticated-Flag (2308) 3GPP (10415)
+// 7.2.78
+type enumerated IMSI_Unauthenticated_Flag
+{
+ AUTHENTICATED (0),
+ UNAUTHENTICATED (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Incoming-Trunk-Group-Id (852) 3GPP (10415)
+// 7.2.79
+type AVP_UTF8String Incoming_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Initial-IMS-Charging-Identifier (2321) 3GPP (10415)
+// 7.2.79A
+type AVP_UTF8String Initial_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Inter-Operator-Identifier (838) 3GPP (10415)
+// 7.2.80
+type AVP_Grouped Inter_Operator_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: IP-Realm-Default-Indication (2603) 3GPP (10415)
+// 7.2.80A
+type enumerated IP_Realm_Default_Indication
+{
+ DEFAULT_IP_REALM_NOT_USED (0),
+ DEFAULT_IP_REALM_USED (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ISUP-Cause (3416) 3GPP (10415)
+// 7.2.80B
+type AVP_Grouped ISUP_Cause;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ISUP-Cause-Diagnostics (3422) 3GPP (10415)
+// 7.2.80C
+type AVP_OctetString ISUP_Cause_Diagnostics;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ISUP-Cause-Location (3423) 3GPP (10415)
+// 7.2.80D
+type AVP_Unsigned32 ISUP_Cause_Location;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ISUP-Cause-Value (3424) 3GPP (10415)
+// 7.2.80E
+type AVP_Unsigned32 ISUP_Cause_Value;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ISUP-Location-Number (3414) 3GPP (10415)
+// 7.2.80F
+type AVP_OctetString ISUP_Location_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Language (3914) 3GPP (10415)
+// 7.2.80Fa
+type AVP_UTF8String Language;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Layer-2-Group-ID (3429) 3GPP (10415)
+// 7.2.80G
+type AVP_OctetString Layer_2_Group_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-APN (1231) 3GPP (10415)
+// 7.2.81
+type AVP_UTF8String LCS_APN;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Client-Dialed-By-MS (1233) 3GPP (10415)
+// 7.2.82
+type AVP_UTF8String LCS_Client_Dialed_By_MS;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Client-External-ID (1234) 3GPP (10415)
+// 7.2.83
+type AVP_UTF8String LCS_Client_External_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Client-Id (1232) 3GPP (10415)
+// 7.2.84
+type AVP_Grouped LCS_Client_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Client-Name (1235) 3GPP (10415)
+// 7.2.85
+type AVP_Grouped LCS_Client_Name;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Client-Type (1241) 3GPP (10415)
+// 7.2.86
+type enumerated LCS_Client_Type
+{
+ EMERGENCY_SERVICES (0),
+ VALUE_ADDED_SERVICES (1),
+ PLMN_OPERATOR_SERVICES (2),
+ LAWFUL_INTERCEPT_SERVICES (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Data-Coding-Scheme (1236) 3GPP (10415)
+// 7.2.87
+type AVP_UTF8String LCS_Data_Coding_Scheme;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Format-Indicator (1237) 3GPP (10415)
+// 7.2.88
+type enumerated LCS_Format_Indicator
+{
+ LOGICAL_NAME (0),
+ EMAIL_ADDRESS (1),
+ MSISDN (2),
+ URL (3),
+ SIP_URL (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Information (878) 3GPP (10415)
+// 7.2.89
+type AVP_Grouped LCS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Name-String (1238) 3GPP (10415)
+// 7.2.90
+type AVP_UTF8String LCS_Name_String;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Requestor-Id (1239) 3GPP (10415)
+// 7.2.91
+type AVP_Grouped LCS_Requestor_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: LCS-Requestor-Id-String (1240) 3GPP (10415)
+// 7.2.92
+type AVP_UTF8String LCS_Requestor_Id_String;
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Local-GW-Inserted-Indication (2604) 3GPP (10415)
+// 7.2.92A
+type enumerated Local_GW_Inserted_Indication
+{
+ LOCAL_GW_NOT_INSERTED (0),
+ LOCAL_GW_INSERTED (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Local-Sequence-Number (2063) 3GPP (10415)
+// 7.2.93
+type AVP_Unsigned32 Local_Sequence_Number;
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Location-Estimate (1242) 3GPP (10415)
+// 7.2.94
+type AVP_OctetString Location_Estimate;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Location-Estimate-Type (1243) 3GPP (10415)
+// 7.2.95
+type enumerated Location_Estimate_Type
+{
+ CURRENT_LOCATION (0),
+ CURRENT_LAST_KNOWN_LOCATION (1),
+ INITIAL_LOCATION (2),
+ ACTIVATE_DEFERRED_LOCATION (3),
+ CANCEL_DEFERRED_LOCATION (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Location-Info (3460) 3GPP (10415)
+// 7.2.95A
+type AVP_Grouped Location_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Location-Type (1244) 3GPP (10415)
+// 7.2.96
+type AVP_Grouped Location_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Low-Balance-Indication (2020) 3GPP (10415)
+// 7.2.97
+type enumerated Low_Balance_Indication
+{
+ NOT_APPLICABLE (0),
+ YES (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Low-Priority-Indicator (2602) 3GPP (10415)
+// 7.2.97A
+type enumerated Low_Priority_Indicator
+{
+ NO (0),
+ YES (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MBMS-Charged-Party (2323) 3GPP (10415)
+// 7.2.97B
+type enumerated MBMS_Charged_Party
+{
+ CONTENT_PROVIDER (0),
+ SUBSCRIBER (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MBMS-GW-Address (2307) 3GPP (10415)
+// 7.2.98
+type AVP_Address MBMS_GW_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MBMS-Information (880) 3GPP (10415)
+// 7.2.99
+type AVP_Grouped MBMS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MBMS-User-Service-Type (1225) 3GPP (10415)
+// 7.2.100
+type enumerated MBMS_User_Service_Type
+{
+ DOWNLOAD (1),
+ STREAMING (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Media-Initiator-Flag (882) 3GPP (10415)
+// 7.2.101
+type enumerated Media_Initiator_Flag
+{
+ CALLED_PARTY (0),
+ CALLING_PARTY (1),
+ UNKNOWN (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Media-Initiator-Party (1288) 3GPP (10415)
+// 7.2.102
+type AVP_UTF8String Media_Initiator_Party;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Message-Body (889) 3GPP (10415)
+// 7.2.103
+type AVP_Grouped Message_Body;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Message-Class (1213) 3GPP (10415)
+// 7.2.104
+type AVP_Grouped Message_Class;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Message-ID (1210) 3GPP (10415)
+// 7.2.105
+type AVP_UTF8String Message_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Message-Size (1212) 3GPP (10415)
+// 7.2.106
+type AVP_Unsigned32 Message_Size;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Message-Type (1211) 3GPP (10415)
+// 7.2.107
+type enumerated Message_Type
+{
+ M_SEMD_REQ (1),
+ M_SEMD_CONF (2),
+ M_NOTIFICATION_IND (3),
+ M_NOTIFYRESP_IND (4),
+ M_RETRIEVE_CONF (5),
+ M_ACKNOWLEDGE_IND (6),
+ M_DELIVERY_IND (7),
+ M_READ_REC_IND (8),
+ M_READ_ORIG_IND (9),
+ M_FORWARD_REQ (10),
+ M_FORWARD_CONF (11),
+ M_MBOX_STORE_CONF (12),
+ M_MBOX_VIEW_CONF (13),
+ M_MBOX_UPLOAD_CONF (14),
+ M_MBOX_DELETE_CONF (15)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MM-Content-Type (1203) 3GPP (10415)
+// 7.2.108
+type AVP_Grouped MM_Content_Type;
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MMBox-Storage-Requested (1248) 3GPP (10415)
+// 7.2.109
+type enumerated MMBox_Storage_Requested
+{
+ NO (0),
+ YES (1)
+}
+// 3GPP TS 32.299 V13.4.0
+// AVP: MMS-Information (877) 3GPP (10415)
+// 7.2.110
+type AVP_Grouped MMS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MMTel-Information (2030) 3GPP (10415)
+// 7.2.111
+type AVP_Grouped MMTel_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MMTel-SService-Type (2031) 3GPP (10415)
+// 7.2.111A
+type AVP_Unsigned32 MMTel_SService_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitored-PLMN-Identifier (3430) 3GPP (10415)
+// 7.2.111Aa
+type AVP_UTF8String Monitored_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-Event-Configuration-Activity (3919) 3GPP (10415)
+// 7.2.111AaA
+type enumerated Monitoring_Event_Configuration_Activity
+{
+ CREATE (0),
+ TRANSFER (1),
+ UPDATE (2),
+ DELETE (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-Event-Funtionality (3922) 3GPP (10415)
+// 7.2.111AaB
+type enumerated Monitoring_Event_Funtionality
+{
+ CONFIGURATION (0),
+ REPORTING (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-Event-Information (3921) 3GPP (10415)
+// 7.2.111AaC
+type AVP_Grouped Monitoring_Event_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-Event-Report-Data (3920) 3GPP (10415)
+// 7.2.111AaD
+type AVP_Grouped Monitoring_Event_Report_Data;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-Event-Report-Number (3923) 3GPP (10415)
+// 7.2.111AaE
+type AVP_Unsigned32 Monitoring_Event_Report_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-UE-HPLMN-Identifier (3431) 3GPP (10415)
+// 7.2.111Ab
+type AVP_UTF8String Monitoring_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-UE-Identifier (3432) 3GPP (10415)
+// 7.2.111Ac
+type AVP_UTF8String Monitoring_UE_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Monitoring-UE-VPLMN-Identifier (3433) 3GPP (10415)
+// 7.2.111Ad
+type AVP_UTF8String Monitoring_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MSC-Address (3417) 3GPP (10415)
+// 7.2.111B
+type AVP_OctetString MSC_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: MTC-IWF-Address (3406) 3GPP (10415)
+// 7.2.111C
+type AVP_Address MTC_IWF_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Neighbour-Node-Address (2705) 3GPP (10415)
+// 7.2.111D
+type AVP_Address Neighbour_Node_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Network-Call-Reference-Number (3418) 3GPP (10415)
+// 7.2.111E
+type AVP_OctetString Network_Call_Reference_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Next-Tariff (2057) 3GPP (10415)
+// 7.2.112
+type AVP_Grouped Next_Tariff;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: NNI-Information (2703) 3GPP (10415)
+// 7.2.112A
+type AVP_Grouped NNI_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: NNI-Type (2704) 3GPP (10415)
+// 7.2.112B
+type enumerated NNI_Type
+{
+ Non_Roaming (0),
+ Roaming_Without_Loopback (1),
+ Roaming_With_Loopback (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Node-Functionality (862) 3GPP (10415)
+// 7.2.113
+type enumerated Node_Functionality
+{
+ S_CSCF (0),
+ P_CSCF (1),
+ I_CSCF (2),
+ MRFC (3),
+ MGCF (4),
+ BGCF (5),
+ AS (6),
+ IBCF (7),
+ S_GW (8),
+ P_GW (9),
+ HSGW (10),
+ E_CSCF (11),
+ MME (12),
+ TRF (13),
+ TF (14),
+ ATCF (15),
+ Proxy_Function (16),
+ ePDG (17),
+ TDF (18),
+ TWAG (19)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Node-Id (2064) 3GPP (10415)
+// 7.2.114
+type AVP_UTF8String Node_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-Of-Diversions (2034) 3GPP (10415)
+// 7.2.115
+type AVP_Unsigned32 Number_Of_Diversions;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-of-Messages-Sent (2019) 3GPP (10415)
+// 7.2.116
+type AVP_Unsigned32 Number_of_Messages_Sent;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-Of-Participants (885) 3GPP (10415)
+// 7.2.117
+type AVP_Unsigned32 Number_Of_Participants;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-Of-Received-Talk-Bursts (1282) 3GPP (10415)
+// 7.2.118
+type AVP_Unsigned32 Number_Of_Received_Talk_Bursts;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-Of-Talk-Bursts (1283) 3GPP (10415)
+// 7.2.119
+type AVP_Unsigned32 Number_Of_Talk_Bursts;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Number-Portability-Routing-Information (2024) 3GPP (10415)
+// 7.2.120
+type AVP_UTF8String Number_Portability_Routing_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Offline-Charging (1278) 3GPP (10415)
+// 7.2.121
+type AVP_Grouped Offline_Charging;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Online-Charging-Flag (2303) 3GPP (10415)
+// 7.2.122
+type enumerated Online_Charging_Flag
+{
+ ECF_ADDRESS_NOT_PROVIDED (0),
+ ECF_ADDRESS_PROVIDED (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originating-IOI (839) 3GPP (10415)
+// 7.2.123
+type AVP_UTF8String Originating_IOI;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originator (864) 3GPP (10415)
+// 7.2.124
+type enumerated Originator
+{
+ CALLING_PARTY (0),
+ CALLED_PARTY (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originator-Address (886) 3GPP (10415)
+// 7.2.125
+type AVP_Grouped Originator_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originator-Interface (2009) 3GPP (10415)
+// 7.2.126
+type AVP_Grouped Originator_Interface;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originator-Received-Address (2027) 3GPP (10415)
+// 7.2.127
+type AVP_Grouped Originator_Received_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Originating-SCCP-Address (2008) 3GPP (10415)
+// 7.2.128
+type AVP_Address Originating_SCCP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Outgoing-Session-Id (2320) 3GPP (10415)
+// 7.2.128A
+type AVP_UTF8String Outgoing_Session_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Outgoing-Trunk-Group-Id (853) 3GPP (10415)
+// 7.2.129
+type AVP_UTF8String Outgoing_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Participants-Involved (887) 3GPP (10415)
+// 7.2.130
+type AVP_UTF8String Participants_Involved;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Participant-Group (1260) 3GPP (10415)
+// 7.2.131
+type AVP_Grouped Participant_Group;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Participant-Access-Priority (1259) 3GPP (10415)
+// 7.2.132
+type enumerated Participant_Access_Priority
+{
+ PRE_EMPTIVE_PRIORITY (1),
+ HIGH_PRIORITY (2),
+ NORMAL_PRIORITY (3),
+ LOW_PRIORITY (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Participant-Action-Type (2049) 3GPP (10415)
+// 7.2.133
+type enumerated Participant_Action_Type
+{
+ CREATE_CONF (0),
+ JOIN_CONF (1),
+ INVITE_INTO_CONF (2),
+ QUIT_CONF (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PC3-Control-Protocol-Cause (3434) 3GPP (10415)
+// 7.2.135A
+type AVP_Integer32 PC3_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PC3-EPC-Control-Protocol-Cause (3435) 3GPP (10415)
+// 7.2.135B
+type AVP_Integer32 PC3_EPC_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PDN-Connection-Charging-ID (2050) 3GPP (10415)
+// 7.2.136
+type AVP_Unsigned32 PDN_Connection_Charging_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PDP-Address (1227) 3GPP (10415)
+// 7.2.137
+type AVP_Address PDP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PDP-Address-Prefix-Length (2606) 3GPP (10415)
+// 7.2.137A
+type AVP_Unsigned32 PDP_Address_Prefix_Length;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PDP-Context-Type (1247) 3GPP (10415)
+// 7.2.138
+type enumerated PDP_Context_Type
+{
+ PRIMARY (0),
+ SECONDARY (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Play-Alternative (3913) 3GPP (10415)
+// 7.2.138A
+type enumerated Play_Alternative
+{
+ SERVED_PARTY (0),
+ REMOTE_PARTY (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Change-Conditions (1261) 3GPP (10415)
+// 7.2.139
+type enumerated PoC_Change_Conditions
+{
+ SERVICE_CHANGE (0),
+ VOLUME_LIMIT (1),
+ TIME_LIMIT (2),
+ NUMBER_OF_TALK_BURST_LIMIT (3),
+ NUMBER_OF_ACTIVE_PARTICIPANTS (4),
+ TARIFF_TIME (5)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Change-Time (1262) 3GPP (10415)
+// 7.2.140
+type AVP_Time PoC_Change_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Controlling-Address (858) 3GPP (10415)
+// 7.2.141
+type AVP_UTF8String PoC_Controlling_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Event-Type (2025) 3GPP (10415)
+// 7.2.142
+type enumerated PoC_Event_Type
+{
+ NORMAL (0),
+ INSTANT_PERSONAL_ALERT_EVENT (1),
+ POC_GROUP_ADVERTISEMENT_EVENT (2),
+ EARLY_SESSION_SETTING_UP_EVENT (3),
+ POC_TALK_BURST (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Group-Name (859) 3GPP (10415)
+// 7.2.143
+type AVP_UTF8String PoC_Group_Name;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Information (879) 3GPP (10415)
+// 7.2.144
+type AVP_Grouped PoC_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Server-Role (883) 3GPP (10415)
+// 7.2.145
+type enumerated PoC_Server_Role
+{
+ PARTICIPATING_POC_SERVER (0),
+ CONTROLLING_POC_SERVER (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Session-Id (1229) 3GPP (10415)
+// 7.2.146
+type AVP_UTF8String PoC_Session_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Session-Initiation-Type (1277) 3GPP (10415)
+// 7.2.147
+type enumerated PoC_Session_Initiation_Type
+{
+ PRE_ESTABLISHED (0),
+ ON_DEMAND (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-Session-Type (884) 3GPP (10415)
+// 7.2.148
+type enumerated PoC_Session_Type
+{
+ ONE_TO_ONE_POC_SESSION (0),
+ CHAT_POC_GROUP_SESSION (1),
+ PRE_ARRANGED_POC_GROUP_SESSION (2),
+ AD_HOC_POC_GROUP_SESSION (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-User-Role (1252) 3GPP (10415)
+// 7.2.149
+type AVP_Grouped PoC_User_Role;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-User-Role-IDs (1253) 3GPP (10415)
+// 7.2.150
+type AVP_UTF8String PoC_User_Role_IDs;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PoC-User-Role-info-Units (1254) 3GPP (10415)
+// 7.2.151
+type enumerated PoC_User_Role_info_Units
+{
+ MODERATOR (1),
+ DISPATCHER (2),
+ SESSION_OWNER (3),
+ SESSION_PARTICIPANT (4)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Positioning-Data (1245) 3GPP (10415)
+// 7.2.152
+type AVP_UTF8String Positioning_Data;
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Preferred-AoC-Currency (2315) 3GPP (10415)
+// 7.2.153
+type AVP_Unsigned32 Preferred_AoC_Currency;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Priority (1209) 3GPP (10415)
+// 7.2.154
+type enumerated Priority
+{
+ LOW (0),
+ NORMAL (1),
+ HIGH (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Privacy-Indicator (3915) 3GPP (10415)
+// 7.2.154aA
+type enumerated Privacy_Indicator
+{
+ NOT_PRIVATE (0),
+ PRIVATE (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-3rd-Party-Application-ID (3440) 3GPP (10415)
+// 7.2.154A
+type AVP_UTF8String ProSe_3rd_Party_Application_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Direct-Communication-Reception-Data-Container (3461) 3GPP (10415)
+// 7.2.154Aa
+type AVP_Grouped ProSe_Direct_Communication_Reception_Data_Container;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Direct-Communication-Transmission-Data-Container (3441) 3GPP (10415)
+// 7.2.154B
+type AVP_Grouped ProSe_Direct_Communication_Transmission_Data_Container;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Direct-Discovery-Model (3442) 3GPP (10415)
+// 7.2.154C
+type enumerated ProSe_Direct_Discovery_Model
+{
+ MODEL_A (0),
+ MODEL_B (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Event-Type (3443) 3GPP (10415)
+// 7.2.154D
+type enumerated ProSe_Event_Type
+{
+ ANNOUNCING (0),
+ MONITORING (1),
+ MATCH_REPORT (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Function-IP-Address (3444) 3GPP (10415)
+// 7.2.154E
+type AVP_Address ProSe_Function_IP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Function-PLMN-Identifier (3457) 3GPP (10415)
+// 7.2.154F
+type AVP_UTF8String ProSe_Function_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Functionality (3445) 3GPP (10415)
+// 7.2.154G
+type enumerated ProSe_Functionality
+{
+ DIRECT_DISCOVERY (0),
+ EPC_LEVEL_DISCOVERY (1),
+ DIRECT_COMMUNICATION (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Group-IP-Multicast-Address (3446) 3GPP (10415)
+// 7.2.154H
+type AVP_Address ProSe_Group_IP_Multicast_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Information (3447) 3GPP (10415)
+// 7.2.154I
+type AVP_Grouped ProSe_Information;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Range-Class (3448) 3GPP (10415)
+// 7.2.154J
+type AVP_Unsigned32 ProSe_Range_Class;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Reason-For-Cancellation (3449) 3GPP (10415)
+// 7.2.154K
+type enumerated ProSe_Reason_For_Cancellation
+{
+ PROXIMITY_ALERT_SENT (0),
+ TIME_EXPIRED_WITH_NO_RENEWAL (1),
+ REQUESTOR_CANCELLATION (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Request-Timestamp (3450) 3GPP (10415)
+// 7.2.154L
+type AVP_Time ProSe_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Role-Of-UE (3451) 3GPP (10415)
+// 7.2.154M
+type enumerated ProSe_Role_Of_UE
+{
+ ANNOUNCING_UE (0),
+ MONITORING_UE (1),
+ REQUESTOR_UE (2),
+ REQUESTED_UE (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-Source-IP-Address (3452) 3GPP (10415)
+// 7.2.154N
+type AVP_Address ProSe_Source_IP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: ProSe-UE-ID (3453) 3GPP (10415)
+// 7.2.154O
+type AVP_OctetString ProSe_UE_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Proximity-Alert-Indication (3454) 3GPP (10415)
+// 7.2.154P
+type enumerated Proximity_Alert_Indication
+{
+ ALERT (0),
+ NO_ALERT (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Proximity-Alert-Timestamp (3455) 3GPP (10415)
+// 7.2.154Q
+type AVP_Time Proximity_Alert_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Proximity-Cancellation-Timestamp (3456) 3GPP (10415)
+// 7.2.154R
+type AVP_Time Proximity_Cancellation_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PS-Append-Free-Format-Data (867) 3GPP (10415)
+// 7.2.155
+type enumerated PS_Append_Free_Format_Data
+{
+ APPEND (0),
+ OVERWRITE (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PS-Free-Format-Data (866) 3GPP (10415)
+// 7.2.156
+type AVP_OctetString PS_Free_Format_Data;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PS-Furnish-Charging-Information (865) 3GPP (10415)
+// 7.2.157
+type AVP_Grouped PS_Furnish_Charging_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: PS-Information (874) 3GPP (10415)
+// 7.2.158
+type AVP_Grouped PS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Quota-Consumption-Time (881) 3GPP (10415)
+// 7.2.159
+type AVP_Unsigned32 Quota_Consumption_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Quota-Holding-Time (871) 3GPP (10415)
+// 7.2.160
+type AVP_Unsigned32 Quota_Holding_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Quota-Indicator (3912) 3GPP (10415)
+// 7.2.160aA
+type enumerated Quota_Indicator
+{
+ QUOTA_IS_NOT_USED_DURING_PLAYBACK (0),
+ QUOTA_IS_USED_DURING_PLAYBACK (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Radio-Frequency (3462) 3GPP (10415)
+// 7.2.160A
+type AVP_OctetString Radio_Frequency;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Radio-Parameter-Set-Info (3463) 3GPP (10415)
+// 7.2.160B
+type AVP_Grouped Radio_Parameter_Set_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Radio-Parameter-Set-Values (3464) 3GPP (10415)
+// 7.2.160C
+type AVP_OctetString Radio_Parameter_Set_Values;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Radio-Resources-Indicator (3465) 3GPP (10415)
+// 7.2.160D
+type AVP_Integer32 Radio_Resources_Indicator;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Rate-Element (2058) 3GPP (10415)
+// 7.2.161
+type AVP_Grouped Rate_Element;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Read-Reply-Report-Requested (1222) 3GPP (10415)
+// 7.2.162
+type enumerated Read_Reply_Report_Requested
+{
+ NO (0),
+ YES (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Real-Time-Tariff-Information (2305) 3GPP (10415)
+// 7.2.164
+type AVP_Grouped Real_Time_Tariff_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Reason-Header (3401) 3GPP (10415)
+// 7.2.164A
+type AVP_UTF8String Reason_Header;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Received-Talk-Burst-Time (1284) 3GPP (10415)
+// 7.2.165
+type AVP_Unsigned32 Received_Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Received-Talk-Burst-Volume (1285) 3GPP (10415)
+// 7.2.166
+type AVP_Unsigned32 Received_Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Recipient-Address (1201) 3GPP (10415)
+// 7.2.167
+type AVP_Grouped Recipient_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Recipient-Info (2026) 3GPP (10415)
+// 7.2.168
+type AVP_Grouped Recipient_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Recipient-Received-Address (2028) 3GPP (10415)
+// 7.2.169
+type AVP_Grouped Recipient_Received_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Recipient-SCCP-Address (2010) 3GPP (10415)
+// 7.2.170
+type AVP_Address Recipient_SCCP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Refund-Information (2022) 3GPP (10415)
+// 7.2.171
+type AVP_OctetString Refund_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Relationship-Mode (2706) 3GPP (10415)
+// 7.2.171A
+type enumerated Relationship_Mode
+{
+ Trusted (0),
+ Non_Trusted (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Related-IMS-Charging-Identifier (2711) 3GPP (10415)
+// 7.2.171B
+type AVP_UTF8String Related_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Related-IMS-Charging-Identifier-Node (2712) 3GPP (10415)
+// 7.2.171C
+type AVP_Address Related_IMS_Charging_Identifier_Node;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Remaining-Balance (2021) 3GPP (10415)
+// 7.2.172
+type AVP_Grouped Remaining_Balance;
+
+// 3GPP TS 32.299 V8.5.0
+// AVP: Reply-Applic-ID (1223) 3GPP (10415)
+// 7.2.173
+type AVP_UTF8String Reply_Applic_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Reply-Path-Requested (2011) 3GPP (10415)
+// 7.2.174
+type enumerated Reply_Path_Requested
+{
+ NO_REPLY_PATH_SET (0),
+ REPLY_PATH_SET (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Reporting-Reason (872) 3GPP (10415)
+// 7.2.175
+type enumerated Reporting_Reason
+{
+ THRESHOLD (0),
+ QHT (1),
+ FINAL (2),
+ QUOTA_EXHAUSTED (3),
+ VALIDITY_TIME (4),
+ OTHER_QUOTA_TYPE (5),
+ RATING_CONDITION_CHANGE (6),
+ FORCED_REAUTHORISATION (7),
+ POOL_EXHAUSTED (8)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Requested-Party-Address (1251) 3GPP (10415)
+// 7.2.176
+type AVP_UTF8String Requested_Party_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Requested-PLMN-Identifier (3436) 3GPP (10415)
+// 7.2.176A
+type AVP_UTF8String Requested_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Requestor-PLMN-Identifier (3437) 3GPP (10415)
+// 7.2.176B
+type AVP_UTF8String Requestor_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Role-Of-Node (829) 3GPP (10415)
+// Note: not compatible with V9.2.0 or before (see spec.)
+// 7.2.177
+type enumerated Role_Of_Node
+{
+ ORIGINATING_ROLE (0),
+ TERMINATING_ROLE (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Role-Of-ProSe-Function (3438) 3GPP (10415)
+// 7.2.177aA
+type enumerated Role_Of_ProSe_Function
+{
+ HPLMN (0),
+ VPLMN (1),
+ LOCAL_PLMN (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Route-Header-Received (3403) 3GPP (10415)
+// 7.2.177A
+type AVP_UTF8String Route_Header_Received;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Route-Header-Transmitted (3404) 3GPP (10415)
+// 7.2.177B
+type AVP_UTF8String Route_Header_Transmitted;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Scale-Factor (2059) 3GPP (10415)
+// 7.2.178
+type AVP_Grouped Scale_Factor;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Answer-Timestamp (1275) 3GPP (10415)
+// 7.2.179
+type AVP_Time SDP_Answer_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Media-Component (843) 3GPP (10415)
+// 7.2.180
+type AVP_Grouped SDP_Media_Component;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Media-Description (845) 3GPP (10415)
+// 7.2.181
+type AVP_UTF8String SDP_Media_Description;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Media-Name (844) 3GPP (10415)
+// 7.2.182
+type AVP_UTF8String SDP_Media_Name;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Offer-Timestamp (1274) 3GPP (10415)
+// 7.2.183
+type AVP_Time SDP_Offer_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Session-Description (842) 3GPP (10415)
+// 7.2.184
+type AVP_UTF8String SDP_Session_Description;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-TimeStamps (1273) 3GPP (10415)
+// 7.2.185
+type AVP_Grouped SDP_TimeStamps;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SDP-Type (2036) 3GPP (10415)
+// 7.2.186
+type enumerated SDP_Type
+{
+ SDP_OFFER (0),
+ SDP_ANSWER (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Session-Direction (2707) 3GPP (10415)
+// 7.2.186A
+type enumerated Session_Direction
+{
+ Inbound (0),
+ Outbound (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Served-Party-IP-Address (848) 3GPP (10415)
+// 7.2.187
+type AVP_Address Served_Party_IP_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Data-Container (2040) 3GPP (10415)
+// 7.2.189
+type AVP_Grouped Service_Data_Container;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Id (855) 3GPP (10415)
+// 7.2.190
+type AVP_UTF8String Service_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Generic-Information (1256) 3GPP (10415)
+// 7.2.191
+type AVP_Grouped Service_Generic_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Information (873) 3GPP (10415)
+// 7.2.192
+type AVP_Grouped Service_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Mode (2032) 3GPP (10415)
+// 7.2.193
+type AVP_Unsigned32 Service_Mode;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Specific-Data (863) 3GPP (10415)
+// 7.2.194
+type AVP_UTF8String Service_Specific_Data;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Specific-Info (1249) 3GPP (10415)
+// 7.2.195
+type AVP_Grouped Service_Specific_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Service-Specific-Type (1257) 3GPP (10415)
+// 7.2.196
+type AVP_Unsigned32 Service_Specific_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Serving-Node-Type (2047) 3GPP (10415)
+// 7.2.198
+type enumerated Serving_Node_Type
+{
+ SGSN (0),
+ PMIPSGW (1),
+ GTPSGW (2),
+ ePDG (3),
+ hSGW (4),
+ MME (5),
+ TWAN (6)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SGSN-Address (1228) 3GPP (10415)
+// 7.2.199
+type AVP_Address SGSN_Address;
+
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SGW-Address (2067) 3GPP (10415)
+// 7.2.199A
+type AVP_Address SGW_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SGW-Change (2065) 3GPP (10415)
+// 7.2.200
+type enumerated SGW_Change
+{
+ ACR_Start_NOT_due_to_SGW_Change (0),
+ ACR_Start_due_to_SGW_Change (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SIP-Method (824) 3GPP (10415)
+// 7.2.201
+type AVP_UTF8String SIP_Method;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SIP-Request-Timestamp (834) 3GPP (10415)
+// 7.2.202
+type AVP_Time SIP_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SIP-Request-Timestamp-Fraction (2301) 3GPP (10415)
+// 7.2.203
+type AVP_Unsigned32 SIP_Request_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SIP-Response-Timestamp (835) 3GPP (10415)
+// 7.2.204
+type AVP_Time SIP_Response_Timestamp;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SIP-Response-Timestamp-Fraction (2302) 3GPP (10415)
+// 7.2.205
+type AVP_Unsigned32 SIP_Response_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Device-Trigger-Indicator (3407) 3GPP (10415)
+// 7.2.205A
+type enumerated SM_Device_Trigger_Indicator
+{
+ Not_Device_Trigger (0),
+ Device_Trigger (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Device-Trigger-Information (3405) 3GPP (10415)
+// 7.2.205B
+type AVP_Grouped SM_Device_Trigger_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Discharge-Time (2012) 3GPP (10415)
+// 7.2.206
+type AVP_Time SM_Discharge_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Message-Type (2007) 3GPP (10415)
+// 7.2.207
+type enumerated SM_Message_Type
+{
+ SUBMISSION (0),
+ DELIVERY_REPORT (1),
+ SM_SERVICE_REQUEST (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Protocol-ID (2013) 3GPP (10415)
+// 7.2.208
+type AVP_OctetString SM_Protocol_ID;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Sequence-Number (3408) 3GPP (10415)
+// 7.2.208A
+type AVP_Unsigned32 SM_Sequence_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Status (2014) 3GPP (10415)
+// 7.2.209
+type AVP_OctetString SM_Status;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-User-Data-Header (2015) 3GPP (10415)
+// 7.2.210
+type AVP_OctetString SM_User_Data_Header;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SMS-Information (2000) 3GPP (10415)
+// 7.2.211
+type AVP_Grouped SMS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SMS-Node (2016) 3GPP (10415)
+// 7.2.212
+type enumerated SMS_Node
+{
+ SMS_ROUTER (0),
+ IP_SM_GW (1),
+ SMS_ROUTER_AND_IP_SM_GW (2),
+ SMS_SC (3)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SMS-Result (3409) 3GPP (10415)
+// 7.2.212A
+type AVP_Unsigned32 SMS_Result;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.4.0
+// AVP: SM-Service-Type (2029) 3GPP (10415)
+// 7.2.213
+type AVP_Unsigned32 SM_Service_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: SMSC-Address (2017) 3GPP (10415)
+// 7.2.214
+type AVP_Address SMSC_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Start-Of-Charging (3419) 3GPP (10415)
+// 7.2.214A
+type AVP_Time Start_Of_Charging;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Start-Time (2041) 3GPP (10415)
+// 7.2.215
+type AVP_Time Start_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Status-AS-Code (2702) 3GPP (10415)
+// 7.2.215A
+type enumerated Status_AS_Code
+{
+ code_4xx (0),
+ code_5xx (1),
+ Timeout (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Stop-Time (2042) 3GPP (10415)
+// 7.2.216
+type AVP_Time Stop_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Submission-Time (1202) 3GPP (10415)
+// 7.2.217
+type AVP_Time Submission_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Subscriber-Role (2033) 3GPP (10415)
+// 7.2.218
+type enumerated Subscriber_Role
+{
+ ORIGINATING (0),
+ TERMINATING (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Supplementary-Service (2048) 3GPP (10415)
+// 7.2.219
+type AVP_Grouped Supplementary_Service;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: TAD-Identifier (2717) 3GPP (10415)
+// 7.2.219A
+type enumerated TAD_Identifier
+{
+ CS (0),
+ PS (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Talk-Burst-Exchange (1255) 3GPP (10415)
+// 7.2.220
+type AVP_Grouped Talk_Burst_Exchange;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Talk-Burst-Time (1286) 3GPP (10415)
+// 7.2.221
+type AVP_Unsigned32 Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Talk-Burst-Volume (1287) 3GPP (10415)
+// 7.2.222
+type AVP_Unsigned32 Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Tariff-Information (2060) 3GPP (10415)
+// 7.2.223
+type AVP_Grouped Tariff_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Tariff-XML (2306) 3GPP (10415)
+// 7.2.224
+type AVP_UTF8String Tariff_XML;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Teleservice (3413) 3GPP (10415)
+//
+type AVP_OctetString Teleservice;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Terminating-IOI (840) 3GPP (10415)
+// 7.2.225
+type AVP_UTF8String Terminating_IOI;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-First-Reception (3466) 3GPP (10415)
+// 7.2.225A
+type AVP_Time Time_First_Reception;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-First-Transmission (3467) 3GPP (10415)
+// 7.2.225B
+type AVP_Time Time_First_Transmission;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-First-Usage (2043) 3GPP (10415)
+// 7.2.226
+type AVP_Time Time_First_Usage;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Indicator (3911) 3GPP (10415)
+// 7.2.226A
+type AVP_Unsigned32 Time_Indicator;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Last-Usage (2044) 3GPP (10415)
+// 7.2.227
+type AVP_Time Time_Last_Usage;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Quota-Mechanism (1270) 3GPP (10415)
+// 7.2.228
+type AVP_Grouped Time_Quota_Mechanism;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Quota-Threshold (868) 3GPP (10415)
+// 7.2.229
+type AVP_Unsigned32 Time_Quota_Threshold;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Quota-Type (1271) 3GPP (10415)
+// 7.2.230
+type enumerated Time_Quota_Type
+{
+ DISCRETE_TIME_PERIOD (0),
+ CONTINUOUS_TIME_PERIOD (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Stamps (833) 3GPP (10415)
+// 7.2.231
+type AVP_Grouped Time_Stamps;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Time-Usage (2045) 3GPP (10415)
+// 7.2.232
+type AVP_Unsigned32 Time_Usage;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Traffic-Data-Volumes (2046) 3GPP (10415)
+// 7.2.233
+type AVP_Grouped Traffic_Data_Volumes;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Transcoder-Inserted-Indication (2605) 3GPP (10415)
+// 7.2.233A
+type enumerated Transcoder_Inserted_Indication
+{
+ TRANSCODER_NOT_INSERTED (0),
+ TRANSCODER_INSERTED (1)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Transit-IOI-List (2701) 3GPP (10415)
+// 7.2.233B
+type AVP_UTF8String Transit_IOI_List;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Transmitter-Info (3468) 3GPP (10415)
+// 7.2.233C
+type AVP_Grouped Transmitter_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Token-Text (1215) 3GPP (10415)
+// 7.2.234
+type AVP_UTF8String Token_Text;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Trigger (1264) 3GPP (10415)
+// 7.2.235
+type AVP_Grouped Trigger;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Trigger-Type (870) 3GPP (10415)
+// 7.2.236
+type enumerated Trigger_Type
+{
+ CHANGE_IN_SGSN_IP_ADDRESS (1),
+ CHANGE_IN_QOS (2),
+ CHANGE_IN_LOCATION (3),
+ CHANGE_IN_RAT (4),
+ CHANGE_IN_UE_TIMEZONE (5),
+ CHANGEINQOS_TRAFFIC_CLASS (10),
+ CHANGEINQOS_RELIABILITY_CLASS (11),
+ CHANGEINQOS_DELAY_CLASS (12),
+ CHANGEINQOS_PEAK_THROUGHPUT (13),
+ CHANGEINQOS_PRECEDENCE_CLASS (14),
+ CHANGEINQOS_MEAN_THROUGHPUT (15),
+ CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK (16),
+ CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK (17),
+ CHANGEINQOS_RESIDUAL_BER (18),
+ CHANGEINQOS_SDU_ERROR_RATIO (19),
+ CHANGEINQOS_TRANSFER_DELAY (20),
+ CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY (21),
+ CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK (22),
+ CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK (23),
+ CHANGEINQOS_APN_AGGREGATE_MAXIMUM_BIT_RATE (24),
+ CHANGEINLOCATION_MCC (30),
+ CHANGEINLOCATION_MNC (31),
+ CHANGEINLOCATION_RAC (32),
+ CHANGEINLOCATION_LAC (33),
+ CHANGEINLOCATION_CellId (34),
+ CHANGEINLOCATION_TAC (35),
+ CHANGEINLOCATION_ECGI (36),
+ CHANGE_IN_MEDIA_COMPOSITION (40),
+ CHANGE_IN_PARTICIPANTS_NMB (50),
+ CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB (51),
+ CHANGE_IN_USER_PARTICIPATING_TYPE (52),
+ CHANGE_IN_SERVICE_CONDITION (60),
+ CHANGE_IN_SERVING_NODE (61),
+ CHANGE_IN_USER_CSG_INFORMATION (70),
+ CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION (71),
+ CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION (72),
+ CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA (73)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Trunk-Group-Id (851) 3GPP (10415)
+// 7.2.237
+type AVP_Grouped Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: TWAG-Address (3903) 3GPP (10415)
+// 7.2.237Ba
+type AVP_Address TWAG_Address;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: TWAN-User-Location-Info (2714) 3GPP (10415)
+// 7.2.237C
+type AVP_Grouped TWAN_User_Location_Info;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.4.0
+// AVP: Type-Number (1204) 3GPP (10415)
+// 7.2.238
+type AVP_Unsigned32 Type_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Unit-Cost (2061) 3GPP (10415)
+// 7.2.239
+type AVP_Grouped Unit_Cost;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Unit-Quota-Threshold (1226) 3GPP (10415)
+// 7.2.240
+type AVP_Unsigned32 Unit_Quota_Threshold;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: User-CSG-Information (2319) 3GPP (10415)
+// 7.2.240A
+type AVP_Grouped User_CSG_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Usage-Information-Report-Sequence-Number (3439) 3GPP (10415)
+// 7.2.240B
+type AVP_Integer32 Usage_Information_Report_Sequence_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: User-Participating-Type (1279) 3GPP (10415)
+// 7.2.241
+type enumerated User_Participating_Type
+{
+ NORMAL (0),
+ NW_POC_BOX (1),
+ UE_POC_BOX (2)
+}
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: User-Session-Id (830) 3GPP (10415)
+// 7.2.242
+type AVP_UTF8String User_Session_Id;
+
+// 3GPP TS 32.299 V13.4.0 CR0716
+// AVP: UWAN-User-Location-Info (3918) 3GPP (10415)
+// 7.2.242aaA
+type AVP_Grouped UWAN_User_Location_Info;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Variable-Part (3907) 3GPP (10415)
+// 7.2.242aA
+type AVP_Grouped Variable_Part;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Variable-Part-Order (3908) 3GPP (10415)
+// 7.2.242aB
+type AVP_Unsigned32 Variable_Part_Order;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Variable-Part-Type (3909) 3GPP (10415)
+// 7.2.242aC
+type AVP_Unsigned32 Variable_Part_Type;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Variable-Part-Value (3910) 3GPP (10415)
+// 7.2.242aD
+type AVP_UTF8String Variable_Part_Value;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: VCS-Information (3410) 3GPP (10415)
+// 7.2.242A
+type AVP_Grouped VCS_Information;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: VLR-Number (3420) 3GPP (10415)
+// 7.2.242B
+type AVP_OctetString VLR_Number;
+
+// 3GPP TS 32.299 V13.4.0
+// AVP: Volume-Quota-Threshold (869) 3GPP (10415)
+// 7.2.243
+type AVP_Unsigned32 Volume_Quota_Threshold;
+
+
diff --git a/src/CreditControl_IETF_RFC4006.ddf b/src/CreditControl_IETF_RFC4006.ddf
index fe38d5b6735d71c443cf7cbd9df4e48618a12ef3..54b21c18514f61f96f07d8656aaa9826e2d2208d 100644
--- a/src/CreditControl_IETF_RFC4006.ddf
+++ b/src/CreditControl_IETF_RFC4006.ddf
@@ -37,7 +37,7 @@
//
// File: CreditControl_IETF_RFC4006.ddf
// Description: DDF for DCC according to RFC 4006
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 1134 62
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_3GPP_TS29229_6a0.ddf b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
index 4271fd1c7ad4aaa980d31959e7bd567786bc031d..d2d0a253a828867b9132ec2f6a95da977e001cf0 100644
--- a/src/CxDxInterface_3GPP_TS29229_6a0.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
@@ -37,7 +37,7 @@
//
// File: CxDxInterface_3GPP_TS29229_6a0.ddf
// Description: DDF for CxDx according to 3GPP TS 29.229 V6.10.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_3GPP_TS29229_840.ddf b/src/CxDxInterface_3GPP_TS29229_840.ddf
index 721eae787fd0e92ec98b8dd06ab51c87e73f571c..2c8913066148a65db0479d8da3e10ad7478af4cd 100644
--- a/src/CxDxInterface_3GPP_TS29229_840.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_840.ddf
@@ -37,7 +37,7 @@
//
// File: CxDxInterface_3GPP_TS29229_840.ddf
// Description: DDF for CxDx according to 3GPP TS 29.229 V8.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_3GPP_TS29229_880.ddf b/src/CxDxInterface_3GPP_TS29229_880.ddf
index 451f48f95cfe3f6cbbf32532e04bf11b3026341f..1f7f27e906d0fcd544a3fccf9b96440e3323f3c0 100644
--- a/src/CxDxInterface_3GPP_TS29229_880.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_880.ddf
@@ -37,7 +37,7 @@
//
// File: CxDxInterface_3GPP_TS29229_880.ddf
// Description: DDF for CxDx according to 3GPP TS 29.229 V8.8.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_3GPP_TS29229_920.ddf b/src/CxDxInterface_3GPP_TS29229_920.ddf
index b21cc177d122419d87f782a01a94f1de8d737a6a..c96c6c356f3bff72fb55cb7e89b045a6e9d20ad0 100644
--- a/src/CxDxInterface_3GPP_TS29229_920.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_920.ddf
@@ -37,7 +37,7 @@
//
// File: CxDxInterface_3GPP_TS29229_880.ddf
// Description: DDF for CxDx according to 3GPP TS 29.229 V9.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_3GPP_TS29229_c30.ddf b/src/CxDxInterface_3GPP_TS29229_c30.ddf
index cbd01a01da86099ba2ccb000ac641fa4bd251d85..3e8a484477c12c7bc8883125d1740ee864961bba 100644
--- a/src/CxDxInterface_3GPP_TS29229_c30.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_c30.ddf
@@ -11,7 +11,7 @@
//
// File: CxDxInterface_3GPP_TS29229_c30.ddf
// Description: DDF for CxDx according to 3GPP TS 29.229 V12.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
index 44367a8101630f88cb7f0bab8baf6d53a474cc49..2ac2cb91cfc45624a342f74fda2958717202ce93 100644
--- a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
+++ b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
@@ -37,7 +37,7 @@
//
// File: EricssonProprietaryCxDx.ddf
// Description: DDF for Cx according to 1551-FAY 301 0059 Uen
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/DIAMETER_EncDec.cc b/src/DIAMETER_EncDec.cc
index be4a70ba867bea96abbca22c7fdaa4232974dc1d..cb532ffd2554e6db1ae94cf914b66f52ab1f9c14 100644
--- a/src/DIAMETER_EncDec.cc
+++ b/src/DIAMETER_EncDec.cc
@@ -37,7 +37,7 @@
//
// File: DIAMETER_EncDec.cc
// Description: Encoder/Decoder and external functions for DPMG
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
index c563824849abd7a8506959fb1b727457108f65de..ad23056f804151780042b0494203882599db12d5 100644
--- a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
+++ b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
@@ -11,7 +11,7 @@
//
// File: DelegatedIPv6Prefix_IETF_RFC4818.ddf
// Description: DDF for Delegated IPv6 Prefix to RFC 4818
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL113462
///////////////////////////////////////////////
diff --git a/src/DigestAuthentication_IETF_RFC5090.ddf b/src/DigestAuthentication_IETF_RFC5090.ddf
index c6beeee5a162f04df3823e27328b34f02a3593c3..3eb057dd2170a70ad3f4a1a6279795f55e59e6e0 100644
--- a/src/DigestAuthentication_IETF_RFC5090.ddf
+++ b/src/DigestAuthentication_IETF_RFC5090.ddf
@@ -37,7 +37,7 @@
//
// File: DigestAuthentication_IETF_RFC5090.ddf
// Description: DDF for DIGEST according to RFC 5090
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 1134 62
///////////////////////////////////////////////
diff --git a/src/EricssonSCAPv1_1553APR_10148.ddf b/src/EricssonSCAPv1_1553APR_10148.ddf
index 459cd0c45401b4813ebad2376ec50a50c125cd81..e4fd038fe247a6320d86dddd527769c8ca78bc26 100644
--- a/src/EricssonSCAPv1_1553APR_10148.ddf
+++ b/src/EricssonSCAPv1_1553APR_10148.ddf
@@ -37,7 +37,7 @@
//
// File: EricssonSCAPv1_1553APR_10148.ddf
// Description: DDF for SCAPv1 according to 2/1553-APR 101 48/2
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/Ericsson_Specific_AVPs.ddf b/src/Ericsson_Specific_AVPs.ddf
index 87226bffaf767402d3464c46794508b8f7d83cab..4eb8b5541e1a01068e13161da9936e2781831dab 100644
--- a/src/Ericsson_Specific_AVPs.ddf
+++ b/src/Ericsson_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
//
// File: Ericsson_Specific_AVPs.ddf
// Description: Ericsson specific AVP definitions
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
// Reference: http://snmp.ericsson.se/diameter-assignments.html
//
diff --git a/src/GiInterface_3GPP_TS29061_770.ddf b/src/GiInterface_3GPP_TS29061_770.ddf
index e947afe5cb8e769798b1d26fdd6b1fd45d7eb7fd..ee73d6decdb714a116f51d1e0a74d7a7696df82f 100644
--- a/src/GiInterface_3GPP_TS29061_770.ddf
+++ b/src/GiInterface_3GPP_TS29061_770.ddf
@@ -37,7 +37,7 @@
//
// File: GiInterface_3GPP_TS29061_770.ddf
// Description: DDF for Gi according to 3GPP TS 29.061 V7.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_810.ddf b/src/GiSGiInterface_3GPP_TS29061_810.ddf
index e0d14e52c0f53b5153dd6989d94a9c81ad1be323..de2d0a0039b010edc331645178c5292252158edd 100644
--- a/src/GiSGiInterface_3GPP_TS29061_810.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_810.ddf
@@ -37,7 +37,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_810.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V8.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_930.ddf b/src/GiSGiInterface_3GPP_TS29061_930.ddf
index a3470f8fdf7d3f69d3b5b42e5880707cc8c0281c..b235ed574cde9d94f71908a1178577adbb85bc64 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930.ddf
@@ -37,7 +37,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_930.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V9.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
index dc64e12205b6248b8247a8c2ac91e86d923f8469..2c66d7d396ece8ffefa9d44ebdc76fe71acf1088 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
@@ -37,7 +37,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V9.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_980.ddf b/src/GiSGiInterface_3GPP_TS29061_980.ddf
index f959532e5cdc0291db98590d28171d8dabce3ec2..bb1b03848fbdd9899ccb2acbcdb2ebb9add8b97f 100644
--- a/src/GiSGiInterface_3GPP_TS29061_980.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_980.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V9.8.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90.ddf b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
index ea7c973ec8094db0263d7a13f2ad027949f0260e..e0806aa86648be43a5c72e1c86192ad98b53cc3f 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
@@ -11,7 +11,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_b90.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
index 0322c28bd1cab71293c56a9de634326daae404e5..fdaf251ce61b34d8a08b4cc69e77bb63dc96dacb 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
@@ -11,7 +11,7 @@
//
// File: GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
// Description: DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_6f0.ddf b/src/GmbInterface_3GPP_TS29061_6f0.ddf
index b49aa0f1008dc0681cbd4f9257c20923e762372d..1278a1d6a60148c900b611c80c4e497a2159aa70 100644
--- a/src/GmbInterface_3GPP_TS29061_6f0.ddf
+++ b/src/GmbInterface_3GPP_TS29061_6f0.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_6f0.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V6.15.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_720.ddf b/src/GmbInterface_3GPP_TS29061_720.ddf
index 0d0cb26579167124d692e48c9c82271a2541f405..86e2f344351f4f3a81338c997942166e21d12c32 100644
--- a/src/GmbInterface_3GPP_TS29061_720.ddf
+++ b/src/GmbInterface_3GPP_TS29061_720.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_720.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V7.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_810.ddf b/src/GmbInterface_3GPP_TS29061_810.ddf
index ea5ae2b73f3375b234a4f9b5c6c2be6891febd5f..e4f54b493c080d0105f8e1c22082cb288fb78fc5 100644
--- a/src/GmbInterface_3GPP_TS29061_810.ddf
+++ b/src/GmbInterface_3GPP_TS29061_810.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_810.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V8.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_930.ddf b/src/GmbInterface_3GPP_TS29061_930.ddf
index e9a1c48291bbe7cca3fbb8e68d0e9f8615e6fe31..52d239f25500878fa06ccc33ecf52b02d6485469 100644
--- a/src/GmbInterface_3GPP_TS29061_930.ddf
+++ b/src/GmbInterface_3GPP_TS29061_930.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_930.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V9.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_970.ddf b/src/GmbInterface_3GPP_TS29061_970.ddf
index e13803b3fa74d5b9b1ac64504602fbf0d188cea6..709913f4845ebd4498f3f0e14af04daa679be379 100644
--- a/src/GmbInterface_3GPP_TS29061_970.ddf
+++ b/src/GmbInterface_3GPP_TS29061_970.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_970.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V9.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GmbInterface_3GPP_TS29061_980.ddf b/src/GmbInterface_3GPP_TS29061_980.ddf
index d46f0f4aa346b31f0494f9d82e9fb797f309a3b9..f3319a59f1f16ba81783c11da8f9994c93dc2998 100644
--- a/src/GmbInterface_3GPP_TS29061_980.ddf
+++ b/src/GmbInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
//
// File: GmbInterface_3GPP_TS29061_980.ddf
// Description: DDF for Gmb according to 3GPP TS 29.061 V9.8.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GqInterface_PC_3GPP_TS29209_670.ddf b/src/GqInterface_PC_3GPP_TS29209_670.ddf
index 33e14d3415ea68be44653fc7c73efc80aea6d72b..51cfb97d574d248cda6821bd765287930e32cffb 100644
--- a/src/GqInterface_PC_3GPP_TS29209_670.ddf
+++ b/src/GqInterface_PC_3GPP_TS29209_670.ddf
@@ -37,7 +37,7 @@
//
// File: GqInterface_PC_3GPP_TS29209_670.ddf
// Description: DDF for Gq according to 3GPP TS 29.209 V6.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GqInterface_S3_ETSI_TS183017_231.ddf b/src/GqInterface_S3_ETSI_TS183017_231.ddf
index f4a5ee1ca711030c22fbd9021de8aab941ac7422..861351d99f1741cd44cb45b89746209677d6e04e 100644
--- a/src/GqInterface_S3_ETSI_TS183017_231.ddf
+++ b/src/GqInterface_S3_ETSI_TS183017_231.ddf
@@ -37,7 +37,7 @@
//
// File: GqInterface_S3_ETSI_TS183017_231.ddf
// Description: DDF for Gq according to ETSI TS 183.017 V2.3.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_CRP_3GPP_TS29210_670.ddf b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
index ebc51e0cbc339b4106b2f22488328915a530c469..1d36e68cd446ee6a777a42887c537f3832a64913 100644
--- a/src/GxInterface_CRP_3GPP_TS29210_670.ddf
+++ b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_CRP_3GPP_TS29210_670.ddf
// Description: DDF for Gx according to 3GPP TS 29.210 V6.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_740.ddf b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
index 62f0cbfc641e58a163860c6db9b2cad16ad24143..ee4685e030feb8f87b9651049e9bf83f9c9cf54e 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_740.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_740.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V7.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_820.ddf b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
index 00ccf547a57e0a111d16c478b12ed2d438f6611e..ce1ee45c76a2256d85655357e209dbb946f50ac8 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_820.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_820.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V8.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_830.ddf b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
index 2c1e518d1ce138443f6427053df3b311a9fbcaa1..34e38510891ce3705595155b680e8fea706d3b2b 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_830.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_830.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V8.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_840.ddf b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
index d33f938dacbcb1c467796a0122ce3adba8da770b..bf2990061a2c76f07ce79512e173875e95bd4058 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_840.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_840.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V8.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
index 5e2d96eff2df6df1d335bdacda916ed164e77687..3186603a1dd9823e731e88fae6670b50c55c6355 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_8a0.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V8.10.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
index 6cd6ab7566fcb0966f78c78ff25fc90f3580b724..657c4f272523b88be77eebc7d47480596619cd41 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_8b1.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V8.11.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_910.ddf b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
index ffc5adacdf5af0a4de76e01dc88c34bf455cb396..4ad631b3216eaf0b1cf5745a524b24344dd30563 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_910.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_910.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V9.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_930.ddf b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
index f1bfa7dca8baa8c06b323aedb028729a1b50d3de..242e88d65d3a8bde639e5198c46f5fec8b04a50b 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_930.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_930.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V9.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_970.ddf b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
index 56676c62f565bf2c1f0084e86b382bc91e93c4fb..b5f9bdaacbf9f590a1cef6db032b7c29f0965e52 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_970.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_930.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V9.5.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
index 645c48109700cde468cb548314c25ab0809f69ed..3612fcdbdf44f5fd90d01b07e968abd7f0f298fd 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_9b0.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V9.11.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
index 573aa01998b8691ccf745048e714626c93475369..ca60fe00663e587ec4cf38208d659bc1f6c135cd 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_aa0.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V10.10.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
index aaa05329f1040eac92ebb543028cfce8aedefc19..ddd76625189511e2d1ddf4e7bba0c3f24385c577 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
@@ -37,7 +37,7 @@
//
// File: GxInterface_PCC_3GPP_TS29212_c52.ddf
// Description: DDF for Gx according to 3GPP TS 29.212 V12.5.2
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
@@ -738,7 +738,11 @@ type AVP_Grouped Redirect_Information;
// 3GPP TS 29.212 V12.5.2
// AVP: Redirect-Support (1086) 3GPP (10415)
// 5.3.83
-type AVP_Grouped Redirect_Support;
+type enumerated Redirect_Support
+{
+ REDIRECTION_DISABLED (0),
+ REDIRECTION_ENABLED (1)
+}
// 3GPP TS 29.212 V12.5.2
diff --git a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
index 434d070c40e180d47c8b006f7d3253cccd03453d..34279255e019f46d9d8a4c512ad758ca6afd7b90 100644
--- a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
+++ b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
@@ -37,7 +37,7 @@
//
// File: GxaInterface_3GPP2_X_S0057_0_300.ddf
// Description: DDF for Gxa according to 3GPP2 X.S0057-0 v3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/MobileIPv4_Application_IETF_RFC4004.ddf b/src/MobileIPv4_Application_IETF_RFC4004.ddf
index 38c778b1bff75d95ffeb7cf27a8ee298d1d22a7d..0be2b4654afc001924a03a29506a4aacd2d29396 100644
--- a/src/MobileIPv4_Application_IETF_RFC4004.ddf
+++ b/src/MobileIPv4_Application_IETF_RFC4004.ddf
@@ -37,7 +37,7 @@
//
// File: MobileIPv4_Application_IETF_RFC4004.ddf
// Description: DDF for Mobile IPv4 Application
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
// Reference: IETF RFC 4004
//
diff --git a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
index e32352100a6fa21d09cf438060c324e402e382a8..d89c3f718c69c12862090219f786ed868f694aeb 100644
--- a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
+++ b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
@@ -37,7 +37,7 @@
//
// File: MobileIPv6_HAAA_IETF_RFC5779.ddf
// Description: DDF for Mobile IPv6 according to RFC 5779
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL113462
///////////////////////////////////////////////
diff --git a/src/MobileIPv6_HA_IETF_RFC5778.ddf b/src/MobileIPv6_HA_IETF_RFC5778.ddf
index be316d64c8bf59ea74d3e9a521d4849c486c34b8..9f0f1dfaeb374d36ff8361c720052a9541de809d 100644
--- a/src/MobileIPv6_HA_IETF_RFC5778.ddf
+++ b/src/MobileIPv6_HA_IETF_RFC5778.ddf
@@ -37,7 +37,7 @@
//
// File: MobileIPv6_HA_IETF_RFC5778.ddf
// Description: DDF for Mobile IPv6 according to RFC 5778
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL113462
///////////////////////////////////////////////
diff --git a/src/MobileIPv6_NAS_IETF_RFC5447.ddf b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
index 924002c0206d93aa569084cfa985de8016b5a71a..c59ef9ee5e11f04ddf58ce903a7e9720c837cdfa 100644
--- a/src/MobileIPv6_NAS_IETF_RFC5447.ddf
+++ b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
@@ -37,7 +37,7 @@
//
// File: MobileIPv6_NAS_IETF_RFC5447.ddf
// Description: DDF for Mobile IPv6 according to RFC 5447
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL113462
///////////////////////////////////////////////
diff --git a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
index f82e619c346f23ba0c71df373f188bede175342f..af49d363b7b9d7bc1c2e762d016d57e9244fe1cf 100644
--- a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
+++ b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
@@ -37,7 +37,7 @@
//
// File: NGN_NetworkAccesses_ETSI_ES183020_111.ddf
// Description: DDF for NGN Network Accesses according to ETSI ES 183 020 V1.1.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/NetworkAccessServer_IETF_RFC4005.ddf b/src/NetworkAccessServer_IETF_RFC4005.ddf
index 970a3e0ca354024bc48175c9c55aacdac2c17a22..a4bfead723fa900fe862d33d9e53bb084dbad699 100644
--- a/src/NetworkAccessServer_IETF_RFC4005.ddf
+++ b/src/NetworkAccessServer_IETF_RFC4005.ddf
@@ -37,7 +37,7 @@
//
// File: NetworkAccessServer_IETF_RFC4005.ddf
// Description: DDF for NAS according to RFC 4005
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL113462
///////////////////////////////////////////////
diff --git a/src/RqInterface_ETSI_ES283026_241.ddf b/src/RqInterface_ETSI_ES283026_241.ddf
index 86a144e9a0de016287ad4247447e72be6e12ab8f..1a4055b8d9b5cb5a742e4d912963e75085896957 100644
--- a/src/RqInterface_ETSI_ES283026_241.ddf
+++ b/src/RqInterface_ETSI_ES283026_241.ddf
@@ -37,7 +37,7 @@
//
// File: RqInterface_ETSI_ES283026_241.ddf
// Description: DDF for Rq according to ETSI ES 283 026 V2.4.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
// AVP implementations according to:
diff --git a/src/RxInterface_PCC_3GPP_TS29214_830.ddf b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
index 7c2471a66eeb6ca85a615a795fc59ba651e5a899..f420dbececa5185cad04bdbf9684346304b826bc 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_830.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
@@ -37,7 +37,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_830.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 V8.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
index 28ea818efb52723df6645ae684511ec21ac80c82..b798cd46f3a0a9d1b86f61f73afed76bad460bf4 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
@@ -37,7 +37,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_830.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 V8.10.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/RxInterface_PCC_3GPP_TS29214_990.ddf b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
index 79b44c60bced7ad64a675ca83eee1ebddaaf8cbc..872d062cdd33f2f74768f2577963c7de367c38f0 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_990.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
@@ -37,7 +37,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_990.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 V9.9.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
index f37653a60f25e91efa3b01089b6a843101bfbb24..b2391647c307efc47f69d06de813049850522cd3 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
@@ -37,7 +37,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_a70.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 a.7.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
index 0a7df4fa2b1a61bf50c8923158a664d0c6f2d9b4..752267a9a8a74e2f6e6cefe80dec4b0f2a2da19f 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
@@ -37,7 +37,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_c10.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 c.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
index 411cd12d2d4f40078ebffe308bab410a1702b51e..d7bffcaf2286a13f82499121bf39e876c1db93d8 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
@@ -11,7 +11,7 @@
//
// File: RxInterface_PCC_3GPP_TS29214_d10.ddf
// Description: DDF for Rx according to 3GPP TS 29.214 d.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/S9Interface_3GPP_TS29215_b40.ddf b/src/S9Interface_3GPP_TS29215_b40.ddf
index 23d124f6fdf04b14a400aad004c6f094c2492cb7..3247f915a2fc5b03314c460d049a89fead1cce7a 100644
--- a/src/S9Interface_3GPP_TS29215_b40.ddf
+++ b/src/S9Interface_3GPP_TS29215_b40.ddf
@@ -37,7 +37,7 @@
//
// File: S9Interface_3GPP_TS29215_b40.ddf
// Description: DDF for S9 according to 3GPP TS 29.215 V11.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/SGmbInterface_3GPP_TS29061_940.ddf b/src/SGmbInterface_3GPP_TS29061_940.ddf
index 36eb760fda190200376824b02676f5bf7f0ad7e4..ed752f42cbc35c38845d5f29a796401bceb06e18 100644
--- a/src/SGmbInterface_3GPP_TS29061_940.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_940.ddf
@@ -37,7 +37,7 @@
//
// File: SGmbInterface_3GPP_TS29061_940.ddf
// Description: DDF for SGmb according to 3GPP TS 29.061 V9.4.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/SGmbInterface_3GPP_TS29061_980.ddf b/src/SGmbInterface_3GPP_TS29061_980.ddf
index 6297f0a1031c82ded533b01feb9ca709d45ca593..2454cc393e3e42af1bfe6ae0de3ac3e31c6f449d 100644
--- a/src/SGmbInterface_3GPP_TS29061_980.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
//
// File: SGmbInterface_3GPP_TS29061_980.ddf
// Description: DDF for SGmb according to 3GPP TS 29.061 V9.8.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/SGmbInterface_3GPP_TS29061_b90.ddf b/src/SGmbInterface_3GPP_TS29061_b90.ddf
index 302ef43e7f1f0a8ee6d00137f47d200425a2211f..c4059c374e569f1d288ce09bb9b7502bee7358bf 100644
--- a/src/SGmbInterface_3GPP_TS29061_b90.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_b90.ddf
@@ -11,7 +11,7 @@
//
// File: SGmbInterface_3GPP_TS29061_b90.ddf
// Description: DDF for SGmb according to 3GPP TS 29.061 V11.9.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/SKT_Specific_AVPs.ddf b/src/SKT_Specific_AVPs.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..bb9265cebe416b80ca7269e3c60dd180f9c4e7c6
--- /dev/null
+++ b/src/SKT_Specific_AVPs.ddf
@@ -0,0 +1,27 @@
+/******************************************************************************
+* Copyright (c) 2004, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Timea Moder - initial implementation and initial documentation
+******************************************************************************/
+//
+// File: SKT_Specific_AVPs.ddf
+// Description: SKT Specific AVP definitions
+// Rev: R40A
+// Prodnr: CNL 113 462
+
+
+// APPLICATION-NAME: SKT
+// APPLICATION-REVISION: 1
+
+// AVP implementations according to:
+// 109/0363-1/FCP111392-1 SUB-Feature Description SKT-Zone
+
+
+// Zone-Info
+// AVP: Zone-Info (9104) SKT (5806)
+type AVP_UTF8String Zone_Info;
diff --git a/src/SLgInterface_3GPP_TS29172_d10.ddf b/src/SLgInterface_3GPP_TS29172_d10.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..aac1b1f4836fe349b1c9128cd29e36e7fb9d15ee
--- /dev/null
+++ b/src/SLgInterface_3GPP_TS29172_d10.ddf
@@ -0,0 +1,384 @@
+/******************************************************************************
+* Copyright (c) 2004, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Gabor Szalai - initial implementation
+******************************************************************************/
+//
+// File: SLgInterface_3GPP_TS29172_d10.ddf
+// Description: DDF for SLg according to 3GPP TS 29.172 d.1.0
+// Rev: R40A
+// Prodnr: CNL 113 462
+///////////////////////////////////////////////
+
+
+
+// APPLICATION-NAME: SLg
+// APPLICATION-REVISION: V13_0_0
+
+// AVP implementations according to:
+// 3GPP TS 29.172 13.1.0 - Diameter-based SLg interface for Control Plane LCS
+//
+//
+// Dependant applications
+// IETF RFC 3588 - Diameter Base Protocol
+//
+// Notes:
+// Present application has its own vendor specific Diameter application id: 16777255
+//
+//
+
+// 3GPP TS 29.172 13.1.0 7.2
+type enumerated Command_Code
+{
+ Provide_Location (8388620),
+ Location_Report (8388621)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: SLg-Location-Type (2500) 3GPP (10415)
+// 7.4.2
+type enumerated SLg_Location_Type {
+ CURRENT_LOCATION (0),
+ CURRENT_OR_LAST_KNOWN_LOCATION (1),
+ INITIAL_LOCATION (2) ,
+ ACTIVATE_DEFERRED_LOCATION (3),
+ CANCEL_DEFERRED_LOCATION (4),
+ NOTIFICATION_VERIFICATION_ONLY (5)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-EPS-Client-Name (2501) 3GPP (10415)
+// 7.4.3
+type AVP_Grouped LCS_EPS_Client_Name;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Requestor-Name (2502) 3GPP (10415)
+// 7.4.4
+type AVP_Grouped LCS_Requestor_Name;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Priority (2503) 3GPP (10415)
+// 7.4.5
+type AVP_Unsigned32 LCS_Priority;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-QoS (2504) 3GPP (10415)
+// 7.4.6
+type AVP_Grouped LCS_QoS;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Horizontal-Accuracy (2505) 3GPP (10415)
+// 7.4.7
+type AVP_Unsigned32 Horizontal_Accuracy;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Vertical-Accuracy (2506) 3GPP (10415)
+// 7.4.8
+type AVP_Unsigned32 Vertical_Accuracy;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Vertical-Requested (2507) 3GPP (10415)
+// 7.4.9
+type enumerated Vertical_Requested {
+ VERTICAL_COORDINATE_IS_NOT_REQUESTED (0),
+ VERTICAL_COORDINATE_IS_REQUESTED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Velocity-Requested (2508) 3GPP (10415)
+// 7.4.10
+type enumerated Velocity_Requested {
+ VELOCITY_IS_NOT_REQUESTED (0),
+ VELOCITY_IS_REQUESTED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Response-Time (2509) 3GPP (10415)
+// 7.4.11
+type enumerated Response_Time {
+ LOW_DELAY (0),
+ DELAY_TOLERANT (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Supported-GAD-Shapes (2510) 3GPP (10415)
+// 7.4.12
+type AVP_Unsigned32 Supported_GAD_Shapes;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Codeword (2511) 3GPP (10415)
+// 7.4.13
+type AVP_UTF8String LCS_Codeword;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Privacy-Check (2512) 3GPP (10415)
+// 7.4.14
+type enumerated LCS_Privacy_Check {
+ ALLOWED_WITHOUT_NOTIFICATION (0),
+ ALLOWED_WITH_NOTIFICATION (1),
+ ALLOWED_IF_NO_RESPONSE (2),
+ RESTRICTED_IF_NO_RESPONSE (3),
+ NOT_ALLOWED (4)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Accuracy-Fulfilment-Indicator (2513) 3GPP (10415)
+// 7.4.15
+type enumerated Accuracy_Fulfilment_Indicator {
+ REQUESTED_ACCURACY_FULFILLED (0),
+ REQUESTED_ACCURACY_NOT_FULFILLED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Age-Of-Location-Estimate (2514) 3GPP (10415)
+// 7.4.16
+type AVP_Unsigned32 Age_Of_Location_Estimate;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Velocity-Estimate (2515) 3GPP (10415)
+// 7.4.17
+type AVP_OctetString Velocity_Estimate;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: EUTRAN-Positioning-Data (2516) 3GPP (10415)
+// 7.4.18
+type AVP_OctetString EUTRAN_Positioning_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: ECGI (2517) 3GPP (10415)
+// 7.4.19
+type AVP_OctetString ECGI;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Location-Event (2518) 3GPP (10415)
+// 7.4.20
+type enumerated Location_Event {
+ EMERGENCY_CALL_ORIGINATION (0),
+ EMERGENCY_CALL_RELEASE (1),
+ MO_LR (2),
+ EMERGENCY_CALL_HANDOVER (3),
+ DEFERRED_MT_LR_RESPONSE (4),
+ DEFERRED_MO_LR_TTTP_INITIATION (5),
+ DELAYED_LOCATION_REPORTING (6)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Pseudonym-Indicator (2519) 3GPP (10415)
+// 7.4.21
+type enumerated Pseudonym_Indicator {
+ PSEUDONYM_NOT_REQUESTED (0),
+ PSEUDONYM_REQUESTED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Service-Type-ID (2520) 3GPP (10415)
+// 7.4.22
+type AVP_Unsigned32 LCS_Service_Type_ID;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Privacy-Check-Non-Session (2521) 3GPP (10415)
+// 7.4.23
+type AVP_Grouped LCS_Privacy_Check_Non_Session;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Privacy-Check-Session (2522) 3GPP (10415)
+// 7.4.24
+type AVP_Grouped LCS_Privacy_Check_Session;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-QoS-Class (2523) 3GPP (10415)
+// 7.4.27
+type enumerated LCS_QoS_Class {
+ ASSURED (0),
+ BEST_EFFORT (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: GERAN-Positioning-Info (2524) 3GPP (10415)
+// 7.4.29
+type AVP_Grouped GERAN_Positioning_Info;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: GERAN-Positioning-Data (2525) 3GPP (10415)
+// 7.4.30
+type AVP_OctetString GERAN_Positioning_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: GERAN-GANSS-Positioning-Data (2526) 3GPP (10415)
+// 7.4.31
+type AVP_OctetString GERAN_GANSS_Positioning_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: UTRAN-Positioning-Info (2527) 3GPP (10415)
+// 7.4.32
+type AVP_Grouped UTRAN_Positioning_Info;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: UTRAN-Positioning-Data (2528) 3GPP (10415)
+// 7.4.33
+type AVP_OctetString UTRAN_Positioning_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: UTRAN-GANSS-Positioning-Data (2529) 3GPP (10415)
+// 7.4.34
+type AVP_OctetString UTRAN_GANSS_Positioning_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LRR-Flags (2530) 3GPP (10415)
+// 7.4.35
+type AVP_Unsigned32 LRR_Flags;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LCS-Reference-Number (2531) 3GPP (10415)
+// 7.4.37
+type AVP_OctetString LCS_Reference_Number;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Deferred-Location-Type (2532) 3GPP (10415)
+// 7.4.36
+type AVP_Unsigned32 Deferred_Location_Type;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Area-Event-Info (2533) 3GPP (10415)
+// 7.4.38
+type AVP_Grouped Area_Event_Info;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Area-Definition (2534) 3GPP (10415)
+// 7.4.39
+type AVP_Grouped Area_Definition;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Area (2535) 3GPP (10415)
+// 7.4.40
+type AVP_Grouped Area;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Area-Type (2536) 3GPP (10415)
+// 7.4.41
+type AVP_Unsigned32 Area_Type;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Area-Identification (2537) 3GPP (10415)
+// 7.4.42
+type AVP_Grouped Area_Identification;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Occurrence-Info (2538) 3GPP (10415)
+// 7.4.43
+type enumerated Occurrence_Info {
+ ONE_TIME_EVENT (0),
+ MULTIPLE_TIME_EVENT (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Interval-Time (2539) 3GPP (10415)
+// 7.4.44
+type AVP_Unsigned32 Interval_Time;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Periodic-LDR-Information (2540) 3GPP (10415)
+// 7.4.45
+type AVP_Grouped Periodic_LDR_Information;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Reporting-Amount (2541) 3GPP (10415)
+// 7.4.46
+type AVP_Unsigned32 Reporting_Amount;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Reporting-Interval (2542) 3GPP (10415)
+// 7.4.47
+type AVP_Unsigned32 Reporting_Interval;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Reporting-PLMN-List (2543) 3GPP (10415)
+// 7.4.48
+type AVP_Grouped Reporting_PLMN_List;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: PLMN-ID-List (2544) 3GPP (10415)
+// 7.4.49
+type AVP_Grouped PLMN_ID_List;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: PLR-Flags (2545) 3GPP (10415)
+// 7.4.52
+type AVP_Unsigned32 PLR_Flags;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: PLA-Flags (2546) 3GPP (10415)
+// 7.4.53
+type AVP_Unsigned32 PLA_Flags;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Deferred-MT-LR-Data (2547) 3GPP (10415)
+// 7.4.54
+type AVP_Grouped Deferred_MT_LR_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Termination-Cause (2548) 3GPP (10415)
+// 7.4.55
+type AVP_Unsigned32 Termination_Cause;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: LRA-Flags (2549) 3GPP (10415)
+// 7.4.56
+type AVP_Unsigned32 LRA_Flags;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Periodic-Location-Support-Indicator (2550) 3GPP (10415)
+// 7.4.50
+type enumerated Periodic_Location_Support_Indicator {
+ NOT_SUPPORTED (0),
+ SUPPORTED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Prioritized-List-Indicator (2551) 3GPP (10415)
+// 7.4.51
+type enumerated Prioritized_List_Indicator {
+ NOT_PRIORITIZED (0),
+ PRIORITIZED (1)
+}
+
+// 3GPP TS 29.172 13.1.0
+// AVP: ESMLC-Cell-Info (2552) 3GPP (10415)
+// 7.4.57
+type AVP_Grouped ESMLC_Cell_Info;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Cell-Portion-ID (2553) 3GPP (10415)
+// 7.4.58
+type AVP_Unsigned32 Cell_Portion_ID;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: 1xRTT-RCID (2554) 3GPP (10415)
+// 7.4.59
+type AVP_OctetString 1xRTT_RCID;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Delayed-Location-Reporting-Data (2555) 3GPP (10415)
+// 7.4.60
+type AVP_Grouped Delayed_Location_Reporting_Data;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Civic-Address (2556) 3GPP (10415)
+// 7.4.61
+type AVP_UTF8String Civic_Address;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: Barometric-Pressure (2557) 3GPP (10415)
+// 7.4.62
+type AVP_Unsigned32 Barometric_Pressure;
+
+// 3GPP TS 29.172 13.1.0
+// AVP: UTRAN-Additional-Positioning-Data (2558) 3GPP (10415)
+// 7.4.63
+type AVP_OctetString UTRAN_Additional_Positioning_Data;
+
diff --git a/src/SLhInterface_3GPP_TS29173_d00.ddf b/src/SLhInterface_3GPP_TS29173_d00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..57256b8ae3ef3d554708e5a3bd31cde2d4a381d9
--- /dev/null
+++ b/src/SLhInterface_3GPP_TS29173_d00.ddf
@@ -0,0 +1,103 @@
+/******************************************************************************
+* Copyright (c) 2004, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Gabor Szalai - initial implementation
+******************************************************************************/
+//
+// File: SLhInterface_3GPP_TS29173_d00.ddf
+// Description: DDF for SLh according to 3GPP TS 29.173 d.0.0
+// Rev: R40A
+// Prodnr: CNL 113 462
+///////////////////////////////////////////////
+
+
+
+// APPLICATION-NAME: SLh
+// APPLICATION-REVISION: V13_0_0
+
+// AVP implementations according to:
+// 3GPP TS 29.173 13.0.0 - Diameter-based SLh interface for Control Plane LCS
+//
+//
+// Dependant applications
+// IETF RFC 3588 - Diameter Base Protocol
+//
+// Notes:
+// Present application has its own vendor specific Diameter application id: 16777291
+//
+//
+
+// 3GPP TS 29.173 13.0.0 6.2.2
+type enumerated Command_Code
+{
+ LCS_Routing_Info (8388622)
+}
+
+// 3GPP TS 29.173 13.0.0
+// AVP: LMSI (2400) 3GPP (10415)
+// 6.4.2
+type AVP_OctetString LMSI;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: Serving-Node (2401) 3GPP (10415)
+// 6.4.3
+type AVP_Grouped Serving_Node;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: MME-Name (2402) 3GPP (10415)
+// 6.4.4
+type AVP_DiameterIdentity MME_Name;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: MSC-Number (2403) 3GPP (10415)
+// 6.4.5
+type AVP_OctetString MSC_Number;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: LCS-Capabilities-Sets (2404) 3GPP (10415)
+// 6.4.6
+type AVP_Unsigned32 LCS_Capabilities_Sets;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: GMLC-Address (2405) 3GPP (10415)
+// 6.4.7
+type AVP_Address GMLC_Address;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: Additional-Serving-Node (2406) 3GPP (10415)
+// 6.4.8
+type AVP_Grouped Additional_Serving_Node;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: PPR-Address (2407) 3GPP (10415)
+// 6.4.9
+type AVP_Address PPR_Address;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: MME-Realm (2408) 3GPP (10415)
+// 6.4.12
+type AVP_DiameterIdentity MME_Realm;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: SGSN-Name (2409) 3GPP (10415)
+// 6.4.13
+type AVP_DiameterIdentity SGSN_Name;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: SGSN-Realm (2410) 3GPP (10415)
+// 6.4.14
+type AVP_DiameterIdentity SGSN_Realm;
+
+// 3GPP TS 29.173 13.0.0
+// AVP: RIA-Flags (2411) 3GPP (10415)
+// 6.4.15
+type AVP_Unsigned32 RIA_Flags;
+
+
+
+
diff --git a/src/ShInterface_3GPP_TS29329_620.ddf b/src/ShInterface_3GPP_TS29329_620.ddf
index c9484c2f1ff6b94bdbdf4bb83799e5fc42718c47..1d76a9953908cf5e724a612302c0a7fc21f657cc 100644
--- a/src/ShInterface_3GPP_TS29329_620.ddf
+++ b/src/ShInterface_3GPP_TS29329_620.ddf
@@ -37,7 +37,7 @@
//
// File: ShInterface_3GPP_TS29329_620.ddf
// Description: DDF for Sh Interface according to 3GPP 29.329 v6.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ShInterface_3GPP_TS29329_750.ddf b/src/ShInterface_3GPP_TS29329_750.ddf
index d327c1413dddee923ba7cd612cbff0955b244efc..10c10e0a1d33b65b1de43bfff3127a6e4aac4fd0 100644
--- a/src/ShInterface_3GPP_TS29329_750.ddf
+++ b/src/ShInterface_3GPP_TS29329_750.ddf
@@ -37,7 +37,7 @@
//
// File: ShInterface_3GPP_TS29329_750.ddf
// Description: DDF for Sh Interface according to 3GPP 29.329 v7.5.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ShInterface_3GPP_TS29329_820.ddf b/src/ShInterface_3GPP_TS29329_820.ddf
index a484a5b2b882893b07e9c9b5ef987bb32cb0267c..c1bb8ebe44ab866c006be06f4572fa5e03550ce9 100644
--- a/src/ShInterface_3GPP_TS29329_820.ddf
+++ b/src/ShInterface_3GPP_TS29329_820.ddf
@@ -37,7 +37,7 @@
//
// File: ShInterface_3GPP_TS29329_820.ddf
// Description: DDF for Sh Interface according to 3GPP 29.329 v8.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ShInterface_3GPP_TS29329_a30.ddf b/src/ShInterface_3GPP_TS29329_a30.ddf
index 61d5bc8d93e7eb45f5affbf09543e77386a75808..4ad65a9e55bd360e6b5c284402b7cafb61190d59 100644
--- a/src/ShInterface_3GPP_TS29329_a30.ddf
+++ b/src/ShInterface_3GPP_TS29329_a30.ddf
@@ -37,7 +37,7 @@
//
// File: ShInterface_3GPP_TS29329_a30.ddf
// Description: DDF for Sh Interface according to 3GPP 29.329 v10.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/ShInterface_3GPP_TS29329_a50.ddf b/src/ShInterface_3GPP_TS29329_a50.ddf
index c0e2264645436a04de76c7846f9dc105347b2d14..94f4419a2e186779bad7c9517084fc4f9d61b781 100644
--- a/src/ShInterface_3GPP_TS29329_a50.ddf
+++ b/src/ShInterface_3GPP_TS29329_a50.ddf
@@ -37,7 +37,7 @@
//
// File: ShInterface_3GPP_TS29329_a50.ddf
// Description: DDF for Sh Interface according to 3GPP 29.329 v10.5.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/SyInterface_3GPP_TS29219_b30.ddf b/src/SyInterface_3GPP_TS29219_b30.ddf
index c2ebb58ce32dd1121bbcc6e1555be858bbaba0e0..9df4c5dd537da5c46f594032c68a9e0723067218 100644
--- a/src/SyInterface_3GPP_TS29219_b30.ddf
+++ b/src/SyInterface_3GPP_TS29219_b30.ddf
@@ -37,7 +37,7 @@
//
// File: SyInterface_3GPP_TS29219_b30.ddf
// Description: DDF for Sy Interface according to 3GPP 29.219 v11.3.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/TCOM_Specific_AVPs.ddf b/src/TCOM_Specific_AVPs.ddf
index 7cad6c898480d15903c71960e04e5cf885a21e2f..193055a4d7d74dbdfe9aba791a860ee878fc7e38 100644
--- a/src/TCOM_Specific_AVPs.ddf
+++ b/src/TCOM_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
//
// File: TCOM_Specific_AVPs.ddf
// Description: T-COM specific AVP definitions
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/Verizon_Specific_AVPs.ddf b/src/Verizon_Specific_AVPs.ddf
index bfa278c54c1ec3a7f898f0e2ede5b26a0d765d90..5f2c1481f625db334e9f1dc13068a7d6afa2c95f 100644
--- a/src/Verizon_Specific_AVPs.ddf
+++ b/src/Verizon_Specific_AVPs.ddf
@@ -23,7 +23,7 @@
* Gergely Futo
* Istvan Sandor
* Krisztian Pandi
-* Kulcsár Endre
+* Kulcsár Endre
* Laszlo Tamas Zeke
* Norbert Pinter
* Roland Gecse
@@ -37,7 +37,7 @@
//
// File: Verizon_Specific_AVPs.ddf
// Description: Verizon specific AVP definitions
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
@@ -63,3 +63,11 @@ type AVP_UTF8String Operator_String;
// Verizon Charging-Group-ID
// AVP: Charging-Group-ID (6069) Verizon (12951)
type AVP_UTF8String Charging_Group_ID;
+
+// Verizon Self-Activation-Status
+// AVP: Self-Activation-Status (6115) Verizon (12951)
+type AVP_Unsigned32 Self_Activation_Status;
+
+// Verizon PGW-Relocation-Indication
+// AVP: PGW-Relocation-Indication (6114) Verizon (12951)
+type AVP_Grouped PGW_Relocation_Indication;
diff --git a/src/Vimpelcom_Specific.ddf b/src/Vimpelcom_Specific.ddf
index 2c6a1dfebbbf155394d646031e9a1f41bb4d11db..e6af6c01fa5ed575992e8ae78d8ca52146543a17 100644
--- a/src/Vimpelcom_Specific.ddf
+++ b/src/Vimpelcom_Specific.ddf
@@ -37,7 +37,7 @@
//
// File: Vimpelcom_Specific.ddf
// Description: Vimpelcom specific AVPs
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/Vodafone_Specific.ddf b/src/Vodafone_Specific.ddf
index a3025b60bd0d33446d5bf169aedeb777442a2e15..082b87b1387ce57de9f436b7cf8fd0caa7fa01e0 100644
--- a/src/Vodafone_Specific.ddf
+++ b/src/Vodafone_Specific.ddf
@@ -37,7 +37,7 @@
//
// File: Vodafone_Specific.ddf
// Description: Vodafone specific AVPs
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
@@ -82,3 +82,48 @@ type AVP_Unsigned32 Remove_After_Timer_DL;
// AVP: Remove-After-Timer-UL (505) Vodafone (12645)
type AVP_Unsigned32 Remove_After_Timer_UL;
+// AVP: Announcement-Instructions (700) Vodafone (12645)
+type AVP_Grouped Announcement_Instructions;
+
+// AVP: Announcement-Number (701) Vodafone (12645)
+type AVP_Unsigned32 Announcement_Number;
+
+// AVP: Announcement-Order (702) Vodafone (12645)
+type AVP_Unsigned32 Announcement_Order;
+
+// Values from 5.2.11 - 11/155 19-AVA 901 18 - Diameter Online Charging in MTAS
+// AVP: Announcement-Prompt-Collect-Interruptible (709) Vodafone (12645)
+type enumerated Announcement_Prompt_Collect_Interruptible
+{
+ FALSE (0),
+ TRUE (1)
+}
+
+// AVP: Announcement-Prompt-Collect-MaxDigits (711) Vodafone (12645)
+type AVP_Unsigned32 Announcement_Prompt_Collect_MaxDigits;
+
+// AVP: Announcement-Prompt-Collect-MinDigits (710) Vodafone (12645)
+type AVP_Unsigned32 Announcement_Prompt_Collect_MinDigits;
+
+// AVP: Announcement-Prompt-Collect-Parameter (708) Vodafone (12645)
+type AVP_Grouped Announcement_Prompt_Collect_Parameter;
+
+// AVP: Announcement-Type (703) Vodafone (12645)
+type AVP_Unsigned32 Announcement_Type;
+
+// AVP: Announcement-Variable-Part (704) Vodafone (12645)
+type AVP_Grouped Announcement_Variable_Part;
+
+// AVP: Announcement-Variable-Part-Data (705) Vodafone (12645)
+type AVP_UTF8String Announcement_Variable_Part_Data;
+
+// Values from 5.2.18 - 11/155 19-AVA 901 18 - Diameter Online Charging in MTAS
+// AVP: Announcement-Variable-Part-Type (706) Vodafone (12645)
+type enumerated Announcement_Variable_Part_Type;
+{
+ INTEGER (0),
+ NUMBER (1),
+ TIME (2),
+ DATE (3),
+ PRICE (4)
+}
diff --git a/src/WgInterface_3GPP_TS29234_910.ddf b/src/WgInterface_3GPP_TS29234_910.ddf
index 408122050cdcb80a1948170288e8b80c6d0d3a14..331e2b4f4a68a655bbf23b2cf541d3e256eb666d 100644
--- a/src/WgInterface_3GPP_TS29234_910.ddf
+++ b/src/WgInterface_3GPP_TS29234_910.ddf
@@ -37,7 +37,7 @@
//
// File: WgInterface_3GPP_TS29234_910.ddf
// Description: DDF for 3GPP to WLAN interworking according to 3GPP TS 29.234 V9.1.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/a2Interface_ETSI_ES183059_1_211.ddf b/src/a2Interface_ETSI_ES183059_1_211.ddf
index fb9a30a504e5876ca5bc124032c4957009c42209..aab6565e7e124ed058997124fd02ba1048347442 100644
--- a/src/a2Interface_ETSI_ES183059_1_211.ddf
+++ b/src/a2Interface_ETSI_ES183059_1_211.ddf
@@ -37,7 +37,7 @@
//
// File: a2Interface_ETSI_ES183059_1_211.ddf
// Description: DDF for a2 Interface according to ETSI ES 183 059-1 V2.1.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/a4Interface_ETSI_ES183066_211.ddf b/src/a4Interface_ETSI_ES183066_211.ddf
index 994d336857d4969abe077953386b57d1f0eec4a2..23bc082483cbdbc6fb125fb0a436cad2dbf82fc4 100644
--- a/src/a4Interface_ETSI_ES183066_211.ddf
+++ b/src/a4Interface_ETSI_ES183066_211.ddf
@@ -37,7 +37,7 @@
//
// File: a4Interface_ETSI_ES183066_211.ddf
// Description: DDF for a4 Interface according to ETSI ES 183 066 V2.1.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/e2Interface_ETSI_ES283035_121.ddf b/src/e2Interface_ETSI_ES283035_121.ddf
index ecd82a5918b63f3c14afe8e47314a52ce27a651d..d04752664929ef644126ab06cab54f559305b924 100644
--- a/src/e2Interface_ETSI_ES283035_121.ddf
+++ b/src/e2Interface_ETSI_ES283035_121.ddf
@@ -37,7 +37,7 @@
//
// File: e2Interface_ETSI_ES283035_121.ddf
// Description: DDF for e2 Interface according to ETSI ES 283 035 V1.2.1
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
diff --git a/src/e4Interface_ETSI_ES283034_220.ddf b/src/e4Interface_ETSI_ES283034_220.ddf
index 403ed6bc48e102b14e67c93adb53e2fa4136505b..c085f834591a17edf62a6fc22551572f6b94fdb9 100644
--- a/src/e4Interface_ETSI_ES283034_220.ddf
+++ b/src/e4Interface_ETSI_ES283034_220.ddf
@@ -37,7 +37,7 @@
//
// File: e4Interface_ETSI_ES283034_220.ddf
// Description: DDF for e4 Interface according to ETSI ES 283 034 V2.2.0
-// Rev: R34A
+// Rev: R40A
// Prodnr: CNL 113 462
///////////////////////////////////////////////