changeset 1478:47ce98681bd7

Update to 3GPP TS 29.329 V15.2.0 (2019-09) Add Pre-paging-Supported,717,6.3.26,Enumerated,V,,,M,No Add Local-Time-Zone-Indication,718,6.3.27,Enumerated,V,,,M,No Add Call-Reference-Info,720,6.3.29,Grouped,V,,,M,No Add Call-Reference-Number,721,6.3.30,OctetString,V,,,M,No Add AS-Number,722,6.3.31,OctetString,V,,,M,No
author Luke Mewburn <luke@mewburn.net>
date Wed, 25 Mar 2020 18:11:12 +1100
parents 81d8d83a38a0
children c0aa1e66c12e
files extensions/dict_dcca_3gpp/dict_dcca_3gpp.c extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
diffstat 2 files changed, 128 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	Wed Mar 25 16:55:36 2020 +1100
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	Wed Mar 25 18:11:12 2020 +1100
@@ -8421,7 +8421,12 @@
 	};
 
 	/*==================================================================*/
-	/* 3GPP 29.329-b50 (11.5.0 2012.12.21)                              */
+	/* 3GPP TS 29.329 V15.2.0 (2019-09)                                 */
+	/* From 3GPP 29329-f20.doc                                          */
+	/*==================================================================*/
+
+	/*==================================================================*/
+	/* 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs */
 	/*==================================================================*/
 
 	/* User-Identity, Grouped, code 700, section 6.3.1                  */
