# HG changeset patch
# User Luke Mewburn <luke@mewburn.net>
# Date 1586392329 -36000
# Node ID 9e233ef0b07eac8e3cf6784cae0a2ed4bec2041d
# Parent  435167c2e51c2ca855e3f8ee7d5b34617e2467fe
Add 3GPP TS 29.283 V15.1.0 (2019-09)

Add AVPs:
- MCPTT-ID, UTF8String, code 4500, section 7.3.2
- Data-Identification, Grouped, code 4501, section 7.3.3
- Data-Identification-Prefix, Unsigned32, code 4502, section 7.3.11
- Data-Identification-Flags, Unsigned64, code 4503, section 7.3.12
- DPR-Flags, Unsigned32, code 4504, section 7.3.13
- DPA-Flags, Unsigned32, code 4505, section 7.3.14
- DUR-Flags, Unsigned32, code 4506, section 7.3.15
- DUA-Flags, Unsigned32, code 4507, section 7.3.16
- NDR-Flags, Unsigned32, code 4508, section 7.3.17
- NDA-Flags, Unsigned32, code 4509, section 7.3.18
- User-Data-Id, Unsigned32, code 4510, section 7.3.19
- MC-Service-User-Profile-Data, Grouped, code 4511, section 7.3.20
- Sequence-Number-29.283, Unsigned32, code 4512, section 7.3.21
- Data, Grouped, code 4513, section 7.3.22
- MCVideo-ID, UTF8String, code 4514, section 7.3.24
- MCData-ID, UTF8String, code 4515, section 7.3.25

Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107).
and 3GPP TS 29.329 Sequence-Number (716).
3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107).
3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716).
3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512).
Fix: Sequence-Number (4512) renamed to Sequence-Number-29.283 (4512).

diff -r 435167c2e51c -r 9e233ef0b07e extensions/dict_dcca_3gpp/add_avps.c
--- a/extensions/dict_dcca_3gpp/add_avps.c	Thu Apr 09 00:46:20 2020 +1000
+++ b/extensions/dict_dcca_3gpp/add_avps.c	Thu Apr 09 10:32:09 2020 +1000
@@ -1727,9 +1727,11 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* Note: Name conflict with 3GPP TS 29.329 Sequence-Number (716).   */
+	/* Note: Name conflict with 3GPP TS 29.329 Sequence-Number (716)    */
+	/* and 3GPP TS 29.283 Sequence-Number (4512).                       */
 	/* 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107). */
 	/* 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716). */
+	/* 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512). */
 	/*                                                                  */
 	/* Fix: Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107). */
 	/* Sequence-Number-29.140, Unsigned32, code 1107, section 6.3.10    */
@@ -11181,6 +11183,232 @@
 	/*==================================================================*/
 
 	/*==================================================================*/
