# HG changeset patch # User Luke Mewburn # Date 1586402682 -36000 # Node ID 5aa6d237b30658eb48af4c2617f193352ef3e490 # Parent 64191a7142ced2a9c7998ed91eded27a7557d36e Add 3GPP TS 29.561 V16.3.0 (2020-03) Add AVPs: - 3GPP-Notification, OctetString, code 110, section 11.3.1 - 3GPP-UE-MAC-Address, OctetString, code 111, section 11.3.1 - 3GPP-Authorization-Reference, OctetString, code 112, section 11.3.1 - 3GPP-Policy-Reference, OctetString, code 113, section 11.3.1 - 3GPP-Session-AMBR, OctetString, code 114, section 11.3.1 - 3GPP-NAI, OctetString, code 115, section 11.3.1 - 3GPP-Session-AMBR-v2, OctetString, code 116, section 11.3.1 - 3GPP-IP-Address-Pool-Id, OctetString, code 118, section 11.3.1 - 3GPP-S-NSSAI, UTF8String, code 200, section 16.3.1 diff -r 64191a7142ce -r 5aa6d237b306 extensions/dict_dcca_3gpp/add_avps.c --- a/extensions/dict_dcca_3gpp/add_avps.c Thu Apr 09 10:54:52 2020 +1000 +++ b/extensions/dict_dcca_3gpp/add_avps.c Thu Apr 09 13:24:42 2020 +1000 @@ -14741,7 +14741,6 @@ /* Stage 3 */ /* */ /* From 3GPP 29388-f10.doc */ - /* */ /*==================================================================*/ /*==================================================================*/ @@ -14845,6 +14844,8 @@ /* Group Communication System Enablers for LTE (GCSE_LTE); */ /* MB2 Reference Point; */ /* Stage 3 */ + /* */ + /* From 3GPP 29468-f80.doc */ /*==================================================================*/ /*==================================================================*/ @@ -15296,6 +15297,142 @@ }; /*==================================================================*/ + /* 3GPP TS 29.561 V16.3.0 (2020-03) */ + /* 5G System; Interworking between 5G Network and external */ + /* Data Networks; */ + /* Stage 3 */ + /* */ + /* From 3GPP 29561-g30.doc */ + /*==================================================================*/ + + /*==================================================================*/ + /* Table 12.4-1: N6 re-used Diameter AVPs */ + + /* Note: Only AVPs defined in 3GPP TS 29.561. */ + /*==================================================================*/ + + /* 3GPP-Notification, OctetString, code 110, section 11.3.1 */ + { + struct dict_avp_data data = { + 110, /* Code */ + 10415, /* Vendor */ + "3GPP-Notification", /* 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-UE-MAC-Address, OctetString, code 111, section 11.3.1 */ + { + struct dict_avp_data data = { + 111, /* Code */ + 10415, /* Vendor */ + "3GPP-UE-MAC-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-Authorization-Reference, OctetString, code 112, section 11.3.1 */ + { + struct dict_avp_data data = { + 112, /* Code */ + 10415, /* Vendor */ + "3GPP-Authorization-Reference", /* 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-Policy-Reference, OctetString, code 113, section 11.3.1 */ + { + struct dict_avp_data data = { + 113, /* Code */ + 10415, /* Vendor */ + "3GPP-Policy-Reference", /* 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-Session-AMBR, OctetString, code 114, section 11.3.1 */ + { + struct dict_avp_data data = { + 114, /* Code */ + 10415, /* Vendor */ + "3GPP-Session-AMBR", /* 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-NAI, OctetString, code 115, section 11.3.1 */ + { + struct dict_avp_data data = { + 115, /* Code */ + 10415, /* Vendor */ + "3GPP-NAI", /* 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-Session-AMBR-v2, OctetString, code 116, section 11.3.1 */ + { + struct dict_avp_data data = { + 116, /* Code */ + 10415, /* Vendor */ + "3GPP-Session-AMBR-v2", /* 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-IP-Address-Pool-Id, OctetString, code 118, section 11.3.1 */ + { + struct dict_avp_data data = { + 118, /* Code */ + 10415, /* Vendor */ + "3GPP-IP-Address-Pool-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); + }; + + /*==================================================================*/ + /* Table 17.4-1: Additional information needed for network slice specific authentication */ + /*==================================================================*/ + + /* 3GPP-S-NSSAI, UTF8String, code 200, section 16.3.1 */ + { + struct dict_avp_data data = { + 200, /* Code */ + 10415, /* Vendor */ + "3GPP-S-NSSAI", /* 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 32.299 V15.7.0 (2019-06) */ /* Charging management; */ /* Diameter charging applications */ diff -r 64191a7142ce -r 5aa6d237b306 extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv --- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Thu Apr 09 10:54:52 2020 +1000 +++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Thu Apr 09 13:24:42 2020 +1000 @@ -1705,7 +1705,6 @@ # Stage 3,,,,,,, # ,,,,,,, # From 3GPP 29388-f10.doc,,,,,,, -# ,,,,,,, #=,,,,,,, #,,,,,,, #=,,,,,,, @@ -1741,6 +1740,8 @@ # Group Communication System Enablers for LTE (GCSE_LTE);,,,,,,, # MB2 Reference Point;,,,,,,, # Stage 3,,,,,,, +# ,,,,,,, +# From 3GPP 29468-f80.doc,,,,,,, #=,,,,,,, #,,,,,,, #=,,,,,,, @@ -1796,6 +1797,36 @@ TMGI-Number,3516,6.4.18,Unsigned32,"M,V",P,, Userplane-Protocol-Result,3529,6.4.31,Grouped,V,P,,M ,,,,,,, +@standard,3GPP TS 29.561,,,,,, +#=,,,,,,, +# 3GPP TS 29.561 V16.3.0 (2020-03),,,,,,, +# 5G System; Interworking between 5G Network and external,,,,,,, +# Data Networks;,,,,,,, +# Stage 3,,,,,,, +# ,,,,,,, +# From 3GPP 29561-g30.doc,,,,,,, +#=,,,,,,, +#,,,,,,, +#=,,,,,,, +# Table 12.4-1: N6 re-used Diameter AVPs,,,,,,, +#,,,,,,, +# Note: Only AVPs defined in 3GPP TS 29.561.,,,,,,, +#=,,,,,,, +#,,,,,,, +3GPP-Notification,110,11.3.1,OctetString,V,P,,M +3GPP-UE-MAC-Address,111,11.3.1,OctetString,V,P,,M +3GPP-Authorization-Reference,112,11.3.1,OctetString,V,P,,M +3GPP-Policy-Reference,113,11.3.1,OctetString,V,P,,M +3GPP-Session-AMBR,114,11.3.1,OctetString,V,P,,M +3GPP-NAI,115,11.3.1,OctetString,V,P,,M +3GPP-Session-AMBR-v2,116,11.3.1,OctetString,V,P,,M +3GPP-IP-Address-Pool-Id,118,11.3.1,OctetString,V,P,,M +#=,,,,,,, +# Table 17.4-1: Additional information needed for network slice specific authentication,,,,,,, +#=,,,,,,, +#,,,,,,, +3GPP-S-NSSAI,200,16.3.1,UTF8String,V,P,,M +,,,,,,, @standard,3GPP TS 32.299,,,,,, #=,,,,,,, # 3GPP TS 32.299 V15.7.0 (2019-06),,,,,,,