@@ -8586,13 +8591,13 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
-	/* in 29.229                                                        */
-	/* Server-Name                                                      */
-	/* Supported-Features                                               */
-	/* Feature-List-ID                                                  */
-	/* Feature-List                                                     */
-	/* Supported-Applications                                           */
-	/* Public-Identity                                                  */
+	/* Note: Uses 3GPP TS 29.229 Server-Name.                           */
+	/* Note: Uses 3GPP TS 29.229 Supported-Features.                    */
+	/* Note: Uses 3GPP TS 29.229 Feature-List-ID.                       */
+	/* Note: Uses 3GPP TS 29.229 Feature-List.                          */
+	/* Note: Uses 3GPP TS 29.229 Supported-Applications.                */
+	/* Note: Uses 3GPP TS 29.229 Public-Identity.                       */
+
 	/* DSAI-Tag, OctetString, code 711, section 6.3.18                  */
 	{
 		struct dict_avp_data data = {
@@ -8606,12 +8611,10 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* in 29.229                                                        */
-	/* Wildcarded-Public-Identity                                       */
-	/* in 29.229                                                        */
-	/* Wildcarded-IMPU                                                  */
-	/* in 29.229                                                        */
-	/* Session-Priority                                                 */
+	/* Note: Uses 3GPP TS 29.229 Wildcarded-Public-Identity.            */
+	/* Note: Uses 3GPP TS 29.229 Wildcarded-IMPU.                       */
+	/* Note: Uses 3GPP TS 29.229 Session-Priority.                      */
+
 	/* One-Time-Notification, Enumerated, code 712, section 6.3.22      */
 	{
 		struct dict_avp_data data = {
@@ -8683,6 +8686,38 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
+	/* Pre-paging-Supported, Enumerated, code 717, section 6.3.26       */
+	{
+		struct dict_avp_data data = {
+			717,	/* Code */
+			10415,	/* Vendor */
+			"Pre-paging-Supported",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR,	/* Fixed flag values */
+			AVP_TYPE_INTEGER32	/* base type of data */
+		};
+		struct dict_object	*type;
+		struct dict_type_data	 tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/Pre-paging-Supported)", NULL, NULL, NULL };
+		CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type);
+		CHECK_dict_new(DICT_AVP, &data, type, NULL);
+	};
+
+	/* Local-Time-Zone-Indication, Enumerated, code 718, section 6.3.27 */
+	{
+		struct dict_avp_data data = {
+			718,	/* Code */
+			10415,	/* Vendor */
+			"Local-Time-Zone-Indication",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR,	/* Fixed flag values */
+			AVP_TYPE_INTEGER32	/* base type of data */
+		};
+		struct dict_object	*type;
+		struct dict_type_data	 tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/Local-Time-Zone-Indication)", NULL, NULL, NULL };
+		CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type);
+		CHECK_dict_new(DICT_AVP, &data, type, NULL);
+	};
+
 	/* UDR-Flags, Unsigned32, code 719, section 6.3.28                  */
 	{
 		struct dict_avp_data data = {
@@ -8696,6 +8731,45 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
+	/* Call-Reference-Info, Grouped, code 720, section 6.3.29           */
+	{
+		struct dict_avp_data data = {
+			720,	/* Code */
+			10415,	/* Vendor */
+			"Call-Reference-Info",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR,	/* Fixed flag values */
+			AVP_TYPE_GROUPED	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* Call-Reference-Number, OctetString, code 721, section 6.3.30     */
+	{
+		struct dict_avp_data data = {
+			721,	/* Code */
+			10415,	/* Vendor */
+			"Call-Reference-Number",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR,	/* Fixed flag values */
+			AVP_TYPE_OCTETSTRING	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* AS-Number, OctetString, code 722, section 6.3.31                 */
+	{
+		struct dict_avp_data data = {
+			722,	/* Code */
+			10415,	/* Vendor */
+			"AS-Number",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR,	/* Fixed flag values */
+			AVP_TYPE_OCTETSTRING	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
 	/*==================================================================*/
 	/* 3GPP 32.299-b80 (11.8.0 2013-07)                                 */
 	/*==================================================================*/
--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Wed Mar 25 16:55:36 2020 +1100
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Wed Mar 25 18:11:12 2020 +1100
@@ -765,41 +765,49 @@
 ,,,,,,,,
 @standard,3GPP TS 29.329,,,,,,,
 #=,,,,,,,,
-# 3GPP 29.329-b50 (11.5.0 2012.12.21),,,,,,,,
+# 3GPP TS 29.329 V15.2.0 (2019-09),,,,,,,,
+# From 3GPP 29329-f20.doc,,,,,,,,
+#=,,,,,,,,
+#,,,,,,,,
+#=,,,,,,,,
+# 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
-User-Identity,700,6.3.1,Grouped,"M,V",,,,N
-MSISDN,701,6.3.2,OctetString,"M,V",,,,N
+User-Identity,700,6.3.1,Grouped,"M, V",,,,No
+MSISDN,701,6.3.2,OctetString,"M, V",,,,No
 # Note: Name conflict with 3GPP TS 29.229 User-Data (606).,,,,,,,,
-User-Data-29.329,702,6.3.3,OctetString,"M,V",,,,N
-Data-Reference,703,6.3.4,Enumerated,"M,V",,,,N
-Service-Indication,704,6.3.5,OctetString,"M,V",,,,N
-Subs-Req-Type,705,6.3.6,Enumerated,"M,V",,,,N
-Requested-Domain,706,6.3.7,Enumerated,"M,V",,,,N
-Current-Location,707,6.3.8,Enumerated,"M,V",,,,N
-Identity-Set,708,6.3.10,Enumerated,V,,,M,N
-Expiry-Time,709,6.3.16,Time,V,,,M,N
-Send-Data-Indication,710,6.3.17,Enumerated,V,,,M,N
-# in 29.229,,,,,,,,
-# Server-Name,602,6.3.9,UTF8String,"M,V",,,,N
-# Supported-Features,628,6.3.11,Grouped,V,M,,,N
-# Feature-List-ID,629,6.3.12,Unsigned32,V,,,M,N
-# Feature-List,630,6.3.13,Unsigned32,V,,,M,N
-# Supported-Applications,631,6.3.14,Grouped,V,,,M,N
-# Public-Identity,601,6.3.15,UTF8String,"M,V",,,,N
-DSAI-Tag,711,6.3.18,OctetString,"M,V",,,,N
-# in 29.229,,,,,,,,
-# Wildcarded-Public-Identity,634,6.3.19,UTF8String,V,,,M,N
-# in 29.229,,,,,,,,
-# Wildcarded-IMPU,636,6.3.20,UTF8String,V,,,M,N
-# in 29.229,,,,,,,,
-# Session-Priority,650,6.3.21,Enumerated,V,,,M,N
-One-Time-Notification,712,6.3.22,Enumerated,V,,,M,N
-Requested-Nodes,713,6.3.7A,Unsigned32,V,,,M,N
-Serving-Node-Indication,714,6.3.23,Enumerated,V,,,M,N
-Repository-Data-ID,715,6.3.24,Grouped,V,,,M,N
-Sequence-Number,716,6.3.25,Unsigned32,V,,,M,N
-UDR-Flags,719,6.3.28,Unsigned32,V,,,M,N
+User-Data-29.329,702,6.3.3,OctetString,"M, V",,,,No
+Data-Reference,703,6.3.4,Enumerated,"M, V",,,,No
+Service-Indication,704,6.3.5,OctetString,"M, V",,,,No
+Subs-Req-Type,705,6.3.6,Enumerated,"M, V",,,,No
+Requested-Domain,706,6.3.7,Enumerated,"M, V",,,,No
+Current-Location,707,6.3.8,Enumerated,"M, V",,,,No
+Identity-Set,708,6.3.10,Enumerated,V,,,M,No
+Expiry-Time,709,6.3.16,Time,V,,,M,No
+Send-Data-Indication,710,6.3.17,Enumerated,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Server-Name.,602,6.3.9,UTF8String,"M, V",,,,No
+# Note: Uses 3GPP TS 29.229 Supported-Features.,628,6.3.11,Grouped,V,M,,,No
+# Note: Uses 3GPP TS 29.229 Feature-List-ID.,629,6.3.12,Unsigned32,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Feature-List.,630,6.3.13,Unsigned32,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Supported-Applications.,631,6.3.14,Grouped,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Public-Identity.,601,6.3.15,UTF8String,"M, V",,,,No
+#,,,,,,,,
+DSAI-Tag,711,6.3.18,OctetString,"M, V",,,,No
+# Note: Uses 3GPP TS 29.229 Wildcarded-Public-Identity.,634,6.3.19,UTF8String,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Wildcarded-IMPU.,636,6.3.20,UTF8String,V,,,M,No
+# Note: Uses 3GPP TS 29.229 Session-Priority.,650,6.3.21,Enumerated,V,,,M,No
+#,,,,,,,,
+One-Time-Notification,712,6.3.22,Enumerated,V,,,M,No
+Requested-Nodes,713,6.3.7A,Unsigned32,V,,,M,No
+Serving-Node-Indication,714,6.3.23,Enumerated,V,,,M,No
+Repository-Data-ID,715,6.3.24,Grouped,V,,,M,No
+Sequence-Number,716,6.3.25,Unsigned32,V,,,M,No
+Pre-paging-Supported,717,6.3.26,Enumerated,V,,,M,No
+Local-Time-Zone-Indication,718,6.3.27,Enumerated,V,,,M,No
+UDR-Flags,719,6.3.28,Unsigned32,V,,,M,No
+Call-Reference-Info,720,6.3.29,Grouped,V,,,M,No
+Call-Reference-Number,721,6.3.30,OctetString,V,,,M,No
+AS-Number,722,6.3.31,OctetString,V,,,M,No
 ,,,,,,,,
 @standard,3GPP TS 32.299,,,,,,,
 #=,,,,,,,,
"Welcome to our mercurial repository"