+	/* 3GPP TS 29.283 V15.1.0 (2019-09)                                 */
+	/* Diameter Data Management Applications                            */
+	/*                                                                  */
+	/* From 3GPP 29283-f10.doc                                          */
+	/*==================================================================*/
+
+	/*==================================================================*/
+	/* 3GPP TS 29.283 Table 7.3.1-1: MCPTT-2, MCVideo-2, MCData-2 and CSC-13 specific Diameter AVPs */
+	/*==================================================================*/
+
+	/* MCPTT-ID, UTF8String, code 4500, section 7.3.2                   */
+	{
+		struct dict_avp_data data = {
+			4500,	/* Code */
+			10415,	/* Vendor */
+			"MCPTT-ID",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_OCTETSTRING	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL);
+	};
+
+	/* Data-Identification, Grouped, code 4501, section 7.3.3           */
+	{
+		struct dict_avp_data data = {
+			4501,	/* Code */
+			10415,	/* Vendor */
+			"Data-Identification",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_GROUPED	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* Data-Identification-Prefix, Unsigned32, code 4502, section 7.3.11 */
+	{
+		struct dict_avp_data data = {
+			4502,	/* Code */
+			10415,	/* Vendor */
+			"Data-Identification-Prefix",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* Data-Identification-Flags, Unsigned64, code 4503, section 7.3.12 */
+	{
+		struct dict_avp_data data = {
+			4503,	/* Code */
+			10415,	/* Vendor */
+			"Data-Identification-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED64	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* DPR-Flags, Unsigned32, code 4504, section 7.3.13                 */
+	{
+		struct dict_avp_data data = {
+			4504,	/* Code */
+			10415,	/* Vendor */
+			"DPR-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* DPA-Flags, Unsigned32, code 4505, section 7.3.14                 */
+	{
+		struct dict_avp_data data = {
+			4505,	/* Code */
+			10415,	/* Vendor */
+			"DPA-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* DUR-Flags, Unsigned32, code 4506, section 7.3.15                 */
+	{
+		struct dict_avp_data data = {
+			4506,	/* Code */
+			10415,	/* Vendor */
+			"DUR-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* DUA-Flags, Unsigned32, code 4507, section 7.3.16                 */
+	{
+		struct dict_avp_data data = {
+			4507,	/* Code */
+			10415,	/* Vendor */
+			"DUA-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* NDR-Flags, Unsigned32, code 4508, section 7.3.17                 */
+	{
+		struct dict_avp_data data = {
+			4508,	/* Code */
+			10415,	/* Vendor */
+			"NDR-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* NDA-Flags, Unsigned32, code 4509, section 7.3.18                 */
+	{
+		struct dict_avp_data data = {
+			4509,	/* Code */
+			10415,	/* Vendor */
+			"NDA-Flags",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* User-Data-Id, Unsigned32, code 4510, section 7.3.19              */
+	{
+		struct dict_avp_data data = {
+			4510,	/* Code */
+			10415,	/* Vendor */
+			"User-Data-Id",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* MC-Service-User-Profile-Data, Grouped, code 4511, section 7.3.20 */
+	{
+		struct dict_avp_data data = {
+			4511,	/* Code */
+			10415,	/* Vendor */
+			"MC-Service-User-Profile-Data",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_GROUPED	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107).  */
+	/* and 3GPP TS 29.329 Sequence-Number (716).                        */
+	/* 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107). */
+	/* 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716). */
+	/* 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512). */
+	/*                                                                  */
+	/* Fix: Sequence-Number (4512) renamed to Sequence-Number-29.283 (4512). */
+	/* Sequence-Number-29.283, Unsigned32, code 4512, section 7.3.21    */
+	{
+		struct dict_avp_data data = {
+			4512,	/* Code */
+			10415,	/* Vendor */
+			"Sequence-Number-29.283",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_UNSIGNED32	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* Data, Grouped, code 4513, section 7.3.22                         */
+	{
+		struct dict_avp_data data = {
+			4513,	/* Code */
+			10415,	/* Vendor */
+			"Data",	/* Name */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
+			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
+			AVP_TYPE_GROUPED	/* base type of data */
+		};
+		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+	};
+
+	/* MCVideo-ID, UTF8String, code 4514, section 7.3.24                */
+	{
+		struct dict_avp_data data = {
+			4514,	/* Code */
+			10415,	/* Vendor */
+			"MCVideo-ID",	/* 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, UTF8String_type, NULL);
+	};
+
+	/* MCData-ID, UTF8String, code 4515, section 7.3.25                 */
+	{
+		struct dict_avp_data data = {
+			4515,	/* Code */
+			10415,	/* Vendor */
+			"MCData-ID",	/* 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, UTF8String_type, NULL);
+	};
+
+	/*==================================================================*/
 	/* 3GPP TS 29.329 V15.2.0 (2019-09)                                 */
 	/* Sh Interface based on the Diameter protocol;                     */
 	/* Protocol details                                                 */
@@ -11431,9 +11659,11 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107).  */
+	/* Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107)   */
+	/* and 3GPP TS 29.283 Sequence-Number (4512).                       */
 	/* 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107). */
 	/* 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716). */
+	/* 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512). */
 	/* Sequence-Number, Unsigned32, code 716, section 6.3.25            */
 	{
 		struct dict_avp_data data = {
diff -r 435167c2e51c -r 9e233ef0b07e extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Thu Apr 09 00:46:20 2020 +1000
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Thu Apr 09 10:32:09 2020 +1000
@@ -250,9 +250,11 @@
 Sender-Address,1104,6.3.7,UTF8String,"M,V",,,
 Initial-Recipient-Address,1105,6.3.8,Grouped,"M,V",,,
 Result-Recipient-Address,1106,6.3.9,Grouped,"M,V",,,
-# Note: Name conflict with 3GPP TS 29.329 Sequence-Number (716).,,,,,,,
+# Note: Name conflict with 3GPP TS 29.329 Sequence-Number (716),,,,,,,
+# and 3GPP TS 29.283 Sequence-Number (4512).,,,,,,,
 # 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107).,,,,,,,
 # 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716).,,,,,,,
+# 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512).,,,,,,,
 # ,,,,,,,
 # Fix: Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107).,,,,,,,
 Sequence-Number-29.140,1107,6.3.10,Unsigned32,"M,V",,,
@@ -1278,6 +1280,42 @@
 #=,,,,,,,
 #,,,,,,,
 ,,,,,,,
+@standard,3GPP TS 29.283,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.283 V15.1.0 (2019-09),,,,,,,
+# Diameter Data Management Applications,,,,,,,
+# ,,,,,,,
+# From 3GPP 29283-f10.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+"# 3GPP TS 29.283 Table 7.3.1-1: MCPTT-2, MCVideo-2, MCData-2 and CSC-13 specific Diameter AVPs",,,,,,,
+#=,,,,,,,
+#,,,,,,,
+MCPTT-ID,4500,7.3.2,UTF8String,"M, V",,,
+Data-Identification,4501,7.3.3,Grouped,"M, V",,,
+Data-Identification-Prefix,4502,7.3.11,Unsigned32,"M,V",,,
+Data-Identification-Flags,4503,7.3.12,Unsigned64,"M,V",,,
+DPR-Flags,4504,7.3.13,Unsigned32,"M,V",,,
+DPA-Flags,4505,7.3.14,Unsigned32,"M,V",,,
+DUR-Flags,4506,7.3.15,Unsigned32,"M,V",,,
+DUA-Flags,4507,7.3.16,Unsigned32,"M,V",,,
+NDR-Flags,4508,7.3.17,Unsigned32,"M,V",,,
+NDA-Flags,4509,7.3.18,Unsigned32,"M,V",,,
+User-Data-Id,4510,7.3.19,Unsigned32,"M,V",,,
+MC-Service-User-Profile-Data,4511,7.3.20,Grouped,"M,V",,,
+# Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107).,,,,,,,
+# and 3GPP TS 29.329 Sequence-Number (716).,,,,,,,
+# 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107).,,,,,,,
+# 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716).,,,,,,,
+# 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512).,,,,,,,
+# ,,,,,,,
+# Fix: Sequence-Number (4512) renamed to Sequence-Number-29.283 (4512).,,,,,,,
+Sequence-Number-29.283,4512,7.3.21,Unsigned32,"M,V",,,
+Data,4513,7.3.22,Grouped,"M,V",,,
+MCVideo-ID,4514,7.3.24,UTF8String,V,,,M
+MCData-ID,4515,7.3.25,UTF8String,V,,,M
+,,,,,,,
 @standard,3GPP TS 29.329,,,,,,
 #=,,,,,,,
 # 3GPP TS 29.329 V15.2.0 (2019-09),,,,,,,
@@ -1314,9 +1352,11 @@
 Requested-Nodes,713,6.3.7A,Unsigned32,V,,,M
 Serving-Node-Indication,714,6.3.23,Enumerated,V,,,M
 Repository-Data-ID,715,6.3.24,Grouped,V,,,M
-# Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107).,,,,,,,
+# Note: Name conflict with 3GPP TS 29.140 Sequence-Number (1107),,,,,,,
+# and 3GPP TS 29.283 Sequence-Number (4512).,,,,,,,
 # 3GPP TS 29.140 V6.1.0 (2005-06) allocated Sequence-Number (1107).,,,,,,,
 # 3GPP TS 29.329 V10.0.0 (2010-09) CR 0163 added Sequence-Number (716).,,,,,,,
+# 3GPP TS 29.283 V13.1.0 (2016-06) allocated Sequence-Number (4512).,,,,,,,
 Sequence-Number,716,6.3.25,Unsigned32,V,,,M
 Pre-paging-Supported,717,6.3.26,Enumerated,V,,,M
 Local-Time-Zone-Indication,718,6.3.27,Enumerated,V,,,M