# HG changeset patch # User Luke Mewburn # Date 1585803040 -39600 # Node ID 288254d567b7fded965dc9fe5c3658220210d4de # Parent acbfec3df2818aabf8bb66572e08bc4ba725230a Update 3GPP TS 29.338 V15.1.0 (2018-12) Add AVPs from Table 6.3.3.1/1: SGd/Gdd specific Diameter AVPs: - SC-Address, OctetString, code 3300, section 6.3.3.2 - SM-RP-UI, OctetString, code 3301, section 6.3.3.3 - TFR-Flags, Unsigned32, code 3302, section 6.3.3.4 - SM-Delivery-Failure-Cause, Grouped, code 3303, section 6.3.3.5 - SM-Enumerated-Delivery-Failure-Cause, Enumerated, code 3304, section 6.3.3.6 - SM-Diagnostic-Info, OctetString, code 3305, section 6.3.3.7 - SM-Delivery-Timer, Unsigned32, code 3306, section 6.3.3.10 - SM-Delivery-Start-Time, Time, code 3307, section 6.3.3.11 - SMSMI-Correlation-ID, Grouped, code 3324, section 6.3.3.13 - HSS-ID, OctetString, code 3325, section 6.3.3.14 - Originating-SIP-URI, UTF8String, code 3326, section 6.3.3.15 - Destination-SIP-URI, UTF8String, code 3327, section 6.3.3.16 - OFR-Flags, Unsigned32, code 3328, section 6.3.3.12 - Maximum-Retransmission-Time, Time, code 3330, section 6.3.3.17 - Requested-Retransmission-Time, Time, code 3331, section 6.3.3.18 - SMS-GMSC-Address, OctetString, code 3332, section 6.3.3.19 diff -r acbfec3df281 -r 288254d567b7 extensions/dict_dcca_3gpp/dict_dcca_3gpp.c --- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c Tue Mar 31 17:09:53 2020 +1100 +++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c Thu Apr 02 15:50:40 2020 +1100 @@ -9547,6 +9547,7 @@ /*==================================================================*/ /* 3GPP TS 29.273 V15.4.0 (2019-09) */ + /* From 3GPP 29273-f40.docx */ /*==================================================================*/ /*==================================================================*/ @@ -11786,6 +11787,221 @@ }; /*==================================================================*/ + /* 3GPP TS 29.338 Table 6.3.3.1/1: SGd/Gdd specific Diameter AVPs */ + /*==================================================================*/ + + /* SC-Address, OctetString, code 3300, section 6.3.3.2 */ + { + struct dict_avp_data data = { + 3300, /* Code */ + 10415, /* Vendor */ + "SC-Address", /* 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, NULL, NULL); + }; + + /* SM-RP-UI, OctetString, code 3301, section 6.3.3.3 */ + { + struct dict_avp_data data = { + 3301, /* Code */ + 10415, /* Vendor */ + "SM-RP-UI", /* 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, NULL, NULL); + }; + + /* TFR-Flags, Unsigned32, code 3302, section 6.3.3.4 */ + { + struct dict_avp_data data = { + 3302, /* Code */ + 10415, /* Vendor */ + "TFR-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); + }; + + /* SM-Delivery-Failure-Cause, Grouped, code 3303, section 6.3.3.5 */ + { + struct dict_avp_data data = { + 3303, /* Code */ + 10415, /* Vendor */ + "SM-Delivery-Failure-Cause", /* 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); + }; + + /* SM-Enumerated-Delivery-Failure-Cause, Enumerated, code 3304, section 6.3.3.6 */ + { + struct dict_avp_data data = { + 3304, /* Code */ + 10415, /* Vendor */ + "SM-Enumerated-Delivery-Failure-Cause", /* Name */ + AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ + AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ + AVP_TYPE_INTEGER32 /* base type of data */ + }; + struct dict_object *type; + struct dict_type_data tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/SM-Enumerated-Delivery-Failure-Cause)", NULL, NULL, NULL }; + CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type); + CHECK_dict_new(DICT_AVP, &data, type, NULL); + }; + + /* SM-Diagnostic-Info, OctetString, code 3305, section 6.3.3.7 */ + { + struct dict_avp_data data = { + 3305, /* Code */ + 10415, /* Vendor */ + "SM-Diagnostic-Info", /* 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, NULL, NULL); + }; + + /* SM-Delivery-Timer, Unsigned32, code 3306, section 6.3.3.10 */ + { + struct dict_avp_data data = { + 3306, /* Code */ + 10415, /* Vendor */ + "SM-Delivery-Timer", /* 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); + }; + + /* SM-Delivery-Start-Time, Time, code 3307, section 6.3.3.11 */ + { + struct dict_avp_data data = { + 3307, /* Code */ + 10415, /* Vendor */ + "SM-Delivery-Start-Time", /* 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, Time_type, NULL); + }; + + /* SMSMI-Correlation-ID, Grouped, code 3324, section 6.3.3.13 */ + { + struct dict_avp_data data = { + 3324, /* Code */ + 10415, /* Vendor */ + "SMSMI-Correlation-ID", /* 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); + }; + + /* HSS-ID, OctetString, code 3325, section 6.3.3.14 */ + { + struct dict_avp_data data = { + 3325, /* Code */ + 10415, /* Vendor */ + "HSS-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, NULL, NULL); + }; + + /* Originating-SIP-URI, UTF8String, code 3326, section 6.3.3.15 */ + { + struct dict_avp_data data = { + 3326, /* Code */ + 10415, /* Vendor */ + "Originating-SIP-URI", /* 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); + }; + + /* Destination-SIP-URI, UTF8String, code 3327, section 6.3.3.16 */ + { + struct dict_avp_data data = { + 3327, /* Code */ + 10415, /* Vendor */ + "Destination-SIP-URI", /* 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); + }; + + /* OFR-Flags, Unsigned32, code 3328, section 6.3.3.12 */ + { + struct dict_avp_data data = { + 3328, /* Code */ + 10415, /* Vendor */ + "OFR-Flags", /* Name */ + AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ + AVP_FLAG_VENDOR, /* Fixed flag values */ + AVP_TYPE_UNSIGNED32 /* base type of data */ + }; + CHECK_dict_new(DICT_AVP, &data, NULL, NULL); + }; + + /* Maximum-Retransmission-Time, Time, code 3330, section 6.3.3.17 */ + { + struct dict_avp_data data = { + 3330, /* Code */ + 10415, /* Vendor */ + "Maximum-Retransmission-Time", /* 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, Time_type, NULL); + }; + + /* Requested-Retransmission-Time, Time, code 3331, section 6.3.3.18 */ + { + struct dict_avp_data data = { + 3331, /* Code */ + 10415, /* Vendor */ + "Requested-Retransmission-Time", /* 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, Time_type, NULL); + }; + + /* SMS-GMSC-Address, OctetString, code 3332, section 6.3.3.19 */ + { + struct dict_avp_data data = { + 3332, /* Code */ + 10415, /* Vendor */ + "SMS-GMSC-Address", /* 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 TS 29.344 V15.1.0 (2019-09) */ /* From 3GPP 29344-f10.doc */ /*==================================================================*/ diff -r acbfec3df281 -r 288254d567b7 extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv --- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Tue Mar 31 17:09:53 2020 +1100 +++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Thu Apr 02 15:50:40 2020 +1100 @@ -893,6 +893,7 @@ @standard,3GPP TS 29.273,,,,,, #=,,,,,,, # 3GPP TS 29.273 V15.4.0 (2019-09),,,,,,, +# From 3GPP 29273-f40.docx,,,,,,,, #=,,,,,,, #,,,,,,, #=,,,,,,, @@ -1148,6 +1149,26 @@ RDR-Flags,3323,5.3.3.21,Unsigned32,V,,,M,No Maximum-UE-Availability-Time,3329,5.3.3.22,Time,V,,,M,No SMS-GMSC-Alert-Event,3333,5.3.3.23,Unsigned32,V,,,M,No +#=,,,,,,,, +# 3GPP TS 29.338 Table 6.3.3.1/1: SGd/Gdd specific Diameter AVPs,,,,,,,, +#=,,,,,,,, +#,,,,,,,, +SC-Address,3300,6.3.3.2,OctetString,"M, V",,,,No +SM-RP-UI,3301,6.3.3.3,OctetString,"M, V",,,,No +TFR-Flags,3302,6.3.3.4,Unsigned32,"M, V",,,,No +SM-Delivery-Failure-Cause,3303,6.3.3.5,Grouped,"M, V",,,,No +SM-Enumerated-Delivery-Failure-Cause,3304,6.3.3.6,Enumerated,"M, V",,,,No +SM-Diagnostic-Info,3305,6.3.3.7,OctetString,"M, V",,,,No +SM-Delivery-Timer,3306,6.3.3.10,Unsigned32,"M, V",,,,No +SM-Delivery-Start-Time,3307,6.3.3.11,Time,"M, V",,,,No +SMSMI-Correlation-ID,3324,6.3.3.13,Grouped,V,,,M,No +HSS-ID,3325,6.3.3.14,OctetString,V,,,M,No +Originating-SIP-URI,3326,6.3.3.15,UTF8String,V,,,M,No +Destination-SIP-URI,3327,6.3.3.16,UTF8String,V,,,M,No +OFR-Flags,3328,6.3.3.12,Unsigned32,V,,,M,No +Maximum-Retransmission-Time,3330,6.3.3.17,Time,V,,,M,No +Requested-Retransmission-Time,3331,6.3.3.18,Time,V,,,M,No +SMS-GMSC-Address,3332,6.3.3.19,OctetString,V,,,M,No ,,,,,,,, @standard,3GPP TS 29.344,,,,,,, #=,,,,,,,,