Index: extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
===================================================================
--- extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1500)
+++ extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1501)
@@ -1,933 +1,933 @@
-Attribute Name,AVP Code,Section defined,Value Type,Must,May,Should not,Must not,extra rows
-@vendor,10415,,,,,,,
-,,,,,,,,
-@standard,3GPP TS 29.061,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.061 V15.5.0 (2018-12),,,,,,,,
-# Interworking between the Public Land Mobile Network (PLMN),,,,,,,,
-# supporting packet based services and,,,,,,,,
-# Packet Data Networks (PDN),,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29061-f50.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.061 Table 9a: Gi/Sgi specific AVPs,,,,,,,,
-#,,,,,,,,
-# Note: 3GPP TS 29.061 is unclear and inconsistent about M.,,,,,,,,
-"# For this reason, other sources are assumed more trustworthy.",,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-# Note: 3GPP-IMSI (1) changed to Must M.,,,,,,,,
-3GPP-IMSI,1,16.4.7,UTF8String,"M,V",P,,,Y
-"# Note: 3GPP-Charging-Id (2) type changed from OctetString to Unsigned32,",,,,,,,,
-# per 3GPP TS 29.061 clause 16.4.7.2/2 and packet dumps.,,,,,,,,
-3GPP-Charging-Id,2,16.4.7,Unsigned32,"M,V",P,,,Y
-# Note: 3GPP-PDP-Type (3) changed to Must M.,,,,,,,,
-3GPP-PDP-Type,3,16.4.7,Enumerated,"M,V",P,,,Y
-3GPP-CG-Address,4,16.4.7,OctetString,V,P,,M,Y
-# Note: 3GPP-GPRS-Negotiated-QoS-Profile (5) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-GPRS-Negotiated-QoS-Profile,5,16.4.7,UTF8String,"M,V",P,,,Y
-3GPP-SGSN-Address,6,16.4.7,OctetString,V,P,,M,Y
-3GPP-GGSN-Address,7,16.4.7,OctetString,V,P,,M,Y
-# Note: 3GPP-IMSI-MCC-MNC (8) changed to Must M per packet dumps.,,,,,,,,
-3GPP-IMSI-MCC-MNC,8,16.4.7,UTF8String,"M,V",P,,,Y
-# Note: 3GPP-GGSN-MCC-MNC (9) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-GGSN-MCC-MNC,9,16.4.7,UTF8String,"M,V",P,,,Y
-# Note: 3GPP-NSAPI (10) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-NSAPI,10,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 table 9a does not define,,,,,,,,
-# 3GPP-Session-Stop-Indicator (11) even when it is referenced,,,,,,,,
-# by other 3GPP Diameter AVPs including PS-Information (874).,,,,,,,,
-3GPP-Session-Stop-Indicator,11,16.4.7,OctetString,V,P,,M,
-# Note: 3GPP-Selection-Mode (12) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-Selection-Mode,12,16.4.7,UTF8String,"M,V",P,,,Y
-# Note: 3GPP-Charging-Characteristics (13) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-Charging-Characteristics,13,16.4.7,UTF8String,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# 3GPP-CG-IPv6-Address (14) to 3GPP-CG-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-# 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-CG-IPv6-Address,14,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# 3GPP-SGSN-IPv6-Address (15) to 3GPP-SGSN-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-# 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-SGSN-IPv6-Address,15,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# 3GPP-GGSN-IPv6-Address (16) to 3GPP-GGSN-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-# 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-GGSN-IPv6-Address,16,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# 3GPP-IPv6-DNS-Servers (17) to 3GPP-Ipv6-DNS-Servers.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-# 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-IPv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP-SGSN-MCC-MNC (18) changed to Must M per contrib/3gpp.,,,,,,,,
-3GPP-SGSN-MCC-MNC,18,16.4.7,UTF8String,"M,V",P,,,Y
-# Note: 3GPP-IMEISV (20) changed to Must M.,,,,,,,,
-3GPP-IMEISV,20,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP-RAT-Type (21) changed to Must M.,,,,,,,,
-3GPP-RAT-Type,21,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP-User-Location-Info (22) changed to Must M.,,,,,,,,
-3GPP-User-Location-Info,22,16.4.7,OctetString,"M,V",P,,,Y
-# Note: 3GPP-MS-TimeZone (23) changed to Must M.,,,,,,,,
-3GPP-MS-TimeZone,23,16.4.7,OctetString,"M,V",P,,,Y
-3GPP-CAMEL-Charging-Info,24,16.4.7,OctetString,V,P,,M,Y
-3GPP-Packet-Filter,25,16.4.7,OctetString,V,P,,M,Y
-3GPP-Negotiated-DSCP,26,16.4.7,OctetString,V,P,,M,Y
-3GPP-Allocate-IP-Type,27,16.4.7,OctetString,V,P,,M,Y
-# Note: 3GPP TS 29.061 table 9a does not define,,,,,,,,
-# External-Identifier (28) for Diameter.,,,,,,,,
-# 3GPP TS 29.061 table 9b refers to 3GPP TS 29.336,,,,,,,,
-# for External-Identifier (3111).,,,,,,,,
-# ,,,,,,,,
-# External-Identifier (28) OctetString replaced by,,,,,,,,
-# External-Identifier (3111) UTF8String.,,,,,,,,
-#,,,,,,,,
-#,,,,,,,,
-TWAN-Identifier,29,16.4.7,OctetString,V,P,,M,Y
-3GPP-User-Location-Info-Time,30,16.4.7,OctetString,V,P,,M,Y
-3GPP-Secondary-RAT-Usage,31,16.4.7,OctetString,V,P,,M,Y
-#=,,,,,,,,
-# 3GPP TS 29.061 Table 10: Gmb specific AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-TMGI,900,17.7.2,OctetString,"M,V",P,,,Y
-Required-MBMS-Bearer-Capabilities,901,17.7.3,UTF8String,"M,V",P,,,Y
-MBMS-StartStop-Indication,902,17.7.5,Enumerated,"M,V",P,,,Y
-MBMS-Service-Area,903,17.7.6,OctetString,"M,V",P,,,Y
-MBMS-Session-Duration,904,17.7.7,OctetString,"M,V",P,,,Y
-Alternative-APN,905,17.7.8,UTF8String,"M,V",P,,,Y
-MBMS-Service-Type,906,17.7.9,Enumerated,"M,V",P,,,Y
-MBMS-2G-3G-Indicator,907,17.7.10,Enumerated,"M, V",P,,,Y
-MBMS-Session-Identity,908,17.7.11,OctetString,"M,V",P,,,Y
-RAI,909,17.7.12,UTF8String,"M, V",P,,,Y
-Additional-MBMS-Trace-Info,910,17.7.13,OctetString,"M,V",P,,,Y
-MBMS-Time-To-Data-Transfer,911,17.7.14,OctetString,"M,V",P,,,Y
-MBMS-Session-Repetition-Number,912,17.7.15,OctetString,"M,V",P,,,Y
-MBMS-Required-QoS,913,17.7.16,UTF8String,"M,V",P,,,Y
-MBMS-Counting-Information,914,17.7.17,Enumerated,"M,V",P,,,Y
-MBMS-User-Data-Mode-Indication,915,17.7.18,Enumerated,"M,V",P,,,Y
-MBMS-GGSN-Address,916,17.7.19,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# MBMS-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-MBMS-GGSN-IPv6-Address,917,17.7.20,OctetString,"M,V",P,,,Y
-MBMS-BMSC-SSM-IP-Address,918,17.7.21,OctetString,"M,V",P,,,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# MBMS-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-MBMS-BMSC-SSM-IPv6-Address,919,17.7.22,OctetString,"M,V",P,,,Y
-MBMS-Flow-Identifier,920,17.7.23,OctetString,"M,V",P,,,Y
-CN-IP-Multicast-Distribution,921,17.7.24,Enumerated,"M,V",P,,,Y
-MBMS-HC-Indicator,922,17.7.25,Enumerated,"M,V",P,,,Y
-#=,,,,,,,,
-# 3GPP TS 29.061 Table 20.5a.1: SGmb specific AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-MBMS-Access-Indicator,923,20.5a.1,Enumerated,"M,V",P,,,Y
-MBMS-GW-SSM-IP-Address,924,20.5a.2,OctetString,V,P,,M,Y
-# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,,
-# MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address.,,,,,,,,
-# This rename was not applied.,,,,,,,,
-MBMS-GW-SSM-IPv6-Address,925,20.5a.3,OctetString,V,P,,M,Y
-MBMS-BMSC-SSM-UDP-Port,926,20.5a.4,OctetString,V,P,,M,Y
-MBMS-GW-UDP-Port,927,20.5a.5,OctetString,V,P,,M,Y
-MBMS-GW-UDP-Port-Indicator,928,20.5a.6,Enumerated,V,P,,M,Y
-MBMS-Data-Transfer-Start,929,20.5a.7,Unsigned64,V,P,,M,Y
-MBMS-Data-Transfer-Stop,930,20.5a.8,Unsigned64,V,P,,M,Y
-MBMS-Flag,931,20.5a.9,Unsigned32,V,P,,M,Y
-Restart-Counter,932,20.5a.10,Unsigned32,V,P,,M,Y
-Diagnostic-Info,933,20.5a.11,Unsigned32,V,P,,M,Y
-MBMS-Cell-List,934,20.5a.12,OctetString,V,P,,M,Y
-,,,,,,,,
-@standard,3GPP TS 29.128,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.128 V15.6.0 (2019-09),,,,,,,,
-# Mobility Management Entity (MME) and Serving GPRS Support,,,,,,,,
-# Node (SGSN) interfaces for interworking with packet data,,,,,,,,
-# networks and applications,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29128-f60.docx,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.128 Table 6.4.1-1: T6a/T6b specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Communication-Failure-Information,4300,6.4.4,Grouped,"M,V",,,,No
-Cause-Type,4301,6.4.5,Unsigned32,"M,V",,,,No
-S1AP-Cause,4302,6.4.6,Unsigned32,"M,V",,,,No
-RANAP-Cause,4303,6.4.7,Unsigned32,"M,V",,,,No
-BSSGP-Cause,4309,6.4.8,Unsigned32,"M,V",,,,No
-GMM-Cause,4304,6.4.9,Unsigned32,"M,V",,,,No
-SM-Cause,4305,6.4.10,Unsigned32,"M,V",,,,No
-Number-Of-UE-Per-Location-Configuration,4306,6.4.11,Grouped,"M,V",,,,No
-Number-Of-UE-Per-Location-Report,4307,6.4.12,Grouped,"M,V",,,,No
-UE-Count,4308,6.4.13,Unsigned32,"M,V",,,,No
-Connection-Action,4314,6.4.18,Unsigned32,"M,V",,,,No
-# Note: 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data (4315),,,,,,,,
-"# has type ""Octetstring"" instead of ""OctetString"".",,,,,,,,
-Non-IP-Data,4315,6.4.19,OctetString,"M,V",,,,No
-Serving-PLMN-Rate-Control,4310,6.4.21,Grouped,"M,V",,,,No
-Uplink-Rate-Limit,4311,6.4.23,Unsigned32,"M,V",,,,No
-Downlink-Rate-Limit,4312,6.4.22,Unsigned32,"M,V",,,,No
-Extended-PCO,4313,6.4.26,OctetString,"M,V",,,,No
-SCEF-Wait-Time,4316,6.4.24,Time,"M,V",,,,No
-CMR-Flags,4317,6.4.25,Unsigned32,"M,V",,,,No
-RRC-Cause-Counter,4318,6.4.27,Grouped,"M,V",,,,No
-Counter-Value,4319,6.4.28,Unsigned32,"M,V",,,,No
-RRC-Counter-Timestamp,4320,6.4.29,Time,"M,V",,,,No
-TDA-Flags,4321,6.4.31,Unsigned32,V,,,M,No
-Idle-Status-Indication,4322,6.4.32,Grouped,V,,,M,No
-Idle-Status-Timestamp,4323,6.4.33,Time,V,,,M,No
-Active-Time,4324,6.4.34,Unsigned32,V,,,M,No
-,,,,,,,,
-@standard,3GPP TS 29.140,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.140 V7.0.0 (2007-06),,,,,,,,
-# MM10 interface based on Diameter protocol;,,,,,,,,
-# Stage 3,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29140-700.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs,,,,,,,,
-# ,,,,,,,,
-# Note: AVPs referenced from other sources are not added here.,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Served-User-Identity,1100,6.3.1,Grouped,"M,V",,,,N
-VASP-ID,1101,6.3.3,UTF8String,"M,V",,,,N
-VAS-ID,1102,6.3.4,UTF8String,"M,V",,,,N
-Trigger-Event,1103,6.3.5,Enumerated,"M,V",,,,N
-Sender-Address,1104,6.3.7,UTF8String,"M,V",,,,N
-Initial-Recipient-Address,1105,6.3.8,Grouped,"M,V",,,,N
-Result-Recipient-Address,1106,6.3.9,Grouped,"M,V",,,,N
-# Note: Name conflict with 3GPP TS 32.329 Sequence-Number (716).,,,,,,,,
-# Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107).,,,,,,,,
-Sequence-Number-29.140,1107,6.3.10,Unsigned32,"M,V",,,,N
-# Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201).,,,,,,,,
-# Recipient-Address (1108) renamed to Recipient-Address-29.140 (1108).,,,,,,,,
-Recipient-Address-29.140,1108,6.3.11,UTF8String,"M,V",,,,N
-Routeing-Address,1109,6.3.12,UTF8String,"M,V",,,,N
-Originating-Interface,1110,6.3.13,Enumerated,"M,V",,,,N
-Delivery-Report,1111,6.3.14,Enumerated,"M,V",,,,N
-Read-Reply,1112,6.3.15,Enumerated,"M,V",,,,N
-Sender-Visibility,1113,6.3.16,Enumerated,"M,V",,,,N
-Service-Key,1114,6.3.17,UTF8String,"M,V",,,,N
-Billing-Information,1115,6.3.18,UTF8String,"M,V",,,,N
-# Note: Name conflict with 3GPP TS 32.299 Status (2702).,,,,,,,,
-# Status (1116) renamed to Status-29.140 (1116).,,,,,,,,
-Status-29.140,1116,6.3.19,Grouped,"M,V",,,,N
-Status-Code,1117,6.3.20,UTF8String,"M,V",,,,N
-Status-Text,1118,6.3.21,UTF8String,"M,V",,,,N
-Routeing-Address-Resolution,1119,6.3.22,Enumerated,"M,V",,,,N
-,,,,,,,,
-@standard,3GPP TS 29.172,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.172 V15.2.0 (2019-12),,,,,,,,
-# Location Services (LCS);,,,,,,,,
-# Evolved Packet Core (EPC) LCS Protocol (ELP) between the,,,,,,,,
-# Gateway Mobile Location Centre (GMLC) and the,,,,,,,,
-# Mobile Management Entity (MME);,,,,,,,,
-# SLg interface,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29172-f20.docx,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.172 Table 7.4.1-1: Diameter ELP Application AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-SLg-Location-Type,2500,7.4.2,Enumerated,"M, V",,,,No
-LCS-EPS-Client-Name,2501,7.4.3,Grouped,"M, V",,,,No
-LCS-Requestor-Name,2502,7.4.4,Grouped,"M, V",,,,No
-LCS-Priority,2503,7.4.5,Unsigned32,"M, V",,,,No
-LCS-QoS,2504,7.4.6,Grouped,"M, V",,,,No
-Horizontal-Accuracy,2505,7.4.7,Unsigned32,"M, V",,,,No
-Vertical-Accuracy,2506,7.4.8,Unsigned32,"M, V",,,,No
-Vertical-Requested,2507,7.4.9,Enumerated,"M, V",,,,No
-Velocity-Requested,2508,7.4.10,Enumerated,"M, V",,,,No
-Response-Time,2509,7.4.11,Enumerated,"M, V",,,,No
-Supported-GAD-Shapes,2510,7.4.12,Unsigned32,"M, V",,,,No
-LCS-Codeword,2511,7.4.13,UTF8String,"M, V",,,,No
-LCS-Privacy-Check,2512,7.4.14,Enumerated,"M, V",,,,No
-Accuracy-Fulfilment-Indicator,2513,7.4.15,Enumerated,"M, V",,,,No
-Age-Of-Location-Estimate,2514,7.4.16,Unsigned32,"M, V",,,,No
-Velocity-Estimate,2515,7.4.17,OctetString,"M, V",,,,No
-EUTRAN-Positioning-Data,2516,7.4.18,OctetString,"M, V",,,,No
-ECGI,2517,7.4.19,OctetString,"M, V",,,,No
-Location-Event,2518,7.4.20,Enumerated,"M, V",,,,No
-Pseudonym-Indicator,2519,7.4.21,Enumerated,"M, V",,,,No
-LCS-Service-Type-ID,2520,7.4.22,Unsigned32,"M, V",,,,No
-LCS-Privacy-Check-Non-Session,2521,7.4.23,Grouped,"M, V",,,,No
-LCS-Privacy-Check-Session,2522,7.4.24,Grouped,"M, V",,,,No
-LCS-QoS-Class,2523,7.4.27,Enumerated,"M, V",,,,No
-GERAN-Positioning-Info,2524,7.4.29,Grouped,V,,,M,No
-GERAN-Positioning-Data,2525,7.4.30,OctetString,V,,,M,No
-GERAN-GANSS-Positioning-Data,2526,7.4.31,OctetString,V,,,M,No
-UTRAN-Positioning-Info,2527,7.4.32,Grouped,V,,,M,No
-UTRAN-Positioning-Data,2528,7.4.33,OctetString,V,,,M,No
-UTRAN-GANSS-Positioning-Data,2529,7.4.34,OctetString,V,,,M,No
-LRR-Flags,2530,7.4.35,Unsigned32,V,,,M,No
-LCS-Reference-Number,2531,7.4.37,OctetString,V,,,M,No
-Deferred-Location-Type,2532,7.4.36,Unsigned32,V,,,M,No
-Area-Event-Info,2533,7.4.38,Grouped,V,,,M,No
-Area-Definition,2534,7.4.39,Grouped,V,,,M,No
-Area,2535,7.4.40,Grouped,V,,,M,No
-Area-Type,2536,7.4.41,Unsigned32,V,,,M,No
-Area-Identification,2537,7.4.42,Grouped,V,,,M,No
-Occurrence-Info,2538,7.4.43,Enumerated,V,,,M,No
-Interval-Time,2539,7.4.44,Unsigned32,V,,,M,No
-Periodic-LDR-Information,2540,7.4.45,Grouped,V,,,M,No
-Reporting-Amount,2541,7.4.46,Unsigned32,V,,,M,No
-Reporting-Interval,2542,7.4.47,Unsigned32,V,,,M,No
-Reporting-PLMN-List,2543,7.4.48,Grouped,V,,,M,No
-PLMN-ID-List,2544,7.4.49,Grouped,V,,,M,No
-PLR-Flags,2545,7.4.52,Unsigned32,V,,,M,No
-PLA-Flags,2546,7.4.53,Unsigned32,V,,,M,No
-Deferred-MT-LR-Data,2547,7.4.54,Grouped,V,,,M,No
-Termination-Cause,2548,7.4.55,Unsigned32,V,,,M,No
-LRA-Flags,2549,7.4.56,Unsigned32,V,,,M,No
-Periodic-Location-Support-Indicator,2550,7.4.50,Enumerated,V,,,M,No
-Prioritized-List-Indicator,2551,7.4.51,Enumerated,V,,,M,No
-ESMLC-Cell-Info,2552,7.4.57,Grouped,V,,,M,No
-Cell-Portion-ID,2553,7.4.58,Unsigned32,V,,,M,No
-1xRTT-RCID,2554,7.4.59,OctetString,V,,,M,No
-Delayed-Location-Reporting-Data,2555,7.4.60,Grouped,V,,,M,No
-Civic-Address,2556,7.4.61,UTF8String,V,,,M,No
-Barometric-Pressure,2557,7.4.62,Unsigned32,V,,,M,No
-UTRAN-Additional-Positioning-Data,2558,7.4.63,OctetString,V,,,M,No
-Motion-Event-Info,2559,7.4.64,Grouped,V,,,M,No
-Linear-Distance,2560,7.4.65,Unsigned32,V,,,M,No
-Maximum-Interval,2561,7.4.66,Unsigned32,V,,,M,No
-Sampling-Interval,2562,7.4.67,Unsigned32,V,,,M,No
-Reporting-Duration,2563,7.4.68,Unsigned32,V,,,M,No
-Reporting-Location-Requirements,2564,7.4.69,Unsigned32,V,,,M,No
-Additional-Area,2565,7.4.70,Grouped,V,,,M,No
-,,,,,,,,
-@standard,3GPP TS 29.173,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.173 V15.0.0 (2018-06),,,,,,,,
-# Location Services (LCS);,,,,,,,,
-# Diameter-based SLh interface for Control Plane LCS,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29173-f00.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.173 Table 6.4.1/1: SLh specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-LMSI,2400,6.4.2,OctetString,"M,V",,,,N
-Serving-Node,2401,6.4.3,Grouped,"M,V",,,,N
-MME-Name,2402,6.4.4,DiameterIdentity,"M,V",,,,N
-MSC-Number,2403,6.4.5,OctetString,"M,V",,,,N
-LCS-Capabilities-Sets,2404,6.4.6,Unsigned32,"M,V",,,,N
-GMLC-Address,2405,6.4.7,Address,"M,V",,,,N
-Additional-Serving-Node,2406,6.4.8,Grouped,"M,V",,,,N
-PPR-Address,2407,6.4.9,Address,"M,V",,,,N
-MME-Realm,2408,6.4.12,DiameterIdentity,V,,,M,N
-SGSN-Name,2409,6.4.13,DiameterIdentity,V,,,M,N
-SGSN-Realm,2410,6.4.14,DiameterIdentity,V,,,M,N
-RIA-Flags,2411,6.4.15,Unsigned32,V,,,M,N
-,,,,,,,,
-@standard,3GPP TS 29.210,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.210 V6.7.0 (2006-12),,,,,,,,
-# Charging rule provisioning over Gx interface,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29210-670.doc,,,,,,,,
-# ,,,,,,,,
-# Replaced by 3GPP TS 29.212.,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.210 Table 5.2: Gx specific Diameter AVPs,,,,,,,,
-# AVPs not provided by 3GPP TS 29.212.,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-PDP-Session-Operation,1015,5.2.21,Enumerated,"M,V",P,,,Y
-,,,,,,,,
-@standard,3GPP TS 29.212,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.212 V15.9.0 (2019-12),,,,,,,,
-# Policy and Charging Control (PCC); Reference points,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29212-f90.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.212 Table 5.3.0.1: Gx specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-# Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time (2801).,,,,,,,,
-ADC-Revalidation-Time,2801,5.3.93,Time,V,P,,M,Y
-3GPP-PS-Data-Off-Status,2847,5.3.133,Enumerated,V,P,,M,Y
-Access-Availability-Change-Reason,2833,5.3.121,Unsigned32,V,P,,M,Y
-Access-Network-Charging-Identifier-Gx,1022,5.3.22,Grouped,"M,V",P,,,Y
-Allocation-Retention-Priority,1034,5.3.32,Grouped,V,P,,M,Y
-AN-GW-Address,1050,5.3.49,Address,V,P,,M,Y
-AN-GW-Status,2811,5.3.100,Enumerated,V,P,,M,Y
-APN-Aggregate-Max-Bitrate-DL,1040,5.3.39,Unsigned32,V,P,,M,Y
-APN-Aggregate-Max-Bitrate-UL,1041,5.3.40,Unsigned32,V,P,,M,Y
-Application-Detection-Information,1098,5.3.91,Grouped,V,P,,M,Y
-Bearer-Control-Mode,1023,5.3.23,Enumerated,"M,V",P,,,Y
-Bearer-Identifier,1020,5.3.20,OctetString,"M,V",P,,,Y
-Bearer-Operation,1021,5.3.21,Enumerated,"M,V",P,,,Y
-Bearer-Usage,1000,5.3.1,Enumerated,"M,V",P,,,Y
-Charging-Correlation-Indicator,1073,5.3.67,Enumerated,V,P,,M,Y
-Charging-Rule-Base-Name,1004,5.3.5,UTF8String,"M,V",P,,,Y
-Charging-Rule-Definition,1003,5.3.4,Grouped,"M,V",P,,,Y
-Charging-Rule-Install,1001,5.3.2,Grouped,"M,V",P,,,Y
-Charging-Rule-Name,1005,5.3.6,OctetString,"M,V",P,,,Y
-Charging-Rule-Remove,1002,5.3.3,Grouped,"M,V",P,,,Y
-Charging-Rule-Report,1018,5.3.18,Grouped,"M,V",P,,,Y
-CoA-Information,1039,5.3.37,Grouped,V,P,,M,Y
-CoA-IP-Address,1035,5.3.33,Address,V,P,,M,Y
-Conditional-APN-Aggregate-Max-Bitrate,2818,5.3.105,Grouped,V,P,,M,Y
-Conditional-Policy-Information,2840,5.3.128,Grouped,V,P,,M,Y
-Credit-Management-Status,1082,5.3.102,Unsigned32,V,P,,M,Y
-CSG-Information-Reporting,1071,5.3.64,Enumerated,V,P,,M,Y
-Default-Access,2829,5.3.120,Enumerated,V,P,,M,Y
-Default-Bearer-Indication,2844,5.3.132,Enumerated,V,P,,M,Y
-Default-EPS-Bearer-QoS,1049,5.3.48,Grouped,V,P,,M,Y
-Default-QoS-Information,2816,5.3.103,Grouped,V,P,,M,Y
-Default-QoS-Name,2817,5.3.104,UTF8String,V,P,,M,Y
-Event-Report-Indication,1033,5.3.30,Grouped,V,P,,M,Y
-Event-Trigger,1006,5.3.7,Enumerated,"M,V",P,,,Y
-Execution-Time,2839,5.3.127,Time,V,P,,M,Y
-Extended-APN-AMBR-DL,2848,5.3.134,Unsigned32,V,P,,M,Y
-Extended-APN-AMBR-UL,2849,5.3.135,Unsigned32,V,P,,M,Y
-Extended-GBR-DL,2850,5.3.136,Unsigned32,V,P,,M,Y
-Extended-GBR-UL,2851,5.3.137,Unsigned32,V,P,,M,Y
-Flow-Direction,1080,5.3.65,Enumerated,V,P,,M,Y
-Flow-Information,1058,5.3.53,Grouped,V,P,,M,Y
-Flow-Label,1057,5.3.52,OctetString,V,P,,M,Y
-Fixed-User-Location-Info,2825,5.3.112,Grouped,V,P,,M,Y
-Guaranteed-Bitrate-DL,1025,5.3.25,Unsigned32,"M,V",P,,,Y
-Guaranteed-Bitrate-UL,1026,5.3.26,Unsigned32,"M,V",P,,,Y
-# Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN (2803).,,,,,,,,
-HeNB-BBF-FQDN,2803,5.3.94,UTF8String,V,P,,M,Y
-HeNB-Local-IP-Address,2804,5.3.95,Address,V,P,,M,Y
-IP-CAN-Session-Charging-Scope,2827,5.3.114,Enumerated,V,P,,M,Y
-IP-CAN-Type,1027,5.3.27,Enumerated,"M,V",P,,,Y
-Max-PLR-DL,2852,5.3.138,Float32,V,P,,M,Y
-Max-PLR-UL,2853,5.3.139,Float32,V,P,,M,Y
-Metering-Method,1007,5.3.8,Enumerated,"M,V",P,,,Y
-Monitoring-Flags,2828,5.3.115,Unsigned32,V,,,M,Y
-Monitoring-Key,1066,5.3.59,OctetString,V,P,,M,Y
-Mute-Notification,2809,5.3.98,Enumerated,V,P,,M,Y
-Monitoring-Time,2810,5.3.99,Time,V,P,,M,Y
-NBIFOM-Mode,2830,5.3.117,Enumerated,V,P,,M,Y
-NBIFOM-Support,2831,5.3.116,Enumerated,V,P,,M,Y
-NetLoc-Access-Support,2824,5.3.111,Unsigned32,V,P,,M,Y
-Network-Request-Support,1024,5.3.24,Enumerated,"M,V",P,,,Y
-Offline,1008,5.3.9,Enumerated,"M,V",P,,,Y
-Online,1009,5.3.10,Enumerated,"M,V",P,,,Y
-Packet-Filter-Content,1059,5.3.54,IPFilterRule,V,P,,M,Y
-Packet-Filter-Identifier,1060,5.3.55,OctetString,V,P,,M,Y
-Packet-Filter-Information,1061,5.3.56,Grouped,V,P,,M,Y
-Packet-Filter-Operation,1062,5.3.57,Enumerated,V,P,,M,Y
-Packet-Filter-Usage,1072,5.3.66,Enumerated,V,P,,M,Y
-PCC-Rule-Status,1019,5.3.19,Enumerated,"M,V",P,,,Y
-# Note: 3GPP TS 29.212 table 5.3.0.1 row PDN-Connection-ID (1065),,,,,,,,
-# missing M.,,,,,,,,
-PDN-Connection-ID,1065,5.3.58,OctetString,V,P,,,Y
-PRA-Install,2845,5.3.130,Grouped,V,P,,M,
-PRA-Remove,2846,5.3.131,Grouped,V,P,,M,
-Precedence,1010,5.3.11,Unsigned32,"M,V",P,,,Y
-Pre-emption-Capability,1047,5.3.46,Enumerated,V,P,,M,Y
-Pre-emption-Vulnerability,1048,5.3.47,Enumerated,V,P,,M,Y
-Presence-Reporting-Area-Elements-List,2820,5.3.107,OctetString,V,P,,M,Y
-Presence-Reporting-Area-Identifier,2821,5.3.108,OctetString,V,P,,M,Y
-Presence-Reporting-Area-Information,2822,5.3.109,Grouped,V,P,,M,Y
-Presence-Reporting-Area-Node,2855,5.3.141,Unsigned32,V,P,,M,Y
-Presence-Reporting-Area-Status,2823,5.3.110,Unsigned32,V,P,,M,Y
-Priority-Level,1046,5.3.45,Unsigned32,V,P,,M,Y
-# Note: 3GPP TS 29.212 table 5.3.0.1 row PS-to-CS-Session-Continuity (1099),,,,,,,,
-# missing M.,,,,,,,,
-PS-to-CS-Session-Continuity,1099,5.3.84,Enumerated,V,P,,,Y
-QoS-Class-Identifier,1028,5.3.17,Enumerated,"M,V",P,,,Y
-QoS-Information,1016,5.3.16,Grouped,"M,V",P,,,Y
-QoS-Negotiation,1029,5.3.28,Enumerated,"M,V",P,,,Y
-QoS-Upgrade,1030,5.3.29,Enumerated,"M,V",P,,,Y
-RAN-NAS-Release-Cause,2819,5.3.106,OctetString,V,P,,M,Y
-RAN-Rule-Support,2832,5.3.122,Unsigned32,V,P,,M,Y
-RAT-Type,1032,5.3.31,Enumerated,V,P,,M,Y
-Redirect-Information,1085,5.3.82,Grouped,V,P,,M,Y
-Redirect-Support,1086,5.3.83,Enumerated,V,P,,M,Y
-Removal-Of-Access,2842,5.3.126,Enumerated,V,P,,M,Y
-Reporting-Level,1011,5.3.12,Enumerated,"M,V",P,,,Y
-Resource-Allocation-Notification,1063,5.3.50,Enumerated,V,P,,M,Y
-Resource-Release-Notification,2841,5.3.125,Enumerated,V,P,,M,Y
-Revalidation-Time,1042,5.3.41,Time,"M,V",P,,,Y
-Routing-Filter,1078,5.3.72,Grouped,V,P,,M,Y
-Routing-IP-Address,1079,5.3.73,Address,V,P,,M,Y
-Routing-Rule-Definition,1076,5.3.70,Grouped,V,P,,M,Y
-Routing-Rule-Identifier,1077,5.3.71,OctetString,V,P,,M,Y
-Routing-Rule-Install,1081,5.3.68,Grouped,V,P,,M,Y
-Routing-Rule-Remove,1075,5.3.69,Grouped,V,P,,M,Y
-Routing-Rule-Failure-Code,2834,5.3.119,Unsigned32,V,P,,M,Y
-Routing-Rule-Report,2835,5.3.118,Grouped,V,P,,M,Y
-Rule-Activation-Time,1043,5.3.42,Time,"M,V",P,,,Y
-Rule-Deactivation-Time,1044,5.3.43,Time,"M,V",P,,,Y
-Rule-Failure-Code,1031,5.3.38,Enumerated,"M,V",P,,,Y
-Security-Parameter-Index,1056,5.3.51,OctetString,V,P,,M,Y
-Session-Release-Cause,1045,5.3.44,Enumerated,"M,V",P,,,Y
-TCP-Source-Port,2843,5.3.129,Unsigned32,V,P,,M,Y
-TDF-Information,1087,5.3.78,Grouped,V,P,,M,Y
-TDF-Application-Identifier,1088,5.3.77,OctetString,V,P,,M,Y
-TDF-Application-Instance-Identifier,2802,5.3.92,OctetString,V,P,,M,Y
-TDF-Destination-Host,1089,5.3.80,DiameterIdentity,V,P,,M,Y
-TDF-Destination-Realm,1090,5.3.79,DiameterIdentity,V,P,,M,Y
-TDF-IP-Address,1091,5.3.81,Address,V,P,,M,Y
-TFT-Filter,1012,5.3.13,IPFilterRule,"M,V",P,,,Y
-TFT-Packet-Filter-Information,1013,5.3.14,Grouped,"M,V",P,,,Y
-Traffic-Steering-Policy-Identifier-DL,2836,5.3.123,OctetString,V,P,,M,Y
-Traffic-Steering-Policy-Identifier-UL,2837,5.3.124,OctetString,V,P,,M,Y
-ToS-Traffic-Class,1014,5.3.15,OctetString,"M,V",P,,,Y
-Tunnel-Header-Filter,1036,5.3.34,IPFilterRule,V,P,,M,Y
-Tunnel-Header-Length,1037,5.3.35,Unsigned32,V,P,,M,Y
-Tunnel-Information,1038,5.3.36,Grouped,V,P,,M,Y
-UDP-Source-Port,2806,5.3.97,Unsigned32,V,P,,M,Y
-UE-Local-IP-Address,2805,5.3.96,Address,V,P,,M,Y
-UE-Status,2854,5.3.140,Unsigned32,V,P,,M,Y
-Usage-Monitoring-Information,1067,5.3.60,Grouped,V,P,,M,Y
-Usage-Monitoring-Level,1068,5.3.61,Enumerated,V,P,,M,Y
-Usage-Monitoring-Report,1069,5.3.62,Enumerated,V,P,,M,Y
-Usage-Monitoring-Support,1070,5.3.63,Enumerated,V,P,,M,Y
-User-Location-Info-Time,2812,5.3.101,Time,V,P,,M,Y
-PCSCF-Restoration-Indication,2826,5.3.113,Unsigned32,V,P,,M,Y
-#=,,,,,,,,
-# 3GPP TS 29.212 Table 5a.3.0.1: Gxx specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-QoS-Rule-Install,1051,5a.3.1,Grouped,"M,V",P,,,Y
-QoS-Rule-Remove,1052,5a.3.2,Grouped,"M,V",P,,,Y
-QoS-Rule-Definition,1053,5a.3.3,Grouped,"M,V",P,,,Y
-QoS-Rule-Name,1054,5a.3.4,OctetString,"M,V",P,,,Y
-QoS-Rule-Base-Name,1074,5a.3.7,UTF8String,V,P,,M,Y
-QoS-Rule-Report,1055,5a.3.5,Grouped,"M,V",P,,,Y
-Session-Linking-Indicator,1064,5a.3.6,Enumerated,"M,V",P,,,Y
-#=,,,,,,,,
-# 3GPP TS 29.212 Table 5b.3.0.1: Sd specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-ADC-Rule-Base-Name,1095,5b.3.4,UTF8String,"M,V",P,,,Y
-ADC-Rule-Definition,1094,5b.3.3,Grouped,"M,V",P,,,Y
-ADC-Rule-Install,1092,5b.3.1,Grouped,"M,V",P,,,Y
-ADC-Rule-Name,1096,5b.3.5,OctetString,"M,V",P,,,Y
-ADC-Rule-Remove,1093,5b.3.2,Grouped,"M,V",P,,,Y
-ADC-Rule-Report,1097,5b.3.6,Grouped,"M,V",P,,,Y
-#=,,,,,,,,
-# 3GPP TS 29.212 Table 5c.3.1.1: St specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Request-Type,2838,5c.3.2,Unsigned32,"M,V",P,,,Y
-#=,,,,,,,,
-# 3GPP TS 29.212 Table E.6.3.1.1: S15 specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-CS-Service-Qos-Request-Identifier,2807,E.6.3.2,OctetString,"M, V",P,,,Y
-CS-Service-QoS-Request-Operation,2808,E.6.3.3,Enumerated,"M, V",P,,,Y
-CS-Service-Resource-Report,2813,E.6.3.6,Grouped,"M, V",P,,,Y
-CS-Service-Resource-Failure-Cause,2814,E.6.3.5,Enumerated,"M, V",P,,,Y
-CS-Service-Resource-Result-Operation,2815,E.6.3.4,Enumerated,"M, V",P,,,Y
-,,,,,,,,
-@standard,3GPP TS 29.214,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.214 V15.7.0 (2019-09),,,,,,,,
-# Policy and Charging Control over Rx reference point,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29214-f70.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.214 Table 5.3.0.1: Rx specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Abort-Cause,500,5.3.1,Enumerated,"M,V",P,,,Y
-Access-Network-Charging-Address,501,5.3.2,Address,"M,V",P,,,Y
-Access-Network-Charging-Identifier,502,5.3.3,Grouped,"M,V",P,,,Y
-Access-Network-Charging-Identifier-Value,503,5.3.4,OctetString,"M,V",P,,,Y
-Acceptable-Service-Info,526,5.3.24,Grouped,"M,V",P,,,Y
-AF-Application-Identifier,504,5.3.5,OctetString,"M,V",P,,,Y
-AF-Charging-Identifier,505,5.3.6,OctetString,"M,V",P,,,Y
-AF-Requested-Data,551,5.3.50,Unsigned32,V,P,,M,Y
-AF-Signalling-Protocol,529,5.3.26,Enumerated,V,P,,M,Y
-Application-Service-Provider-Identity,532,5.3.29,UTF8String,V,P,,M,Y
-Codec-Data,524,5.3.7,OctetString,"M,V",P,,,Y
-Content-Version,552,5.3.49,Unsigned64,V,P,,M,Y
-Extended-Max-Requested-BW-DL,554,5.3.52,Unsigned32,V,P,,M,Y
-Extended-Max-Requested-BW-UL,555,5.3.53,Unsigned32,V,P,,M,Y
-Extended-Max-Supported-BW-DL,556,5.3.54,Unsigned32,V,P,,M,Y
-Extended-Max-Supported-BW-UL,557,5.3.55,Unsigned32,V,P,,M,Y
-Extended-Min-Desired-BW-DL,558,5.3.56,Unsigned32,V,P,,M,Y
-Extended-Min-Desired-BW-UL,559,5.3.57,Unsigned32,V,P,,M,Y
-Extended-Min-Requested-BW-DL,560,5.3.58,Unsigned32,V,P,,M,Y
-Extended-Min-Requested-BW-UL,561,5.3.59,Unsigned32,V,P,,M,Y
-Flow-Description,507,5.3.8,IPFilterRule,"M,V",P,,,Y
-Flow-Number,509,5.3.9,Unsigned32,"M,V",P,,,Y
-Flows,510,5.3.10,Grouped,"M,V",P,,,Y
-Flow-Status,511,5.3.11,Enumerated,"M,V",P,,,Y
-Flow-Usage,512,5.3.12,Enumerated,"M,V",P,,,Y
-GCS-Identifier,538,5.3.36,OctetString,V,P,,M,Y
-# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier (563),,,,,,,,
-"# missing M, assume MUST NOT.",,,,,,,,
-IMS-Content-Identifier,563,5.3.60,OctetString,V,P,,M,Y
-# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content (564),,,,,,,,
-"# missing M, assume MUST NOT.",,,,,,,,
-IMS-Content-Type,564,5.3.61,Enumerated,V,P,,M,Y
-IP-Domain-Id,537,5.3.35,OctetString,V,P,,M,Y
-Max-Requested-Bandwidth-DL,515,5.3.14,Unsigned32,"M,V",P,,,Y
-Max-Requested-Bandwidth-UL,516,5.3.15,Unsigned32,"M,V",P,,,Y
-Max-Supported-Bandwidth-DL,543,5.3.41,Unsigned32,V,P,,M,Y
-Max-Supported-Bandwidth-UL,544,5.3.42,Unsigned32,V,P,,M,Y
-MCPTT-Identifier,547,5.3.45,OctetString,V,P,,M,Y
-MCVideo-Identifier,562,5.3.45a,OctetString,V,P,,M,Y
-Media-Component-Description,517,5.3.16,Grouped,"M,V",P,,,Y
-Media-Component-Number,518,5.3.17,Unsigned32,"M,V",P,,,Y
-Media-Component-Status,549,5.3.48,Unsigned32,V,P,,M,Y
-Media-Sub-Component,519,5.3.18,Grouped,"M,V",P,,,Y
-Media-Type,520,5.3.19,Enumerated,"M,V",P,,,Y
-MPS-Identifier,528,5.3.30,OctetString,V,P,,M,Y
-Min-Desired-Bandwidth-DL,545,5.3.43,Unsigned32,V,P,,M,
-Min-Desired-Bandwidth-UL,546,5.3.44,Unsigned32,V,P,,M,
-Min-Requested-Bandwidth-DL,534,5.3.32,Unsigned32,V,P,,M,Y
-Min-Requested-Bandwidth-UL,535,5.3.33,Unsigned32,V,P,,M,Y
-Priority-Sharing-Indicator,550,5.3.47,Enumerated,V,P,,M,Y
-Pre-emption-Control-Info,553,5.3.51,Unsigned32,V,P,,M,Y
-Required-Access-Info,536,5.3.34,Enumerated,V,P,,M,Y
-Retry-Interval,541,5.3.39,Unsigned32,V,P,,M,Y
-Rx-Request-Type,533,5.3.31,Enumerated,V,P,,M,Y
-RR-Bandwidth,521,5.3.20,Unsigned32,"M,V",P,,,Y
-RS-Bandwidth,522,5.3.21,Unsigned32,"M,V",P,,,Y
-Service-Authorization-Info,548,5.3.46,Unsigned32,V,P,,M,Y
-Service-URN,525,5.3.23,OctetString,"M,V",P,,,Y
-Service-Info-Status,527,5.3.25,Enumerated,"M,V",P,,,Y
-Sharing-Key-DL,539,5.3.37,Unsigned32,V,P,,M,Y
-Sharing-Key-UL,540,5.3.38,Unsigned32,V,P,,M,Y
-Specific-Action,513,5.3.13,Enumerated,"M,V",P,,,Y
-SIP-Forking-Indication,523,5.3.22,Enumerated,"M,V",P,,,Y
-Sponsor-Identity,531,5.3.28,UTF8String,V,P,,M,Y
-Sponsored-Connectivity-Data,530,5.3.27,Grouped,V,P,,M,Y
-Sponsoring-Action,542,5.3.40,Enumerated,V,P,,M,Y
-,,,,,,,,
-@standard,3GPP TS 29.229,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.229 V15.2.0 (2019-09),,,,,,,,
-# Cx and Dx interfaces based on the Diameter protocol;,,,,,,,,
-# Protocol details,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29229-f20.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.229 Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,,
-# ,,,,,,,,
-# Note: AVPs referenced from other sources are not added here.,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Visited-Network-Identifier,600,6.3.1,OctetString,"M, V",,,,No
-Public-Identity,601,6.3.2,UTF8String,"M, V",,,,No
-Server-Name,602,6.3.3,UTF8String,"M, V",,,,No
-Server-Capabilities,603,6.3.4,Grouped,"M, V",,,,No
-Mandatory-Capability,604,6.3.5,Unsigned32,"M, V",,,,No
-Optional-Capability,605,6.3.6,Unsigned32,"M, V",,,,No
-User-Data,606,6.3.7,OctetString,"M, V",,,,No
-SIP-Number-Auth-Items,607,6.3.8,Unsigned32,"M, V",,,,No
-SIP-Authentication-Scheme,608,6.3.9,UTF8String,"M, V",,,,No
-SIP-Authenticate,609,6.3.10,OctetString,"M, V",,,,No
-SIP-Authorization,610,6.3.11,OctetString,"M, V",,,,No
-SIP-Authentication-Context,611,6.3.12,OctetString,"M, V",,,,No
-SIP-Auth-Data-Item,612,6.3.13,Grouped,"M, V",,,,No
-SIP-Item-Number,613,6.3.14,Unsigned32,"M, V",,,,No
-Server-Assignment-Type,614,6.3.15,Enumerated,"M, V",,,,No
-Deregistration-Reason,615,6.3.16,Grouped,"M, V",,,,No
-Reason-Code,616,6.3.17,Enumerated,"M, V",,,,No
-Reason-Info,617,6.3.18,UTF8String,"M, V",,,,No
-Charging-Information,618,6.3.19,Grouped,"M, V",,,,No
-Primary-Event-Charging-Function-Name,619,6.3.20,DiameterURI,"M, V",,,,No
-Secondary-Event-Charging-Function-Name,620,6.3.21,DiameterURI,"M, V",,,,No
-Primary-Charging-Collection-Function-Name,621,6.3.22,DiameterURI,"M, V",,,,No
-Secondary-Charging-Collection-Function-Name,622,6.3.23,DiameterURI,"M, V",,,,No
-User-Authorization-Type,623,6.3.24,Enumerated,"M, V",,,,No
-User-Data-Already-Available,624,6.3.26,Enumerated,"M, V",,,,No
-Confidentiality-Key,625,6.3.27,OctetString,"M, V",,,,No
-Integrity-Key,626,6.3.28,OctetString,"M, V",,,,No
-# Note: 3GPP TS 29.229 V6.5.0 (2005-06) removed User-Data-Request-Type (627).,,,,,,,,
-User-Data-Request-Type,627,6.3.25,Enumerated,"M, V",,,,No
-Supported-Features,628,6.3.29,Grouped,V,M,,,No
-Feature-List-ID,629,6.3.30,Unsigned32,V,,,M,No
-Feature-List,630,6.3.31,Unsigned32,V,,,M,No
-Supported-Applications,631,6.3.32,Grouped,V,,,M,No
-Associated-Identities,632,6.3.33,Grouped,V,,,M,No
-Originating-Request,633,6.3.34,Enumerated,"M,V",,,,No
-Wildcarded-Public-Identity,634,6.3.35,UTF8String,V,,,M,No
-SIP-Digest-Authenticate,635,6.3.36,Grouped,V,,,M,No
-Wildcarded-IMPU,636,6.3.43,UTF8String,V,,,M,N
-UAR-Flags,637,6.3.44,Unsigned32,V,,,M,No
-Loose-Route-Indication,638,6.3.45,Enumerated,V,,,M,No
-SCSCF-Restoration-Info,639,6.3.46,Grouped,V,,,M,No
-Path,640,6.3.47,OctetString,V,,,M,No
-Contact,641,6.3.48,OctetString,V,,,M,No
-Subscription-Info,642,6.3.49,Grouped,V,,,M,No
-Call-ID-SIP-Header,643,6.3.49.1,OctetString,V,,,M,No
-From-SIP-Header,644,6.3.49.2,OctetString,V,,,M,No
-To-SIP-Header,645,6.3.49.3,OctetString,V,,,M,No
-Record-Route,646,6.3.49.4,OctetString,V,,,M,No
-Associated-Registered-Identities,647,6.3.50,Grouped,V,,,M,No
-Multiple-Registration-Indication,648,6.3.51,Enumerated,V,,,M,No
-Restoration-Info,649,6.3.52,Grouped,V,,,M,No
-Session-Priority,650,6.3.56,Enumerated,V,,,M,No
-Identity-with-Emergency-Registration,651,6.3.57,Grouped,V,,,M,No
-Priviledged-Sender-Indication,652,6.3.58,Enumerated,V,,,M,No
-LIA-Flags,653,6.3.59,Unsigned32,V,,,M,No
-Initial-CSeq-Sequence-Number,654,6.3.62,Unsigned32,V,,,M,No
-SAR-Flags,655,6.3.63,Unsigned32,V,,,M,No
-Allowed-WAF-WWSF-Identities,656,6.3.64,Grouped,V,,,M,No
-WebRTC-Authentication-Function-Name,657,6.3.65,UTF8String,V,,,M,No
-WebRTC-Web-Server-Function-Name,658,6.3.66,UTF8String,V,,,M,No
-RTR-Flags,659,6.3.69,Unsigned32,V,,,M,No
-,,,,,,,,
-@standard,3GPP TS 29.272,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.272 V15.10.0 (2019-12),,,,,,,,
-# Mobility Management Entity (MME),,,,,,,,
-# and Serving GPRS Support Node (SGSN) related interfaces,,,,,,,,
-# based on Diameter protocol,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29272-fa0.docx,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-"# 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d, S7a/S7d and S13/S13' specific DiameterAVPs",,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Subscription-Data,1400,7.3.2,Grouped,"M,V",,,,N
-Terminal-Information,1401,7.3.3,Grouped,"M,V",,,,N
-IMEI,1402,7.3.4,UTF8String,"M,V",,,,N
-Software-Version,1403,7.3.5,UTF8String,"M,V",,,,N
-QoS-Subscribed,1404,7.3.77,OctetString,"M,V",,,,N
-ULR-Flags,1405,7.3.7,Unsigned32,"M,V",,,,N
-ULA-Flags,1406,7.3.8,Unsigned32,"M,V",,,,N
-Visited-PLMN-Id,1407,7.3.9,OctetString,"M,V",,,,N
-Requested-EUTRAN-Authentication-Info,1408,7.3.11,Grouped,"M,V",,,,N
-Requested-UTRAN-GERAN-Authentication-Info,1409,7.3.12,Grouped,"M,V",,,,N
-Number-Of-Requested-Vectors,1410,7.3.14,Unsigned32,"M,V",,,,N
-Re-Synchronization-Info,1411,7.3.15,OctetString,"M,V",,,,N
-Immediate-Response-Preferred,1412,7.3.16,Unsigned32,"M,V",,,,N
-Authentication-Info,1413,7.3.17,Grouped,"M,V",,,,N
-E-UTRAN-Vector,1414,7.3.18,Grouped,"M,V",,,,N
-UTRAN-Vector,1415,7.3.19,Grouped,"M,V",,,,N
-GERAN-Vector,1416,7.3.20,Grouped,"M,V",,,,N
-Network-Access-Mode,1417,7.3.21,Enumerated,"M,V",,,,N
-HPLMN-ODB,1418,7.3.22,Unsigned32,"M,V",,,,N
-Item-Number,1419,7.3.23,Unsigned32,"M,V",,,,N
-Cancellation-Type,1420,7.3.24,Enumerated,"M,V",,,,N
-DSR-Flags,1421,7.3.25,Unsigned32,"M,V",,,,N
-DSA-Flags,1422,7.3.26,Unsigned32,"M,V",,,,N
-Context-Identifier,1423,7.3.27,Unsigned32,"M,V",,,,N
-Subscriber-Status,1424,7.3.29,Enumerated,"M,V",,,,N
-Operator-Determined-Barring,1425,7.3.30,Unsigned32,"M,V",,,,N
-Access-Restriction-Data,1426,7.3.31,Unsigned32,"M,V",,,,N
-APN-OI-Replacement,1427,7.3.32,UTF8String,"M,V",,,,N
-All-APN-Configurations-Included-Indicator,1428,7.3.33,Enumerated,"M,V",,,,N
-APN-Configuration-Profile,1429,7.3.34,Grouped,"M,V",,,,N
-APN-Configuration,1430,7.3.35,Grouped,"M,V",,,,N
-EPS-Subscribed-QoS-Profile,1431,7.3.37,Grouped,"M,V",,,,N
-VPLMN-Dynamic-Address-Allowed,1432,7.3.38,Enumerated,"M,V",,,,N
-STN-SR,1433,7.3.39,OctetString,"M,V",,,,N
-Alert-Reason,1434,7.3.83,Enumerated,"M,V",,,,N
-AMBR,1435,7.3.41,Grouped,"M,V",,,,N
-CSG-Subscription-Data,1436,7.3.78,Grouped,"M,V",,,,N
-CSG-Id,1437,7.3.79,Unsigned32,"M,V",,,,N
-PDN-GW-Allocation-Type,1438,7.3.44,Enumerated,"M,V",,,,N
-Expiration-Date,1439,7.3.80,Time,"M,V",,,,N
-RAT-Frequency-Selection-Priority-ID,1440,7.3.46,Unsigned32,"M,V",,,,N
-IDA-Flags,1441,7.3.47,Unsigned32,"M,V",,,,N
-PUA-Flags,1442,7.3.48,Unsigned32,"M,V",,,,N
-NOR-Flags,1443,7.3.49,Unsigned32,"M,V",,,,N
-User-Id,1444,7.3.50,UTF8String,V,,,M,N
-Equipment-Status,1445,7.3.51,Enumerated,"M,V",,,,N
-Regional-Subscription-Zone-Code,1446,7.3.52,OctetString,"M,V",,,,N
-RAND,1447,7.3.53,OctetString,"M,V",,,,N
-XRES,1448,7.3.54,OctetString,"M,V",,,,N
-AUTN,1449,7.3.55,OctetString,"M,V",,,,N
-KASME,1450,7.3.56,OctetString,"M,V",,,,N
-Trace-Collection-Entity,1452,7.3.98,Address,"M,V",,,,N
-Kc,1453,7.3.59,OctetString,"M,V",,,,N
-SRES,1454,7.3.60,OctetString,"M,V",,,,N
-PDN-Type,1456,7.3.62,Enumerated,"M,V",,,,N
-Roaming-Restricted-Due-To-Unsupported-Feature,1457,7.3.81,Enumerated,"M,V",,,,N
-Trace-Data,1458,7.3.63,Grouped,"M,V",,,,N
-Trace-Reference,1459,7.3.64,OctetString,"M,V",,,,N
-Trace-Depth,1462,7.3.67,Enumerated,"M,V",,,,N
-Trace-NE-Type-List,1463,7.3.68,OctetString,"M,V",,,,N
-Trace-Interface-List,1464,7.3.69,OctetString,"M,V",,,,N
-Trace-Event-List,1465,7.3.70,OctetString,"M,V",,,,N
-OMC-Id,1466,7.3.71,OctetString,"M,V",,,,N
-GPRS-Subscription-Data,1467,7.3.72,Grouped,"M,V",,,,N
-Complete-Data-List-Included-Indicator,1468,7.3.73,Enumerated,"M,V",,,,N
-PDP-Context,1469,7.3.74,Grouped,"M,V",,,,N
-PDP-Type,1470,7.3.75,OctetString,"M,V",,,,N
-3GPP2-MEID,1471,7.3.6,OctetString,"M,V",,,,N
-Specific-APN-Info,1472,7.3.82,Grouped,"M,V",,,,N
-LCS-Info,1473,7.3.84,Grouped,"M,V",,,,N
-GMLC-Number,1474,7.3.85,OctetString,"M,V",,,,N
-LCS-PrivacyException,1475,7.3.86,Grouped,"M,V",,,,N
-SS-Code,1476,7.3.87,OctetString,"M,V",,,,N
-# Note: 3GPP TS 29.272 V12.5.0 (2014-06) table 7.3.1/1,,,,,,,,
-# changed row SS-Status (1477) to be OctetString instead of Grouped.,,,,,,,,
-# Clause 7.3.88 already described SS-Status (1147) as OctetString.,,,,,,,,
-SS-Status,1477,7.3.88,OctetString,"M,V",,,,N
-Notification-To-UE-User,1478,7.3.89,Enumerated,"M,V",,,,N
-External-Client,1479,7.3.90,Grouped,"M,V",,,,N
-Client-Identity,1480,7.3.91,OctetString,"M,V",,,,N
-GMLC-Restriction,1481,7.3.92,Enumerated,"M,V",,,,N
-PLMN-Client,1482,7.3.93,Enumerated,"M,V",,,,N
-Service-Type,1483,7.3.94,Grouped,"M,V",,,,N
-ServiceTypeIdentity,1484,7.3.95,Unsigned32,"M,V",,,,N
-MO-LR,1485,7.3.96,Grouped,"M,V",,,,N
-Teleservice-List,1486,7.3.99,Grouped,"M,V",,,,N
-TS-Code,1487,7.3.100,OctetString,"M,V",,,,N
-# Note: 3GPP TS 29.272 V12.4.0 (2014-03) renamed,,,,,,,,
-# Call-Barring-Infor-List (1488) to Call-Barring-Info (1488).,,,,,,,,
-Call-Barring-Info,1488,7.3.101,Grouped,"M,V",,,,N
-SGSN-Number,1489,7.3.102,OctetString,"M,V",,,,N
-IDR-Flags,1490,7.3.103,Unsigned32,"M,V",,,,N
-ICS-Indicator,1491,7.3.104,Enumerated,V,,,M,N
-IMS-Voice-Over-PS-Sessions-Supported,1492,7.3.106,Enumerated,V,,,M,N
-Homogeneous-Support-of-IMS-Voice-Over-PS-Sessions,1493,7.3.107,Enumerated,V,,,M,N
-Last-UE-Activity-Time,1494,7.3.108,Time,V,,,M,N
-EPS-User-State,1495,7.3.110,Grouped,V,,,M,N
-EPS-Location-Information,1496,7.3.111,Grouped,V,,,M,N
-MME-User-State,1497,7.3.112,Grouped,V,,,M,N
-SGSN-User-State,1498,7.3.113,Grouped,V,,,M,N
-User-State,1499,7.3.114,Enumerated,V,,,M,N
-# Note: 3GPP TS 29.272 table 7.3.1/1 row MME-Location-Information (1600),,,,,,,,
-# incorrectly has a space instead of hyphen in the name.,,,,,,,,
-# Generated name renamed from MME-LocationInformation (1600).,,,,,,,,
-MME-Location-Information,1600,7.3.115,Grouped,V,,,M,N
-SGSN-Location-Information,1601,7.3.116,Grouped,V,,,M,N
-E-UTRAN-Cell-Global-Identity,1602,7.3.117,OctetString,V,,,M,N
-Tracking-Area-Identity,1603,7.3.118,OctetString,V,,,M,N
-Cell-Global-Identity,1604,7.3.119,OctetString,V,,,M,N
-Routing-Area-Identity,1605,7.3.120,OctetString,V,,,M,N
-Location-Area-Identity,1606,7.3.121,OctetString,V,,,M,N
-Service-Area-Identity,1607,7.3.122,OctetString,V,,,M,N
-Geographical-Information,1608,7.3.123,OctetString,V,,,M,N
-Geodetic-Information,1609,7.3.124,OctetString,V,,,M,N
-Current-Location-Retrieved,1610,7.3.125,Enumerated,V,,,M,N
-Age-Of-Location-Information,1611,7.3.126,Unsigned32,V,,,M,N
-Active-APN,1612,7.3.127,Grouped,V,,,M,N
-Error-Diagnostic,1614,7.3.128,Enumerated,V,,,M,N
-Ext-PDP-Address,1621,7.3.129,Address,V,,,M,N
-UE-SRVCC-Capability,1615,7.3.130,Enumerated,V,,,M,N
-MPS-Priority,1616,7.3.131,Unsigned32,V,,,M,N
-VPLMN-LIPA-Allowed,1617,7.3.132,Enumerated,V,,,M,N
-LIPA-Permission,1618,7.3.133,Enumerated,V,,,M,N
-Subscribed-Periodic-RAU-TAU-Timer,1619,7.3.134,Unsigned32,V,,,M,N
-Ext-PDP-Type,1620,7.3.75A,OctetString,V,,,M,N
-SIPTO-Permission,1613,7.3.135,Enumerated,V,,,M,N
-MDT-Configuration,1622,7.3.136,Grouped,V,,,M,N
-Job-Type,1623,7.3.137,Enumerated,V,,,M,N
-Area-Scope,1624,7.3.138,Grouped,V,,,M,N
-List-Of-Measurements,1625,7.3.139,Unsigned32,V,,,M,N
-Reporting-Trigger,1626,7.3.140,Unsigned32,V,,,M,N
-Report-Interval,1627,7.3.141,Enumerated,V,,,M,N
-Report-Amount,1628,7.3.142,Enumerated,V,,,M,N
-Event-Threshold-RSRP,1629,7.3.143,Unsigned32,V,,,M,N
-Event-Threshold-RSRQ,1630,7.3.144,Unsigned32,V,,,M,N
-Logging-Interval,1631,7.3.145,Enumerated,V,,,M,N
-Logging-Duration,1632,7.3.146,Enumerated,V,,,M,N
-Relay-Node-Indicator,1633,7.3.147,Enumerated,V,,,M,N
-MDT-User-Consent,1634,7.3.148,Enumerated,V,,,M,N
-PUR-Flags,1635,7.3.149,Unsigned32,V,,,M,N
-Subscribed-VSRVCC,1636,7.3.150,Enumerated,V,,,M,N
-Equivalent-PLMN-List,1637,7.3.151,Grouped,V,,,M,N
-CLR-Flags,1638,7.3.152,Unsigned32,V,,,M,N
-UVR-Flags,1639,7.3.153,Unsigned32,"M,V",,,,N
-UVA-Flags,1640,7.3.154,Unsigned32,"M,V",,,,N
-VPLMN-CSG-Subscription-Data,1641,7.3.155,Grouped,"M,V",,,,N
-Time-Zone,1642,7.3.163,UTF8String,V,,,M,N
-A-MSISDN,1643,7.3.157,OctetString,V,,,M,N
-MME-Number-for-MT-SMS,1645,7.3.159,OctetString,V,,,M,N
-SMS-Register-Request,1648,7.3.162,Enumerated,V,,,M,N
-Local-Time-Zone,1649,7.3.156,Grouped,V,,,M,N
-Daylight-Saving-Time,1650,7.3.164,Enumerated,V,,,M,N
-Subscription-Data-Flags,1654,7.3.165,Unsigned32,V,,,M,N
-# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
-# Measurement-Period-LTE (1655) from 1656.,,,,,,,,
-Measurement-Period-LTE,1655,7.3.166,Enumerated,V,,,M,N
-# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
-# Measurement-Period-UMTS (1656) from 1655.,,,,,,,,
-Measurement-Period-UMTS,1656,7.3.167,Enumerated,V,,,M,N
-Collection-Period-RRM-LTE,1657,7.3.168,Enumerated,V,,,M,N
-Collection-Period-RRM-UMTS,1658,7.3.169,Enumerated,V,,,M,N
-Positioning-Method,1659,7.3.170,OctetString,V,,,M,N
-Measurement-Quantity,1660,7.3.171,OctetString,V,,,M,N
-Event-Threshold-Event-1F,1661,7.3.172,Integer32,V,,,M,N
-Event-Threshold-Event-1I,1662,7.3.173,Integer32,V,,,M,N
-Restoration-Priority,1663,7.3.174,Unsigned32,V,,,M,N
-SGs-MME-Identity,1664,7.3.175,UTF8String,V,,,M,N
-SIPTO-Local-Network-Permission,1665,7.3.176,Unsigned32,V,,,M,N
-Coupled-Node-Diameter-ID,1666,7.3.177,DiameterIdentity,V,,,M,N
-WLAN-offloadability,1667,7.3.181,Grouped,V,,,M,N
-WLAN-offloadability-EUTRAN,1668,7.3.182,Unsigned32,V,,,M,N
-WLAN-offloadability-UTRAN,1669,7.3.183,Unsigned32,V,,,M,N
-Reset-ID,1670,7.3.184,OctetString,V,,,M,N
-MDT-Allowed-PLMN-Id,1671,7.3.185,OctetString,V,,,M,N
-Adjacent-PLMNs,1672,7.3.186,Grouped,V,,,M,N
-Adjacent-Access-Restriction-Data,1673,7.3.187,Grouped,V,,,M,N
-DL-Buffering-Suggested-Packet-Count,1674,7.3.188,Integer32,V,,,M,N
-IMSI-Group-Id,1675,7.3.189,Grouped,V,,,M,N
-Group-Service-Id,1676,7.3.190,Unsigned32,V,,,M,N
-Group-PLMN-Id,1677,7.3.191,OctetString,V,,,M,N
-Local-Group-Id,1678,7.3.192,OctetString,V,,,M,N
-AIR-Flags,1679,7.3.201,Unsigned32,V,,,M,N
-UE-Usage-Type,1680,7.3.202,Unsigned32,V,,,M,N
-Non-IP-PDN-Type-Indicator,1681,7.3.204,Enumerated,V,,,M,N
-Non-IP-Data-Delivery-Mechanism,1682,7.3.205,Unsigned32,V,,,M,N
-Additional-Context-ID,1683,7.3.206,Unsigned32,V,,,M,N
-SCEF-Realm,1684,7.3.207,DiameterIdentity,V,,,M,N
-Subscription-Data-Deletion,1685,7.3.208,Grouped,V,,,M,N
-# Note: 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode (1686),,,,,,,,
-"# incorrectly has value type Grouped instead of Unsigned32,",,,,,,,,
-# conflicting with clause 7.3.209.,,,,,,,,
-Preferred-Data-Mode,1686,7.3.209,Unsigned32,V,,,M,N
-Emergency-Info,1687,7.3.210,Grouped,V,,,M,N
-V2X-Subscription-Data,1688,7.3.212,Grouped,V,,,M,N
-V2X-Permission,1689,7.3.213,Unsigned32,V,,,M,N
-PDN-Connection-Continuity,1690,7.3.214,Unsigned32,V,,,M,N
-eDRX-Cycle-Length,1691,7.3.215,Grouped,V,,,M,N
-eDRX-Cycle-Length-Value,1692,7.3.216,OctetString,V,,,M,N
-UE-PC5-AMBR,1693,7.3.217,Unsigned32,V,,,M,N
-MBSFN-Area,1694,7.3.219,Grouped,V,,,M,N
-MBSFN-Area-ID,1695,7.3.220,Unsigned32,V,,,M,N
-Carrier-Frequency,1696,7.3.221,Unsigned32,V,,,M,N
-RDS-Indicator,1697,7.3.222,Enumerated,V,,,M,N
-Service-Gap-Time,1698,7.3.223,Unsigned32,V,,,M,N
-Aerial-UE-Subscription-Information,1699,7.3.224,Unsigned32,V,,,M,N
-Broadcast-Location-Assistance-Data-Types,1700,7.3.225,Unsigned64,V,,,M,N
-Paging-Time-Window,1701,7.3.226,Grouped,V,,,M,N
-Operation-Mode,1702,7.3.227,Unsigned32,V,,,M,N
-Paging-Time-Window-Length,1703,7.3.228,OctetString,V,,,M,N
-Core-Network-Restrictions,1704,7.3.230,Unsigned32,V,,,M,N
-eDRX-Related-RAT,1705,7.3.229,Grouped,V,,,M,N
-Interworking-5GS-Indicator,1706,7.3.231,Enumerated,V,,,M,N
-,,,,,,,,
+Attribute Name,AVP Code,Section defined,Value Type,MUST,MAY,SHOULD NOT,MUST NOT
+@vendor,10415,,,,,,
+,,,,,,,
+@standard,3GPP TS 29.061,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.061 V15.5.0 (2018-12),,,,,,,
+# Interworking between the Public Land Mobile Network (PLMN),,,,,,,
+# supporting packet based services and,,,,,,,
+# Packet Data Networks (PDN),,,,,,,
+# ,,,,,,,
+# From 3GPP 29061-f50.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.061 Table 9a: Gi/Sgi specific AVPs,,,,,,,
+#,,,,,,,
+# Note: 3GPP TS 29.061 is unclear and inconsistent about M.,,,,,,,
+"# For this reason, other sources are assumed more trustworthy.",,,,,,,
+#=,,,,,,,
+#,,,,,,,
+# Note: 3GPP-IMSI (1) changed to Must M.,,,,,,,
+3GPP-IMSI,1,16.4.7,UTF8String,"M,V",P,,
+"# Note: 3GPP-Charging-Id (2) type changed from OctetString to Unsigned32,",,,,,,,
+# per 3GPP TS 29.061 clause 16.4.7.2/2 and packet dumps.,,,,,,,
+3GPP-Charging-Id,2,16.4.7,Unsigned32,"M,V",P,,
+# Note: 3GPP-PDP-Type (3) changed to Must M.,,,,,,,
+3GPP-PDP-Type,3,16.4.7,Enumerated,"M,V",P,,
+3GPP-CG-Address,4,16.4.7,OctetString,V,P,,M
+# Note: 3GPP-GPRS-Negotiated-QoS-Profile (5) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-GPRS-Negotiated-QoS-Profile,5,16.4.7,UTF8String,"M,V",P,,
+3GPP-SGSN-Address,6,16.4.7,OctetString,V,P,,M
+3GPP-GGSN-Address,7,16.4.7,OctetString,V,P,,M
+# Note: 3GPP-IMSI-MCC-MNC (8) changed to Must M per packet dumps.,,,,,,,
+3GPP-IMSI-MCC-MNC,8,16.4.7,UTF8String,"M,V",P,,
+# Note: 3GPP-GGSN-MCC-MNC (9) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-GGSN-MCC-MNC,9,16.4.7,UTF8String,"M,V",P,,
+# Note: 3GPP-NSAPI (10) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-NSAPI,10,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 table 9a does not define,,,,,,,
+# 3GPP-Session-Stop-Indicator (11) even when it is referenced,,,,,,,
+# by other 3GPP Diameter AVPs including PS-Information (874).,,,,,,,
+3GPP-Session-Stop-Indicator,11,16.4.7,OctetString,V,P,,M
+# Note: 3GPP-Selection-Mode (12) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-Selection-Mode,12,16.4.7,UTF8String,"M,V",P,,
+# Note: 3GPP-Charging-Characteristics (13) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-Charging-Characteristics,13,16.4.7,UTF8String,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# 3GPP-CG-IPv6-Address (14) to 3GPP-CG-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+# 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-CG-IPv6-Address,14,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# 3GPP-SGSN-IPv6-Address (15) to 3GPP-SGSN-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+# 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-SGSN-IPv6-Address,15,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# 3GPP-GGSN-IPv6-Address (16) to 3GPP-GGSN-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+# 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-GGSN-IPv6-Address,16,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# 3GPP-IPv6-DNS-Servers (17) to 3GPP-Ipv6-DNS-Servers.,,,,,,,
+# This rename was not applied.,,,,,,,
+# 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-IPv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP-SGSN-MCC-MNC (18) changed to Must M per contrib/3gpp.,,,,,,,
+3GPP-SGSN-MCC-MNC,18,16.4.7,UTF8String,"M,V",P,,
+# Note: 3GPP-IMEISV (20) changed to Must M.,,,,,,,
+3GPP-IMEISV,20,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP-RAT-Type (21) changed to Must M.,,,,,,,
+3GPP-RAT-Type,21,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP-User-Location-Info (22) changed to Must M.,,,,,,,
+3GPP-User-Location-Info,22,16.4.7,OctetString,"M,V",P,,
+# Note: 3GPP-MS-TimeZone (23) changed to Must M.,,,,,,,
+3GPP-MS-TimeZone,23,16.4.7,OctetString,"M,V",P,,
+3GPP-CAMEL-Charging-Info,24,16.4.7,OctetString,V,P,,M
+3GPP-Packet-Filter,25,16.4.7,OctetString,V,P,,M
+3GPP-Negotiated-DSCP,26,16.4.7,OctetString,V,P,,M
+3GPP-Allocate-IP-Type,27,16.4.7,OctetString,V,P,,M
+# Note: 3GPP TS 29.061 table 9a does not define,,,,,,,
+# External-Identifier (28) for Diameter.,,,,,,,
+# 3GPP TS 29.061 table 9b refers to 3GPP TS 29.336,,,,,,,
+# for External-Identifier (3111).,,,,,,,
+# ,,,,,,,
+# External-Identifier (28) OctetString replaced by,,,,,,,
+# External-Identifier (3111) UTF8String.,,,,,,,
+#,,,,,,,
+#,,,,,,,
+TWAN-Identifier,29,16.4.7,OctetString,V,P,,M
+3GPP-User-Location-Info-Time,30,16.4.7,OctetString,V,P,,M
+3GPP-Secondary-RAT-Usage,31,16.4.7,OctetString,V,P,,M
+#=,,,,,,,
+# 3GPP TS 29.061 Table 10: Gmb specific AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+TMGI,900,17.7.2,OctetString,"M,V",P,,
+Required-MBMS-Bearer-Capabilities,901,17.7.3,UTF8String,"M,V",P,,
+MBMS-StartStop-Indication,902,17.7.5,Enumerated,"M,V",P,,
+MBMS-Service-Area,903,17.7.6,OctetString,"M,V",P,,
+MBMS-Session-Duration,904,17.7.7,OctetString,"M,V",P,,
+Alternative-APN,905,17.7.8,UTF8String,"M,V",P,,
+MBMS-Service-Type,906,17.7.9,Enumerated,"M,V",P,,
+MBMS-2G-3G-Indicator,907,17.7.10,Enumerated,"M, V",P,,
+MBMS-Session-Identity,908,17.7.11,OctetString,"M,V",P,,
+RAI,909,17.7.12,UTF8String,"M, V",P,,
+Additional-MBMS-Trace-Info,910,17.7.13,OctetString,"M,V",P,,
+MBMS-Time-To-Data-Transfer,911,17.7.14,OctetString,"M,V",P,,
+MBMS-Session-Repetition-Number,912,17.7.15,OctetString,"M,V",P,,
+MBMS-Required-QoS,913,17.7.16,UTF8String,"M,V",P,,
+MBMS-Counting-Information,914,17.7.17,Enumerated,"M,V",P,,
+MBMS-User-Data-Mode-Indication,915,17.7.18,Enumerated,"M,V",P,,
+MBMS-GGSN-Address,916,17.7.19,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# MBMS-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+MBMS-GGSN-IPv6-Address,917,17.7.20,OctetString,"M,V",P,,
+MBMS-BMSC-SSM-IP-Address,918,17.7.21,OctetString,"M,V",P,,
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# MBMS-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+MBMS-BMSC-SSM-IPv6-Address,919,17.7.22,OctetString,"M,V",P,,
+MBMS-Flow-Identifier,920,17.7.23,OctetString,"M,V",P,,
+CN-IP-Multicast-Distribution,921,17.7.24,Enumerated,"M,V",P,,
+MBMS-HC-Indicator,922,17.7.25,Enumerated,"M,V",P,,
+#=,,,,,,,
+# 3GPP TS 29.061 Table 20.5a.1: SGmb specific AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+MBMS-Access-Indicator,923,20.5a.1,Enumerated,"M,V",P,,
+MBMS-GW-SSM-IP-Address,924,20.5a.2,OctetString,V,P,,M
+# Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,
+# MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address.,,,,,,,
+# This rename was not applied.,,,,,,,
+MBMS-GW-SSM-IPv6-Address,925,20.5a.3,OctetString,V,P,,M
+MBMS-BMSC-SSM-UDP-Port,926,20.5a.4,OctetString,V,P,,M
+MBMS-GW-UDP-Port,927,20.5a.5,OctetString,V,P,,M
+MBMS-GW-UDP-Port-Indicator,928,20.5a.6,Enumerated,V,P,,M
+MBMS-Data-Transfer-Start,929,20.5a.7,Unsigned64,V,P,,M
+MBMS-Data-Transfer-Stop,930,20.5a.8,Unsigned64,V,P,,M
+MBMS-Flag,931,20.5a.9,Unsigned32,V,P,,M
+Restart-Counter,932,20.5a.10,Unsigned32,V,P,,M
+Diagnostic-Info,933,20.5a.11,Unsigned32,V,P,,M
+MBMS-Cell-List,934,20.5a.12,OctetString,V,P,,M
+,,,,,,,
+@standard,3GPP TS 29.128,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.128 V15.6.0 (2019-09),,,,,,,
+# Mobility Management Entity (MME) and Serving GPRS Support,,,,,,,
+# Node (SGSN) interfaces for interworking with packet data,,,,,,,
+# networks and applications,,,,,,,
+# ,,,,,,,
+# From 3GPP 29128-f60.docx,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.128 Table 6.4.1-1: T6a/T6b specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Communication-Failure-Information,4300,6.4.4,Grouped,"M,V",,,
+Cause-Type,4301,6.4.5,Unsigned32,"M,V",,,
+S1AP-Cause,4302,6.4.6,Unsigned32,"M,V",,,
+RANAP-Cause,4303,6.4.7,Unsigned32,"M,V",,,
+BSSGP-Cause,4309,6.4.8,Unsigned32,"M,V",,,
+GMM-Cause,4304,6.4.9,Unsigned32,"M,V",,,
+SM-Cause,4305,6.4.10,Unsigned32,"M,V",,,
+Number-Of-UE-Per-Location-Configuration,4306,6.4.11,Grouped,"M,V",,,
+Number-Of-UE-Per-Location-Report,4307,6.4.12,Grouped,"M,V",,,
+UE-Count,4308,6.4.13,Unsigned32,"M,V",,,
+Connection-Action,4314,6.4.18,Unsigned32,"M,V",,,
+# Note: 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data (4315),,,,,,,
+"# has type ""Octetstring"" instead of ""OctetString"".",,,,,,,
+Non-IP-Data,4315,6.4.19,OctetString,"M,V",,,
+Serving-PLMN-Rate-Control,4310,6.4.21,Grouped,"M,V",,,
+Uplink-Rate-Limit,4311,6.4.23,Unsigned32,"M,V",,,
+Downlink-Rate-Limit,4312,6.4.22,Unsigned32,"M,V",,,
+Extended-PCO,4313,6.4.26,OctetString,"M,V",,,
+SCEF-Wait-Time,4316,6.4.24,Time,"M,V",,,
+CMR-Flags,4317,6.4.25,Unsigned32,"M,V",,,
+RRC-Cause-Counter,4318,6.4.27,Grouped,"M,V",,,
+Counter-Value,4319,6.4.28,Unsigned32,"M,V",,,
+RRC-Counter-Timestamp,4320,6.4.29,Time,"M,V",,,
+TDA-Flags,4321,6.4.31,Unsigned32,V,,,M
+Idle-Status-Indication,4322,6.4.32,Grouped,V,,,M
+Idle-Status-Timestamp,4323,6.4.33,Time,V,,,M
+Active-Time,4324,6.4.34,Unsigned32,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.140,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.140 V7.0.0 (2007-06),,,,,,,
+# MM10 interface based on Diameter protocol;,,,,,,,
+# Stage 3,,,,,,,
+# ,,,,,,,
+# From 3GPP 29140-700.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs,,,,,,,
+# ,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Served-User-Identity,1100,6.3.1,Grouped,"M,V",,,
+VASP-ID,1101,6.3.3,UTF8String,"M,V",,,
+VAS-ID,1102,6.3.4,UTF8String,"M,V",,,
+Trigger-Event,1103,6.3.5,Enumerated,"M,V",,,
+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 32.329 Sequence-Number (716).,,,,,,,
+# Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107).,,,,,,,
+Sequence-Number-29.140,1107,6.3.10,Unsigned32,"M,V",,,
+# Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201).,,,,,,,
+# Recipient-Address (1108) renamed to Recipient-Address-29.140 (1108).,,,,,,,
+Recipient-Address-29.140,1108,6.3.11,UTF8String,"M,V",,,
+Routeing-Address,1109,6.3.12,UTF8String,"M,V",,,
+Originating-Interface,1110,6.3.13,Enumerated,"M,V",,,
+Delivery-Report,1111,6.3.14,Enumerated,"M,V",,,
+Read-Reply,1112,6.3.15,Enumerated,"M,V",,,
+Sender-Visibility,1113,6.3.16,Enumerated,"M,V",,,
+Service-Key,1114,6.3.17,UTF8String,"M,V",,,
+Billing-Information,1115,6.3.18,UTF8String,"M,V",,,
+# Note: Name conflict with 3GPP TS 32.299 Status (2702).,,,,,,,
+# Status (1116) renamed to Status-29.140 (1116).,,,,,,,
+Status-29.140,1116,6.3.19,Grouped,"M,V",,,
+Status-Code,1117,6.3.20,UTF8String,"M,V",,,
+Status-Text,1118,6.3.21,UTF8String,"M,V",,,
+Routeing-Address-Resolution,1119,6.3.22,Enumerated,"M,V",,,
+,,,,,,,
+@standard,3GPP TS 29.172,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.172 V15.2.0 (2019-12),,,,,,,
+# Location Services (LCS);,,,,,,,
+# Evolved Packet Core (EPC) LCS Protocol (ELP) between the,,,,,,,
+# Gateway Mobile Location Centre (GMLC) and the,,,,,,,
+# Mobile Management Entity (MME);,,,,,,,
+# SLg interface,,,,,,,
+# ,,,,,,,
+# From 3GPP 29172-f20.docx,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.172 Table 7.4.1-1: Diameter ELP Application AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+SLg-Location-Type,2500,7.4.2,Enumerated,"M, V",,,
+LCS-EPS-Client-Name,2501,7.4.3,Grouped,"M, V",,,
+LCS-Requestor-Name,2502,7.4.4,Grouped,"M, V",,,
+LCS-Priority,2503,7.4.5,Unsigned32,"M, V",,,
+LCS-QoS,2504,7.4.6,Grouped,"M, V",,,
+Horizontal-Accuracy,2505,7.4.7,Unsigned32,"M, V",,,
+Vertical-Accuracy,2506,7.4.8,Unsigned32,"M, V",,,
+Vertical-Requested,2507,7.4.9,Enumerated,"M, V",,,
+Velocity-Requested,2508,7.4.10,Enumerated,"M, V",,,
+Response-Time,2509,7.4.11,Enumerated,"M, V",,,
+Supported-GAD-Shapes,2510,7.4.12,Unsigned32,"M, V",,,
+LCS-Codeword,2511,7.4.13,UTF8String,"M, V",,,
+LCS-Privacy-Check,2512,7.4.14,Enumerated,"M, V",,,
+Accuracy-Fulfilment-Indicator,2513,7.4.15,Enumerated,"M, V",,,
+Age-Of-Location-Estimate,2514,7.4.16,Unsigned32,"M, V",,,
+Velocity-Estimate,2515,7.4.17,OctetString,"M, V",,,
+EUTRAN-Positioning-Data,2516,7.4.18,OctetString,"M, V",,,
+ECGI,2517,7.4.19,OctetString,"M, V",,,
+Location-Event,2518,7.4.20,Enumerated,"M, V",,,
+Pseudonym-Indicator,2519,7.4.21,Enumerated,"M, V",,,
+LCS-Service-Type-ID,2520,7.4.22,Unsigned32,"M, V",,,
+LCS-Privacy-Check-Non-Session,2521,7.4.23,Grouped,"M, V",,,
+LCS-Privacy-Check-Session,2522,7.4.24,Grouped,"M, V",,,
+LCS-QoS-Class,2523,7.4.27,Enumerated,"M, V",,,
+GERAN-Positioning-Info,2524,7.4.29,Grouped,V,,,M
+GERAN-Positioning-Data,2525,7.4.30,OctetString,V,,,M
+GERAN-GANSS-Positioning-Data,2526,7.4.31,OctetString,V,,,M
+UTRAN-Positioning-Info,2527,7.4.32,Grouped,V,,,M
+UTRAN-Positioning-Data,2528,7.4.33,OctetString,V,,,M
+UTRAN-GANSS-Positioning-Data,2529,7.4.34,OctetString,V,,,M
+LRR-Flags,2530,7.4.35,Unsigned32,V,,,M
+LCS-Reference-Number,2531,7.4.37,OctetString,V,,,M
+Deferred-Location-Type,2532,7.4.36,Unsigned32,V,,,M
+Area-Event-Info,2533,7.4.38,Grouped,V,,,M
+Area-Definition,2534,7.4.39,Grouped,V,,,M
+Area,2535,7.4.40,Grouped,V,,,M
+Area-Type,2536,7.4.41,Unsigned32,V,,,M
+Area-Identification,2537,7.4.42,Grouped,V,,,M
+Occurrence-Info,2538,7.4.43,Enumerated,V,,,M
+Interval-Time,2539,7.4.44,Unsigned32,V,,,M
+Periodic-LDR-Information,2540,7.4.45,Grouped,V,,,M
+Reporting-Amount,2541,7.4.46,Unsigned32,V,,,M
+Reporting-Interval,2542,7.4.47,Unsigned32,V,,,M
+Reporting-PLMN-List,2543,7.4.48,Grouped,V,,,M
+PLMN-ID-List,2544,7.4.49,Grouped,V,,,M
+PLR-Flags,2545,7.4.52,Unsigned32,V,,,M
+PLA-Flags,2546,7.4.53,Unsigned32,V,,,M
+Deferred-MT-LR-Data,2547,7.4.54,Grouped,V,,,M
+Termination-Cause,2548,7.4.55,Unsigned32,V,,,M
+LRA-Flags,2549,7.4.56,Unsigned32,V,,,M
+Periodic-Location-Support-Indicator,2550,7.4.50,Enumerated,V,,,M
+Prioritized-List-Indicator,2551,7.4.51,Enumerated,V,,,M
+ESMLC-Cell-Info,2552,7.4.57,Grouped,V,,,M
+Cell-Portion-ID,2553,7.4.58,Unsigned32,V,,,M
+1xRTT-RCID,2554,7.4.59,OctetString,V,,,M
+Delayed-Location-Reporting-Data,2555,7.4.60,Grouped,V,,,M
+Civic-Address,2556,7.4.61,UTF8String,V,,,M
+Barometric-Pressure,2557,7.4.62,Unsigned32,V,,,M
+UTRAN-Additional-Positioning-Data,2558,7.4.63,OctetString,V,,,M
+Motion-Event-Info,2559,7.4.64,Grouped,V,,,M
+Linear-Distance,2560,7.4.65,Unsigned32,V,,,M
+Maximum-Interval,2561,7.4.66,Unsigned32,V,,,M
+Sampling-Interval,2562,7.4.67,Unsigned32,V,,,M
+Reporting-Duration,2563,7.4.68,Unsigned32,V,,,M
+Reporting-Location-Requirements,2564,7.4.69,Unsigned32,V,,,M
+Additional-Area,2565,7.4.70,Grouped,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.173,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.173 V15.0.0 (2018-06),,,,,,,
+# Location Services (LCS);,,,,,,,
+# Diameter-based SLh interface for Control Plane LCS,,,,,,,
+# ,,,,,,,
+# From 3GPP 29173-f00.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.173 Table 6.4.1/1: SLh specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+LMSI,2400,6.4.2,OctetString,"M,V",,,
+Serving-Node,2401,6.4.3,Grouped,"M,V",,,
+MME-Name,2402,6.4.4,DiameterIdentity,"M,V",,,
+MSC-Number,2403,6.4.5,OctetString,"M,V",,,
+LCS-Capabilities-Sets,2404,6.4.6,Unsigned32,"M,V",,,
+GMLC-Address,2405,6.4.7,Address,"M,V",,,
+Additional-Serving-Node,2406,6.4.8,Grouped,"M,V",,,
+PPR-Address,2407,6.4.9,Address,"M,V",,,
+MME-Realm,2408,6.4.12,DiameterIdentity,V,,,M
+SGSN-Name,2409,6.4.13,DiameterIdentity,V,,,M
+SGSN-Realm,2410,6.4.14,DiameterIdentity,V,,,M
+RIA-Flags,2411,6.4.15,Unsigned32,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.210,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.210 V6.7.0 (2006-12),,,,,,,
+# Charging rule provisioning over Gx interface,,,,,,,
+# ,,,,,,,
+# From 3GPP 29210-670.doc,,,,,,,
+# ,,,,,,,
+# Replaced by 3GPP TS 29.212.,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.210 Table 5.2: Gx specific Diameter AVPs,,,,,,,
+# AVPs not provided by 3GPP TS 29.212.,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+PDP-Session-Operation,1015,5.2.21,Enumerated,"M,V",P,,
+,,,,,,,
+@standard,3GPP TS 29.212,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.212 V15.9.0 (2019-12),,,,,,,
+# Policy and Charging Control (PCC); Reference points,,,,,,,
+# ,,,,,,,
+# From 3GPP 29212-f90.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.212 Table 5.3.0.1: Gx specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+# Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time (2801).,,,,,,,
+ADC-Revalidation-Time,2801,5.3.93,Time,V,P,,M
+3GPP-PS-Data-Off-Status,2847,5.3.133,Enumerated,V,P,,M
+Access-Availability-Change-Reason,2833,5.3.121,Unsigned32,V,P,,M
+Access-Network-Charging-Identifier-Gx,1022,5.3.22,Grouped,"M,V",P,,
+Allocation-Retention-Priority,1034,5.3.32,Grouped,V,P,,M
+AN-GW-Address,1050,5.3.49,Address,V,P,,M
+AN-GW-Status,2811,5.3.100,Enumerated,V,P,,M
+APN-Aggregate-Max-Bitrate-DL,1040,5.3.39,Unsigned32,V,P,,M
+APN-Aggregate-Max-Bitrate-UL,1041,5.3.40,Unsigned32,V,P,,M
+Application-Detection-Information,1098,5.3.91,Grouped,V,P,,M
+Bearer-Control-Mode,1023,5.3.23,Enumerated,"M,V",P,,
+Bearer-Identifier,1020,5.3.20,OctetString,"M,V",P,,
+Bearer-Operation,1021,5.3.21,Enumerated,"M,V",P,,
+Bearer-Usage,1000,5.3.1,Enumerated,"M,V",P,,
+Charging-Correlation-Indicator,1073,5.3.67,Enumerated,V,P,,M
+Charging-Rule-Base-Name,1004,5.3.5,UTF8String,"M,V",P,,
+Charging-Rule-Definition,1003,5.3.4,Grouped,"M,V",P,,
+Charging-Rule-Install,1001,5.3.2,Grouped,"M,V",P,,
+Charging-Rule-Name,1005,5.3.6,OctetString,"M,V",P,,
+Charging-Rule-Remove,1002,5.3.3,Grouped,"M,V",P,,
+Charging-Rule-Report,1018,5.3.18,Grouped,"M,V",P,,
+CoA-Information,1039,5.3.37,Grouped,V,P,,M
+CoA-IP-Address,1035,5.3.33,Address,V,P,,M
+Conditional-APN-Aggregate-Max-Bitrate,2818,5.3.105,Grouped,V,P,,M
+Conditional-Policy-Information,2840,5.3.128,Grouped,V,P,,M
+Credit-Management-Status,1082,5.3.102,Unsigned32,V,P,,M
+CSG-Information-Reporting,1071,5.3.64,Enumerated,V,P,,M
+Default-Access,2829,5.3.120,Enumerated,V,P,,M
+Default-Bearer-Indication,2844,5.3.132,Enumerated,V,P,,M
+Default-EPS-Bearer-QoS,1049,5.3.48,Grouped,V,P,,M
+Default-QoS-Information,2816,5.3.103,Grouped,V,P,,M
+Default-QoS-Name,2817,5.3.104,UTF8String,V,P,,M
+Event-Report-Indication,1033,5.3.30,Grouped,V,P,,M
+Event-Trigger,1006,5.3.7,Enumerated,"M,V",P,,
+Execution-Time,2839,5.3.127,Time,V,P,,M
+Extended-APN-AMBR-DL,2848,5.3.134,Unsigned32,V,P,,M
+Extended-APN-AMBR-UL,2849,5.3.135,Unsigned32,V,P,,M
+Extended-GBR-DL,2850,5.3.136,Unsigned32,V,P,,M
+Extended-GBR-UL,2851,5.3.137,Unsigned32,V,P,,M
+Flow-Direction,1080,5.3.65,Enumerated,V,P,,M
+Flow-Information,1058,5.3.53,Grouped,V,P,,M
+Flow-Label,1057,5.3.52,OctetString,V,P,,M
+Fixed-User-Location-Info,2825,5.3.112,Grouped,V,P,,M
+Guaranteed-Bitrate-DL,1025,5.3.25,Unsigned32,"M,V",P,,
+Guaranteed-Bitrate-UL,1026,5.3.26,Unsigned32,"M,V",P,,
+# Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN (2803).,,,,,,,
+HeNB-BBF-FQDN,2803,5.3.94,UTF8String,V,P,,M
+HeNB-Local-IP-Address,2804,5.3.95,Address,V,P,,M
+IP-CAN-Session-Charging-Scope,2827,5.3.114,Enumerated,V,P,,M
+IP-CAN-Type,1027,5.3.27,Enumerated,"M,V",P,,
+Max-PLR-DL,2852,5.3.138,Float32,V,P,,M
+Max-PLR-UL,2853,5.3.139,Float32,V,P,,M
+Metering-Method,1007,5.3.8,Enumerated,"M,V",P,,
+Monitoring-Flags,2828,5.3.115,Unsigned32,V,,,M
+Monitoring-Key,1066,5.3.59,OctetString,V,P,,M
+Mute-Notification,2809,5.3.98,Enumerated,V,P,,M
+Monitoring-Time,2810,5.3.99,Time,V,P,,M
+NBIFOM-Mode,2830,5.3.117,Enumerated,V,P,,M
+NBIFOM-Support,2831,5.3.116,Enumerated,V,P,,M
+NetLoc-Access-Support,2824,5.3.111,Unsigned32,V,P,,M
+Network-Request-Support,1024,5.3.24,Enumerated,"M,V",P,,
+Offline,1008,5.3.9,Enumerated,"M,V",P,,
+Online,1009,5.3.10,Enumerated,"M,V",P,,
+Packet-Filter-Content,1059,5.3.54,IPFilterRule,V,P,,M
+Packet-Filter-Identifier,1060,5.3.55,OctetString,V,P,,M
+Packet-Filter-Information,1061,5.3.56,Grouped,V,P,,M
+Packet-Filter-Operation,1062,5.3.57,Enumerated,V,P,,M
+Packet-Filter-Usage,1072,5.3.66,Enumerated,V,P,,M
+PCC-Rule-Status,1019,5.3.19,Enumerated,"M,V",P,,
+# Note: 3GPP TS 29.212 table 5.3.0.1 row PDN-Connection-ID (1065),,,,,,,
+# missing M.,,,,,,,
+PDN-Connection-ID,1065,5.3.58,OctetString,V,P,,
+PRA-Install,2845,5.3.130,Grouped,V,P,,M
+PRA-Remove,2846,5.3.131,Grouped,V,P,,M
+Precedence,1010,5.3.11,Unsigned32,"M,V",P,,
+Pre-emption-Capability,1047,5.3.46,Enumerated,V,P,,M
+Pre-emption-Vulnerability,1048,5.3.47,Enumerated,V,P,,M
+Presence-Reporting-Area-Elements-List,2820,5.3.107,OctetString,V,P,,M
+Presence-Reporting-Area-Identifier,2821,5.3.108,OctetString,V,P,,M
+Presence-Reporting-Area-Information,2822,5.3.109,Grouped,V,P,,M
+Presence-Reporting-Area-Node,2855,5.3.141,Unsigned32,V,P,,M
+Presence-Reporting-Area-Status,2823,5.3.110,Unsigned32,V,P,,M
+Priority-Level,1046,5.3.45,Unsigned32,V,P,,M
+# Note: 3GPP TS 29.212 table 5.3.0.1 row PS-to-CS-Session-Continuity (1099),,,,,,,
+# missing M.,,,,,,,
+PS-to-CS-Session-Continuity,1099,5.3.84,Enumerated,V,P,,
+QoS-Class-Identifier,1028,5.3.17,Enumerated,"M,V",P,,
+QoS-Information,1016,5.3.16,Grouped,"M,V",P,,
+QoS-Negotiation,1029,5.3.28,Enumerated,"M,V",P,,
+QoS-Upgrade,1030,5.3.29,Enumerated,"M,V",P,,
+RAN-NAS-Release-Cause,2819,5.3.106,OctetString,V,P,,M
+RAN-Rule-Support,2832,5.3.122,Unsigned32,V,P,,M
+RAT-Type,1032,5.3.31,Enumerated,V,P,,M
+Redirect-Information,1085,5.3.82,Grouped,V,P,,M
+Redirect-Support,1086,5.3.83,Enumerated,V,P,,M
+Removal-Of-Access,2842,5.3.126,Enumerated,V,P,,M
+Reporting-Level,1011,5.3.12,Enumerated,"M,V",P,,
+Resource-Allocation-Notification,1063,5.3.50,Enumerated,V,P,,M
+Resource-Release-Notification,2841,5.3.125,Enumerated,V,P,,M
+Revalidation-Time,1042,5.3.41,Time,"M,V",P,,
+Routing-Filter,1078,5.3.72,Grouped,V,P,,M
+Routing-IP-Address,1079,5.3.73,Address,V,P,,M
+Routing-Rule-Definition,1076,5.3.70,Grouped,V,P,,M
+Routing-Rule-Identifier,1077,5.3.71,OctetString,V,P,,M
+Routing-Rule-Install,1081,5.3.68,Grouped,V,P,,M
+Routing-Rule-Remove,1075,5.3.69,Grouped,V,P,,M
+Routing-Rule-Failure-Code,2834,5.3.119,Unsigned32,V,P,,M
+Routing-Rule-Report,2835,5.3.118,Grouped,V,P,,M
+Rule-Activation-Time,1043,5.3.42,Time,"M,V",P,,
+Rule-Deactivation-Time,1044,5.3.43,Time,"M,V",P,,
+Rule-Failure-Code,1031,5.3.38,Enumerated,"M,V",P,,
+Security-Parameter-Index,1056,5.3.51,OctetString,V,P,,M
+Session-Release-Cause,1045,5.3.44,Enumerated,"M,V",P,,
+TCP-Source-Port,2843,5.3.129,Unsigned32,V,P,,M
+TDF-Information,1087,5.3.78,Grouped,V,P,,M
+TDF-Application-Identifier,1088,5.3.77,OctetString,V,P,,M
+TDF-Application-Instance-Identifier,2802,5.3.92,OctetString,V,P,,M
+TDF-Destination-Host,1089,5.3.80,DiameterIdentity,V,P,,M
+TDF-Destination-Realm,1090,5.3.79,DiameterIdentity,V,P,,M
+TDF-IP-Address,1091,5.3.81,Address,V,P,,M
+TFT-Filter,1012,5.3.13,IPFilterRule,"M,V",P,,
+TFT-Packet-Filter-Information,1013,5.3.14,Grouped,"M,V",P,,
+Traffic-Steering-Policy-Identifier-DL,2836,5.3.123,OctetString,V,P,,M
+Traffic-Steering-Policy-Identifier-UL,2837,5.3.124,OctetString,V,P,,M
+ToS-Traffic-Class,1014,5.3.15,OctetString,"M,V",P,,
+Tunnel-Header-Filter,1036,5.3.34,IPFilterRule,V,P,,M
+Tunnel-Header-Length,1037,5.3.35,Unsigned32,V,P,,M
+Tunnel-Information,1038,5.3.36,Grouped,V,P,,M
+UDP-Source-Port,2806,5.3.97,Unsigned32,V,P,,M
+UE-Local-IP-Address,2805,5.3.96,Address,V,P,,M
+UE-Status,2854,5.3.140,Unsigned32,V,P,,M
+Usage-Monitoring-Information,1067,5.3.60,Grouped,V,P,,M
+Usage-Monitoring-Level,1068,5.3.61,Enumerated,V,P,,M
+Usage-Monitoring-Report,1069,5.3.62,Enumerated,V,P,,M
+Usage-Monitoring-Support,1070,5.3.63,Enumerated,V,P,,M
+User-Location-Info-Time,2812,5.3.101,Time,V,P,,M
+PCSCF-Restoration-Indication,2826,5.3.113,Unsigned32,V,P,,M
+#=,,,,,,,
+# 3GPP TS 29.212 Table 5a.3.0.1: Gxx specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+QoS-Rule-Install,1051,5a.3.1,Grouped,"M,V",P,,
+QoS-Rule-Remove,1052,5a.3.2,Grouped,"M,V",P,,
+QoS-Rule-Definition,1053,5a.3.3,Grouped,"M,V",P,,
+QoS-Rule-Name,1054,5a.3.4,OctetString,"M,V",P,,
+QoS-Rule-Base-Name,1074,5a.3.7,UTF8String,V,P,,M
+QoS-Rule-Report,1055,5a.3.5,Grouped,"M,V",P,,
+Session-Linking-Indicator,1064,5a.3.6,Enumerated,"M,V",P,,
+#=,,,,,,,
+# 3GPP TS 29.212 Table 5b.3.0.1: Sd specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+ADC-Rule-Base-Name,1095,5b.3.4,UTF8String,"M,V",P,,
+ADC-Rule-Definition,1094,5b.3.3,Grouped,"M,V",P,,
+ADC-Rule-Install,1092,5b.3.1,Grouped,"M,V",P,,
+ADC-Rule-Name,1096,5b.3.5,OctetString,"M,V",P,,
+ADC-Rule-Remove,1093,5b.3.2,Grouped,"M,V",P,,
+ADC-Rule-Report,1097,5b.3.6,Grouped,"M,V",P,,
+#=,,,,,,,
+# 3GPP TS 29.212 Table 5c.3.1.1: St specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Request-Type,2838,5c.3.2,Unsigned32,"M,V",P,,
+#=,,,,,,,
+# 3GPP TS 29.212 Table E.6.3.1.1: S15 specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+CS-Service-Qos-Request-Identifier,2807,E.6.3.2,OctetString,"M, V",P,,
+CS-Service-QoS-Request-Operation,2808,E.6.3.3,Enumerated,"M, V",P,,
+CS-Service-Resource-Report,2813,E.6.3.6,Grouped,"M, V",P,,
+CS-Service-Resource-Failure-Cause,2814,E.6.3.5,Enumerated,"M, V",P,,
+CS-Service-Resource-Result-Operation,2815,E.6.3.4,Enumerated,"M, V",P,,
+,,,,,,,
+@standard,3GPP TS 29.214,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.214 V15.7.0 (2019-09),,,,,,,
+# Policy and Charging Control over Rx reference point,,,,,,,
+# ,,,,,,,
+# From 3GPP 29214-f70.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.214 Table 5.3.0.1: Rx specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Abort-Cause,500,5.3.1,Enumerated,"M,V",P,,
+Access-Network-Charging-Address,501,5.3.2,Address,"M,V",P,,
+Access-Network-Charging-Identifier,502,5.3.3,Grouped,"M,V",P,,
+Access-Network-Charging-Identifier-Value,503,5.3.4,OctetString,"M,V",P,,
+Acceptable-Service-Info,526,5.3.24,Grouped,"M,V",P,,
+AF-Application-Identifier,504,5.3.5,OctetString,"M,V",P,,
+AF-Charging-Identifier,505,5.3.6,OctetString,"M,V",P,,
+AF-Requested-Data,551,5.3.50,Unsigned32,V,P,,M
+AF-Signalling-Protocol,529,5.3.26,Enumerated,V,P,,M
+Application-Service-Provider-Identity,532,5.3.29,UTF8String,V,P,,M
+Codec-Data,524,5.3.7,OctetString,"M,V",P,,
+Content-Version,552,5.3.49,Unsigned64,V,P,,M
+Extended-Max-Requested-BW-DL,554,5.3.52,Unsigned32,V,P,,M
+Extended-Max-Requested-BW-UL,555,5.3.53,Unsigned32,V,P,,M
+Extended-Max-Supported-BW-DL,556,5.3.54,Unsigned32,V,P,,M
+Extended-Max-Supported-BW-UL,557,5.3.55,Unsigned32,V,P,,M
+Extended-Min-Desired-BW-DL,558,5.3.56,Unsigned32,V,P,,M
+Extended-Min-Desired-BW-UL,559,5.3.57,Unsigned32,V,P,,M
+Extended-Min-Requested-BW-DL,560,5.3.58,Unsigned32,V,P,,M
+Extended-Min-Requested-BW-UL,561,5.3.59,Unsigned32,V,P,,M
+Flow-Description,507,5.3.8,IPFilterRule,"M,V",P,,
+Flow-Number,509,5.3.9,Unsigned32,"M,V",P,,
+Flows,510,5.3.10,Grouped,"M,V",P,,
+Flow-Status,511,5.3.11,Enumerated,"M,V",P,,
+Flow-Usage,512,5.3.12,Enumerated,"M,V",P,,
+GCS-Identifier,538,5.3.36,OctetString,V,P,,M
+# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier (563),,,,,,,
+"# missing M, assume MUST NOT.",,,,,,,
+IMS-Content-Identifier,563,5.3.60,OctetString,V,P,,M
+# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content (564),,,,,,,
+"# missing M, assume MUST NOT.",,,,,,,
+IMS-Content-Type,564,5.3.61,Enumerated,V,P,,M
+IP-Domain-Id,537,5.3.35,OctetString,V,P,,M
+Max-Requested-Bandwidth-DL,515,5.3.14,Unsigned32,"M,V",P,,
+Max-Requested-Bandwidth-UL,516,5.3.15,Unsigned32,"M,V",P,,
+Max-Supported-Bandwidth-DL,543,5.3.41,Unsigned32,V,P,,M
+Max-Supported-Bandwidth-UL,544,5.3.42,Unsigned32,V,P,,M
+MCPTT-Identifier,547,5.3.45,OctetString,V,P,,M
+MCVideo-Identifier,562,5.3.45a,OctetString,V,P,,M
+Media-Component-Description,517,5.3.16,Grouped,"M,V",P,,
+Media-Component-Number,518,5.3.17,Unsigned32,"M,V",P,,
+Media-Component-Status,549,5.3.48,Unsigned32,V,P,,M
+Media-Sub-Component,519,5.3.18,Grouped,"M,V",P,,
+Media-Type,520,5.3.19,Enumerated,"M,V",P,,
+MPS-Identifier,528,5.3.30,OctetString,V,P,,M
+Min-Desired-Bandwidth-DL,545,5.3.43,Unsigned32,V,P,,M
+Min-Desired-Bandwidth-UL,546,5.3.44,Unsigned32,V,P,,M
+Min-Requested-Bandwidth-DL,534,5.3.32,Unsigned32,V,P,,M
+Min-Requested-Bandwidth-UL,535,5.3.33,Unsigned32,V,P,,M
+Priority-Sharing-Indicator,550,5.3.47,Enumerated,V,P,,M
+Pre-emption-Control-Info,553,5.3.51,Unsigned32,V,P,,M
+Required-Access-Info,536,5.3.34,Enumerated,V,P,,M
+Retry-Interval,541,5.3.39,Unsigned32,V,P,,M
+Rx-Request-Type,533,5.3.31,Enumerated,V,P,,M
+RR-Bandwidth,521,5.3.20,Unsigned32,"M,V",P,,
+RS-Bandwidth,522,5.3.21,Unsigned32,"M,V",P,,
+Service-Authorization-Info,548,5.3.46,Unsigned32,V,P,,M
+Service-URN,525,5.3.23,OctetString,"M,V",P,,
+Service-Info-Status,527,5.3.25,Enumerated,"M,V",P,,
+Sharing-Key-DL,539,5.3.37,Unsigned32,V,P,,M
+Sharing-Key-UL,540,5.3.38,Unsigned32,V,P,,M
+Specific-Action,513,5.3.13,Enumerated,"M,V",P,,
+SIP-Forking-Indication,523,5.3.22,Enumerated,"M,V",P,,
+Sponsor-Identity,531,5.3.28,UTF8String,V,P,,M
+Sponsored-Connectivity-Data,530,5.3.27,Grouped,V,P,,M
+Sponsoring-Action,542,5.3.40,Enumerated,V,P,,M
+,,,,,,,
+@standard,3GPP TS 29.229,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.229 V15.2.0 (2019-09),,,,,,,
+# Cx and Dx interfaces based on the Diameter protocol;,,,,,,,
+# Protocol details,,,,,,,
+# ,,,,,,,
+# From 3GPP 29229-f20.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.229 Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,
+# ,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Visited-Network-Identifier,600,6.3.1,OctetString,"M, V",,,
+Public-Identity,601,6.3.2,UTF8String,"M, V",,,
+Server-Name,602,6.3.3,UTF8String,"M, V",,,
+Server-Capabilities,603,6.3.4,Grouped,"M, V",,,
+Mandatory-Capability,604,6.3.5,Unsigned32,"M, V",,,
+Optional-Capability,605,6.3.6,Unsigned32,"M, V",,,
+User-Data,606,6.3.7,OctetString,"M, V",,,
+SIP-Number-Auth-Items,607,6.3.8,Unsigned32,"M, V",,,
+SIP-Authentication-Scheme,608,6.3.9,UTF8String,"M, V",,,
+SIP-Authenticate,609,6.3.10,OctetString,"M, V",,,
+SIP-Authorization,610,6.3.11,OctetString,"M, V",,,
+SIP-Authentication-Context,611,6.3.12,OctetString,"M, V",,,
+SIP-Auth-Data-Item,612,6.3.13,Grouped,"M, V",,,
+SIP-Item-Number,613,6.3.14,Unsigned32,"M, V",,,
+Server-Assignment-Type,614,6.3.15,Enumerated,"M, V",,,
+Deregistration-Reason,615,6.3.16,Grouped,"M, V",,,
+Reason-Code,616,6.3.17,Enumerated,"M, V",,,
+Reason-Info,617,6.3.18,UTF8String,"M, V",,,
+Charging-Information,618,6.3.19,Grouped,"M, V",,,
+Primary-Event-Charging-Function-Name,619,6.3.20,DiameterURI,"M, V",,,
+Secondary-Event-Charging-Function-Name,620,6.3.21,DiameterURI,"M, V",,,
+Primary-Charging-Collection-Function-Name,621,6.3.22,DiameterURI,"M, V",,,
+Secondary-Charging-Collection-Function-Name,622,6.3.23,DiameterURI,"M, V",,,
+User-Authorization-Type,623,6.3.24,Enumerated,"M, V",,,
+User-Data-Already-Available,624,6.3.26,Enumerated,"M, V",,,
+Confidentiality-Key,625,6.3.27,OctetString,"M, V",,,
+Integrity-Key,626,6.3.28,OctetString,"M, V",,,
+# Note: 3GPP TS 29.229 V6.5.0 (2005-06) removed User-Data-Request-Type (627).,,,,,,,
+User-Data-Request-Type,627,6.3.25,Enumerated,"M, V",,,
+Supported-Features,628,6.3.29,Grouped,V,M,,
+Feature-List-ID,629,6.3.30,Unsigned32,V,,,M
+Feature-List,630,6.3.31,Unsigned32,V,,,M
+Supported-Applications,631,6.3.32,Grouped,V,,,M
+Associated-Identities,632,6.3.33,Grouped,V,,,M
+Originating-Request,633,6.3.34,Enumerated,"M,V",,,
+Wildcarded-Public-Identity,634,6.3.35,UTF8String,V,,,M
+SIP-Digest-Authenticate,635,6.3.36,Grouped,V,,,M
+Wildcarded-IMPU,636,6.3.43,UTF8String,V,,,M
+UAR-Flags,637,6.3.44,Unsigned32,V,,,M
+Loose-Route-Indication,638,6.3.45,Enumerated,V,,,M
+SCSCF-Restoration-Info,639,6.3.46,Grouped,V,,,M
+Path,640,6.3.47,OctetString,V,,,M
+Contact,641,6.3.48,OctetString,V,,,M
+Subscription-Info,642,6.3.49,Grouped,V,,,M
+Call-ID-SIP-Header,643,6.3.49.1,OctetString,V,,,M
+From-SIP-Header,644,6.3.49.2,OctetString,V,,,M
+To-SIP-Header,645,6.3.49.3,OctetString,V,,,M
+Record-Route,646,6.3.49.4,OctetString,V,,,M
+Associated-Registered-Identities,647,6.3.50,Grouped,V,,,M
+Multiple-Registration-Indication,648,6.3.51,Enumerated,V,,,M
+Restoration-Info,649,6.3.52,Grouped,V,,,M
+Session-Priority,650,6.3.56,Enumerated,V,,,M
+Identity-with-Emergency-Registration,651,6.3.57,Grouped,V,,,M
+Priviledged-Sender-Indication,652,6.3.58,Enumerated,V,,,M
+LIA-Flags,653,6.3.59,Unsigned32,V,,,M
+Initial-CSeq-Sequence-Number,654,6.3.62,Unsigned32,V,,,M
+SAR-Flags,655,6.3.63,Unsigned32,V,,,M
+Allowed-WAF-WWSF-Identities,656,6.3.64,Grouped,V,,,M
+WebRTC-Authentication-Function-Name,657,6.3.65,UTF8String,V,,,M
+WebRTC-Web-Server-Function-Name,658,6.3.66,UTF8String,V,,,M
+RTR-Flags,659,6.3.69,Unsigned32,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.272,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.272 V15.10.0 (2019-12),,,,,,,
+# Mobility Management Entity (MME),,,,,,,
+# and Serving GPRS Support Node (SGSN) related interfaces,,,,,,,
+# based on Diameter protocol,,,,,,,
+# ,,,,,,,
+# From 3GPP 29272-fa0.docx,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+"# 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d, S7a/S7d and S13/S13' specific DiameterAVPs",,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Subscription-Data,1400,7.3.2,Grouped,"M,V",,,
+Terminal-Information,1401,7.3.3,Grouped,"M,V",,,
+IMEI,1402,7.3.4,UTF8String,"M,V",,,
+Software-Version,1403,7.3.5,UTF8String,"M,V",,,
+QoS-Subscribed,1404,7.3.77,OctetString,"M,V",,,
+ULR-Flags,1405,7.3.7,Unsigned32,"M,V",,,
+ULA-Flags,1406,7.3.8,Unsigned32,"M,V",,,
+Visited-PLMN-Id,1407,7.3.9,OctetString,"M,V",,,
+Requested-EUTRAN-Authentication-Info,1408,7.3.11,Grouped,"M,V",,,
+Requested-UTRAN-GERAN-Authentication-Info,1409,7.3.12,Grouped,"M,V",,,
+Number-Of-Requested-Vectors,1410,7.3.14,Unsigned32,"M,V",,,
+Re-Synchronization-Info,1411,7.3.15,OctetString,"M,V",,,
+Immediate-Response-Preferred,1412,7.3.16,Unsigned32,"M,V",,,
+Authentication-Info,1413,7.3.17,Grouped,"M,V",,,
+E-UTRAN-Vector,1414,7.3.18,Grouped,"M,V",,,
+UTRAN-Vector,1415,7.3.19,Grouped,"M,V",,,
+GERAN-Vector,1416,7.3.20,Grouped,"M,V",,,
+Network-Access-Mode,1417,7.3.21,Enumerated,"M,V",,,
+HPLMN-ODB,1418,7.3.22,Unsigned32,"M,V",,,
+Item-Number,1419,7.3.23,Unsigned32,"M,V",,,
+Cancellation-Type,1420,7.3.24,Enumerated,"M,V",,,
+DSR-Flags,1421,7.3.25,Unsigned32,"M,V",,,
+DSA-Flags,1422,7.3.26,Unsigned32,"M,V",,,
+Context-Identifier,1423,7.3.27,Unsigned32,"M,V",,,
+Subscriber-Status,1424,7.3.29,Enumerated,"M,V",,,
+Operator-Determined-Barring,1425,7.3.30,Unsigned32,"M,V",,,
+Access-Restriction-Data,1426,7.3.31,Unsigned32,"M,V",,,
+APN-OI-Replacement,1427,7.3.32,UTF8String,"M,V",,,
+All-APN-Configurations-Included-Indicator,1428,7.3.33,Enumerated,"M,V",,,
+APN-Configuration-Profile,1429,7.3.34,Grouped,"M,V",,,
+APN-Configuration,1430,7.3.35,Grouped,"M,V",,,
+EPS-Subscribed-QoS-Profile,1431,7.3.37,Grouped,"M,V",,,
+VPLMN-Dynamic-Address-Allowed,1432,7.3.38,Enumerated,"M,V",,,
+STN-SR,1433,7.3.39,OctetString,"M,V",,,
+Alert-Reason,1434,7.3.83,Enumerated,"M,V",,,
+AMBR,1435,7.3.41,Grouped,"M,V",,,
+CSG-Subscription-Data,1436,7.3.78,Grouped,"M,V",,,
+CSG-Id,1437,7.3.79,Unsigned32,"M,V",,,
+PDN-GW-Allocation-Type,1438,7.3.44,Enumerated,"M,V",,,
+Expiration-Date,1439,7.3.80,Time,"M,V",,,
+RAT-Frequency-Selection-Priority-ID,1440,7.3.46,Unsigned32,"M,V",,,
+IDA-Flags,1441,7.3.47,Unsigned32,"M,V",,,
+PUA-Flags,1442,7.3.48,Unsigned32,"M,V",,,
+NOR-Flags,1443,7.3.49,Unsigned32,"M,V",,,
+User-Id,1444,7.3.50,UTF8String,V,,,M
+Equipment-Status,1445,7.3.51,Enumerated,"M,V",,,
+Regional-Subscription-Zone-Code,1446,7.3.52,OctetString,"M,V",,,
+RAND,1447,7.3.53,OctetString,"M,V",,,
+XRES,1448,7.3.54,OctetString,"M,V",,,
+AUTN,1449,7.3.55,OctetString,"M,V",,,
+KASME,1450,7.3.56,OctetString,"M,V",,,
+Trace-Collection-Entity,1452,7.3.98,Address,"M,V",,,
+Kc,1453,7.3.59,OctetString,"M,V",,,
+SRES,1454,7.3.60,OctetString,"M,V",,,
+PDN-Type,1456,7.3.62,Enumerated,"M,V",,,
+Roaming-Restricted-Due-To-Unsupported-Feature,1457,7.3.81,Enumerated,"M,V",,,
+Trace-Data,1458,7.3.63,Grouped,"M,V",,,
+Trace-Reference,1459,7.3.64,OctetString,"M,V",,,
+Trace-Depth,1462,7.3.67,Enumerated,"M,V",,,
+Trace-NE-Type-List,1463,7.3.68,OctetString,"M,V",,,
+Trace-Interface-List,1464,7.3.69,OctetString,"M,V",,,
+Trace-Event-List,1465,7.3.70,OctetString,"M,V",,,
+OMC-Id,1466,7.3.71,OctetString,"M,V",,,
+GPRS-Subscription-Data,1467,7.3.72,Grouped,"M,V",,,
+Complete-Data-List-Included-Indicator,1468,7.3.73,Enumerated,"M,V",,,
+PDP-Context,1469,7.3.74,Grouped,"M,V",,,
+PDP-Type,1470,7.3.75,OctetString,"M,V",,,
+3GPP2-MEID,1471,7.3.6,OctetString,"M,V",,,
+Specific-APN-Info,1472,7.3.82,Grouped,"M,V",,,
+LCS-Info,1473,7.3.84,Grouped,"M,V",,,
+GMLC-Number,1474,7.3.85,OctetString,"M,V",,,
+LCS-PrivacyException,1475,7.3.86,Grouped,"M,V",,,
+SS-Code,1476,7.3.87,OctetString,"M,V",,,
+# Note: 3GPP TS 29.272 V12.5.0 (2014-06) table 7.3.1/1,,,,,,,
+# changed row SS-Status (1477) to be OctetString instead of Grouped.,,,,,,,
+# Clause 7.3.88 already described SS-Status (1147) as OctetString.,,,,,,,
+SS-Status,1477,7.3.88,OctetString,"M,V",,,
+Notification-To-UE-User,1478,7.3.89,Enumerated,"M,V",,,
+External-Client,1479,7.3.90,Grouped,"M,V",,,
+Client-Identity,1480,7.3.91,OctetString,"M,V",,,
+GMLC-Restriction,1481,7.3.92,Enumerated,"M,V",,,
+PLMN-Client,1482,7.3.93,Enumerated,"M,V",,,
+Service-Type,1483,7.3.94,Grouped,"M,V",,,
+ServiceTypeIdentity,1484,7.3.95,Unsigned32,"M,V",,,
+MO-LR,1485,7.3.96,Grouped,"M,V",,,
+Teleservice-List,1486,7.3.99,Grouped,"M,V",,,
+TS-Code,1487,7.3.100,OctetString,"M,V",,,
+# Note: 3GPP TS 29.272 V12.4.0 (2014-03) renamed,,,,,,,
+# Call-Barring-Infor-List (1488) to Call-Barring-Info (1488).,,,,,,,
+Call-Barring-Info,1488,7.3.101,Grouped,"M,V",,,
+SGSN-Number,1489,7.3.102,OctetString,"M,V",,,
+IDR-Flags,1490,7.3.103,Unsigned32,"M,V",,,
+ICS-Indicator,1491,7.3.104,Enumerated,V,,,M
+IMS-Voice-Over-PS-Sessions-Supported,1492,7.3.106,Enumerated,V,,,M
+Homogeneous-Support-of-IMS-Voice-Over-PS-Sessions,1493,7.3.107,Enumerated,V,,,M
+Last-UE-Activity-Time,1494,7.3.108,Time,V,,,M
+EPS-User-State,1495,7.3.110,Grouped,V,,,M
+EPS-Location-Information,1496,7.3.111,Grouped,V,,,M
+MME-User-State,1497,7.3.112,Grouped,V,,,M
+SGSN-User-State,1498,7.3.113,Grouped,V,,,M
+User-State,1499,7.3.114,Enumerated,V,,,M
+# Note: 3GPP TS 29.272 table 7.3.1/1 row MME-Location-Information (1600),,,,,,,
+# incorrectly has a space instead of hyphen in the name.,,,,,,,
+# Generated name renamed from MME-LocationInformation (1600).,,,,,,,
+MME-Location-Information,1600,7.3.115,Grouped,V,,,M
+SGSN-Location-Information,1601,7.3.116,Grouped,V,,,M
+E-UTRAN-Cell-Global-Identity,1602,7.3.117,OctetString,V,,,M
+Tracking-Area-Identity,1603,7.3.118,OctetString,V,,,M
+Cell-Global-Identity,1604,7.3.119,OctetString,V,,,M
+Routing-Area-Identity,1605,7.3.120,OctetString,V,,,M
+Location-Area-Identity,1606,7.3.121,OctetString,V,,,M
+Service-Area-Identity,1607,7.3.122,OctetString,V,,,M
+Geographical-Information,1608,7.3.123,OctetString,V,,,M
+Geodetic-Information,1609,7.3.124,OctetString,V,,,M
+Current-Location-Retrieved,1610,7.3.125,Enumerated,V,,,M
+Age-Of-Location-Information,1611,7.3.126,Unsigned32,V,,,M
+Active-APN,1612,7.3.127,Grouped,V,,,M
+Error-Diagnostic,1614,7.3.128,Enumerated,V,,,M
+Ext-PDP-Address,1621,7.3.129,Address,V,,,M
+UE-SRVCC-Capability,1615,7.3.130,Enumerated,V,,,M
+MPS-Priority,1616,7.3.131,Unsigned32,V,,,M
+VPLMN-LIPA-Allowed,1617,7.3.132,Enumerated,V,,,M
+LIPA-Permission,1618,7.3.133,Enumerated,V,,,M
+Subscribed-Periodic-RAU-TAU-Timer,1619,7.3.134,Unsigned32,V,,,M
+Ext-PDP-Type,1620,7.3.75A,OctetString,V,,,M
+SIPTO-Permission,1613,7.3.135,Enumerated,V,,,M
+MDT-Configuration,1622,7.3.136,Grouped,V,,,M
+Job-Type,1623,7.3.137,Enumerated,V,,,M
+Area-Scope,1624,7.3.138,Grouped,V,,,M
+List-Of-Measurements,1625,7.3.139,Unsigned32,V,,,M
+Reporting-Trigger,1626,7.3.140,Unsigned32,V,,,M
+Report-Interval,1627,7.3.141,Enumerated,V,,,M
+Report-Amount,1628,7.3.142,Enumerated,V,,,M
+Event-Threshold-RSRP,1629,7.3.143,Unsigned32,V,,,M
+Event-Threshold-RSRQ,1630,7.3.144,Unsigned32,V,,,M
+Logging-Interval,1631,7.3.145,Enumerated,V,,,M
+Logging-Duration,1632,7.3.146,Enumerated,V,,,M
+Relay-Node-Indicator,1633,7.3.147,Enumerated,V,,,M
+MDT-User-Consent,1634,7.3.148,Enumerated,V,,,M
+PUR-Flags,1635,7.3.149,Unsigned32,V,,,M
+Subscribed-VSRVCC,1636,7.3.150,Enumerated,V,,,M
+Equivalent-PLMN-List,1637,7.3.151,Grouped,V,,,M
+CLR-Flags,1638,7.3.152,Unsigned32,V,,,M
+UVR-Flags,1639,7.3.153,Unsigned32,"M,V",,,
+UVA-Flags,1640,7.3.154,Unsigned32,"M,V",,,
+VPLMN-CSG-Subscription-Data,1641,7.3.155,Grouped,"M,V",,,
+Time-Zone,1642,7.3.163,UTF8String,V,,,M
+A-MSISDN,1643,7.3.157,OctetString,V,,,M
+MME-Number-for-MT-SMS,1645,7.3.159,OctetString,V,,,M
+SMS-Register-Request,1648,7.3.162,Enumerated,V,,,M
+Local-Time-Zone,1649,7.3.156,Grouped,V,,,M
+Daylight-Saving-Time,1650,7.3.164,Enumerated,V,,,M
+Subscription-Data-Flags,1654,7.3.165,Unsigned32,V,,,M
+# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,
+# Measurement-Period-LTE (1655) from 1656.,,,,,,,
+Measurement-Period-LTE,1655,7.3.166,Enumerated,V,,,M
+# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,
+# Measurement-Period-UMTS (1656) from 1655.,,,,,,,
+Measurement-Period-UMTS,1656,7.3.167,Enumerated,V,,,M
+Collection-Period-RRM-LTE,1657,7.3.168,Enumerated,V,,,M
+Collection-Period-RRM-UMTS,1658,7.3.169,Enumerated,V,,,M
+Positioning-Method,1659,7.3.170,OctetString,V,,,M
+Measurement-Quantity,1660,7.3.171,OctetString,V,,,M
+Event-Threshold-Event-1F,1661,7.3.172,Integer32,V,,,M
+Event-Threshold-Event-1I,1662,7.3.173,Integer32,V,,,M
+Restoration-Priority,1663,7.3.174,Unsigned32,V,,,M
+SGs-MME-Identity,1664,7.3.175,UTF8String,V,,,M
+SIPTO-Local-Network-Permission,1665,7.3.176,Unsigned32,V,,,M
+Coupled-Node-Diameter-ID,1666,7.3.177,DiameterIdentity,V,,,M
+WLAN-offloadability,1667,7.3.181,Grouped,V,,,M
+WLAN-offloadability-EUTRAN,1668,7.3.182,Unsigned32,V,,,M
+WLAN-offloadability-UTRAN,1669,7.3.183,Unsigned32,V,,,M
+Reset-ID,1670,7.3.184,OctetString,V,,,M
+MDT-Allowed-PLMN-Id,1671,7.3.185,OctetString,V,,,M
+Adjacent-PLMNs,1672,7.3.186,Grouped,V,,,M
+Adjacent-Access-Restriction-Data,1673,7.3.187,Grouped,V,,,M
+DL-Buffering-Suggested-Packet-Count,1674,7.3.188,Integer32,V,,,M
+IMSI-Group-Id,1675,7.3.189,Grouped,V,,,M
+Group-Service-Id,1676,7.3.190,Unsigned32,V,,,M
+Group-PLMN-Id,1677,7.3.191,OctetString,V,,,M
+Local-Group-Id,1678,7.3.192,OctetString,V,,,M
+AIR-Flags,1679,7.3.201,Unsigned32,V,,,M
+UE-Usage-Type,1680,7.3.202,Unsigned32,V,,,M
+Non-IP-PDN-Type-Indicator,1681,7.3.204,Enumerated,V,,,M
+Non-IP-Data-Delivery-Mechanism,1682,7.3.205,Unsigned32,V,,,M
+Additional-Context-ID,1683,7.3.206,Unsigned32,V,,,M
+SCEF-Realm,1684,7.3.207,DiameterIdentity,V,,,M
+Subscription-Data-Deletion,1685,7.3.208,Grouped,V,,,M
+# Note: 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode (1686),,,,,,,
+"# incorrectly has value type Grouped instead of Unsigned32,",,,,,,,
+# conflicting with clause 7.3.209.,,,,,,,
+Preferred-Data-Mode,1686,7.3.209,Unsigned32,V,,,M
+Emergency-Info,1687,7.3.210,Grouped,V,,,M
+V2X-Subscription-Data,1688,7.3.212,Grouped,V,,,M
+V2X-Permission,1689,7.3.213,Unsigned32,V,,,M
+PDN-Connection-Continuity,1690,7.3.214,Unsigned32,V,,,M
+eDRX-Cycle-Length,1691,7.3.215,Grouped,V,,,M
+eDRX-Cycle-Length-Value,1692,7.3.216,OctetString,V,,,M
+UE-PC5-AMBR,1693,7.3.217,Unsigned32,V,,,M
+MBSFN-Area,1694,7.3.219,Grouped,V,,,M
+MBSFN-Area-ID,1695,7.3.220,Unsigned32,V,,,M
+Carrier-Frequency,1696,7.3.221,Unsigned32,V,,,M
+RDS-Indicator,1697,7.3.222,Enumerated,V,,,M
+Service-Gap-Time,1698,7.3.223,Unsigned32,V,,,M
+Aerial-UE-Subscription-Information,1699,7.3.224,Unsigned32,V,,,M
+Broadcast-Location-Assistance-Data-Types,1700,7.3.225,Unsigned64,V,,,M
+Paging-Time-Window,1701,7.3.226,Grouped,V,,,M
+Operation-Mode,1702,7.3.227,Unsigned32,V,,,M
+Paging-Time-Window-Length,1703,7.3.228,OctetString,V,,,M
+Core-Network-Restrictions,1704,7.3.230,Unsigned32,V,,,M
+eDRX-Related-RAT,1705,7.3.229,Grouped,V,,,M
+Interworking-5GS-Indicator,1706,7.3.231,Enumerated,V,,,M
+,,,,,,,
 @standard,3GPP TS 29.273,,,,,,
 #=,,,,,,,
 # 3GPP TS 29.273 V15.4.0 (2019-09),,,,,,,
-# Evolved Packet System (EPS);,,,,,,,,
-# 3GPP EPS AAA interfaces,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29273-f40.docx,,,,,,,,
+# Evolved Packet System (EPS);,,,,,,,
+# 3GPP EPS AAA interfaces,,,,,,,
+# ,,,,,,,
+# From 3GPP 29273-f40.docx,,,,,,,
 #=,,,,,,,
 #,,,,,,,
@@ -1023,237 +1023,237 @@
 #=,,,,,,,
 #,,,,,,,
-,,,,,,,,
-@standard,3GPP TS 29.329,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.329 V15.2.0 (2019-09),,,,,,,,
-# Sh Interface based on the Diameter protocol;,,,,,,,,
-# Protocol details,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29329-f20.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,,
-# ,,,,,,,,
-# Note: AVPs referenced from other sources are not added here.,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-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 (702) renamed to User-Data-29.329 (702).,,,,,,,,
-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
-DSAI-Tag,711,6.3.18,OctetString,"M, V",,,,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 29.336,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.336 V15.7.0 (2019-09),,,,,,,,
-# Home Subscriber Server (HSS) diameter interfaces for,,,,,,,,
-# interworking with packet data networks and applications,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29336-f70.docx,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.336 Table 6.4.1/1: S6m/S6n specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-IP-SM-GW-Number,3100,6.4.14,OctetString,"M,V",,,,No
-IP-SM-GW-Name,3101,6.4.15,DiameterIdentity,"M,V",,,,No
-User-Identifier,3102,6.4.2,Grouped,"M,V",,,,No
-Service-ID,3103,6.4.3,Enumerated,"M,V",,,,No
-SCS-Identity,3104,6.4.4,OctetString,"M,V",,,,No
-Service-Parameters,3105,6.4.5,Grouped,"M,V",,,,No
-T4-Parameters,3106,6.4.6,Grouped,"M,V",,,,No
-Service-Data,3107,6.4.7,Grouped,"M,V",,,,No
-T4-Data,3108,6.4.8,Grouped,"M,V",,,,No
-HSS-Cause,3109,6.4.9,Unsigned32,"M,V",,,,No
-SIR-Flags,3110,6.4.10,Unsigned32,"M,V",,,,No
-External-Identifier,3111,6.4.11,UTF8String,"M,V",,,,No
-IP-SM-GW-Realm,3112,6.4.18,DiameterIdentity,"M,V",,,,No
-#=,,,,,,,,
-# 3GPP TS 29.336 Table 8.4.1-1: S6t specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-AESE-Communication-Pattern,3113,8.4.25,Grouped,"M,V",,,,No
-Communication-Pattern-Set,3114,8.4.26,Grouped,"M,V",,,,No
-Periodic-Communication-Indicator,3115,8.4.27,Unsigned32,"M,V",,,,No
-Communication-Duration-Time,3116,8.4.28,Unsigned32,"M,V",,,,No
-Periodic-time,3117,8.4.29,Unsigned32,"M,V",,,,No
-Scheduled-Communication-Time,3118,8.4.30,Grouped,"M,V",,,,No
-Stationary-Indication,3119,8.4.31,Unsigned32,"M,V",,,,No
-AESE-Communication-Pattern-Config-Status,3120,8.4.32,Grouped,"M,V",,,,No
-AESE-Error-Report,3121,8.4.33,Grouped,"M,V",,,,No
-Monitoring-Event-Configuration,3122,8.4.2,Grouped,"M,V",,,,No
-Monitoring-Event-Report,3123,8.4.3,Grouped,"M,V",,,,No
-SCEF-Reference-ID,3124,8.4.4,Unsigned32,"M,V",,,,No
-SCEF-ID,3125,8.4.5,DiameterIdentity,"M,V",,,,No
-SCEF-Reference-ID-for-Deletion,3126,8.4.6,Unsigned32,"M,V",,,,No
-Monitoring-Type,3127,8.4.7,Unsigned32,"M,V",,,,No
-Maximum-Number-of-Reports,3128,8.4.8,Unsigned32,"M,V",,,,No
-UE-Reachability-Configuration,3129,8.4.9,Grouped,"M,V",,,,No
-Monitoring-Duration,3130,8.4.10,Time,"M,V",,,,No
-Maximum-Detection-Time,3131,8.4.11,Unsigned32,"M,V",,,,No
-Reachability-Type,3132,8.4.12,Unsigned32,"M,V",,,,No
-Maximum-Latency,3133,8.4.13,Unsigned32,"M,V",,,,No
-Maximum-Response-Time,3134,8.4.14,Unsigned32,"M,V",,,,No
-Location-Information-Configuration,3135,8.4.15,Grouped,"M,V",,,,No
-MONTE-Location-Type,3136,8.4.16,Unsigned32,"M,V",,,,No
-Accuracy,3137,8.4.17,Unsigned32,"M,V",,,,No
-Association-Type,3138,8.4.18,Unsigned32,"M,V",,,,No
-Roaming-Information,3139,8.4.19,Unsigned32,"M,V",,,,No
-Reachability-Information,3140,8.4.20,Unsigned32,"M,V",,,,No
-IMEI-Change,3141,8.4.22,Unsigned32,"M,V",,,,No
-Monitoring-Event-Config-Status,3142,8.4.24,Grouped,"M,V",,,,No
-Supported-Services,3143,8.4.40,Grouped,"M,V",,,,No
-Supported-Monitoring-Events,3144,8.4.41,Unsigned64,"M,V",,,,No
-CIR-Flags,3145,8.4.39,Unsigned32,"M,V",,,,No
-Service-Result,3146,8.4.37,Grouped,"M,V",,,,No
-Service-Result-Code,3147,8.4.38,Unsigned32,"M,V",,,,No
-Reference-ID-Validity-Time,3148,8.4.42,Time,"M,V",,,,No
-Event-Handling,3149,8.4.43,Unsigned32,"M,V",,,,No
-NIDD-Authorization-Request,3150,8.4.44,Grouped,"M,V",,,,No
-NIDD-Authorization-Response,3151,8.4.45,Grouped,"M,V",,,,No
-Service-Report,3152,8.4.47,Grouped,"M,V",,,,No
-Node-Type,3153,8.4.48,Unsigned32,"M,V",,,,No
-S6t-HSS-Cause,3154,8.4.50,Unsigned32,"M,V",,,,No
-Enhanced-Coverage-Restriction,3155,8.4.51,Grouped,V,,,M,No
-Enhanced-Coverage-Restriction-Data,3156,8.4.52,Grouped,V,,,M,No
-Restricted-PLMN-List,3157,8.4.53,Grouped,V,,,M,No
-Allowed-PLMN-List,3158,8.4.54,Grouped,V,,,M,No
-Requested-Validity-Time,3159,8.4.55,Time,V,,,M,No
-Granted-Validity-Time,3160,8.4.56,Time,V,,,M,No
-NIDD-Authorization-Update,3161,8.4.57,Grouped,V,,,M,No
-Loss-Of-Connectivity-Reason,3162,8.4.58,Unsigned32,V,,,M,No
-Group-Reporting-Guard-Timer,3163,8.4.59,Unsigned32,V,,,M,No
-CIA-Flags,3164,8.4.60,Unsigned32,V,,,M,No
-Group-Monitoring-Event-Report,3165,8.4.61,Grouped,V,,,M,No
-Group-Monitoring-Event-Report-Item,3166,8.4.62,Grouped,V,,,M,No
-RIR-Flags,3167,8.4.63,Unsigned32,V,,,M,No
-Type-Of-External-Identifier,3168,8.4.64,Unsigned32,V,,,M,No
-APN-Validity-Time,3169,8.4.65,Grouped,V,,,M,No
-Suggested-Network-Configuration,3170,8.4.66,Grouped,V,,,M,No
-Monitoring-Event-Report-Status,3171,8.4.67,Grouped,V,,,M,No
-PLMN-ID-Requested,3172,8.4.68,Enumerated,V,,,M,No
-AdditionalIdentifiers,3173,8.4.69,Grouped,V,,,M,No
-NIR-Flags,3174,8.4.70,Unsigned32,V,,,M,No
-Reporting-Time-Stamp,3175,8.4.71,Time,V,,,M,No
-NIA-Flags,3176,8.4.72,Unsigned32,V,,,M,No
-Group-User-Identifier,3177,8.4.73,Grouped,V,,,M,No
-MTC-Provider-Info,3178,8.4.74,Grouped,V,,,M,No
-MTC-Provider-ID,3179,8.4.75,UTF8String,V,,,M,No
-,,,,,,,,
-@standard,3GPP TS 29.338,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.338 V15.1.0 (2018-12),,,,,,,,
-# Diameter based protocols to support,,,,,,,,
-# Short Message Service (SMS) capable,,,,,,,,
-# Mobile Management Entities (MMEs),,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29338-f10.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.338 Table 5.3.3.1/1: S6c specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-SM-RP-MTI,3308,5.3.3.2,Enumerated,"M, V",,,,No
-SM-RP-SMEA,3309,5.3.3.3,OctetString,"M, V",,,,No
-SRR-Flags,3310,5.3.3.4,Unsigned32,"M, V",,,,No
-SM-Delivery-Not-Intended,3311,5.3.3.5,Enumerated,"M, V",,,,No
-MWD-Status,3312,5.3.3.8,Unsigned32,"M, V",,,,No
-MME-Absent-User-Diagnostic-SM,3313,5.3.3.9,Unsigned32,"M, V",,,,No
-MSC-Absent-User-Diagnostic-SM,3314,5.3.3.10,Unsigned32,"M, V",,,,No
-SGSN-Absent-User-Diagnostic-SM,3315,5.3.3.11,Unsigned32,"M, V",,,,No
-SM-Delivery-Outcome,3316,5.3.3.14,Grouped,"M, V",,,,No
-MME-SM-Delivery-Outcome,3317,5.3.3.15,Grouped,"M, V",,,,No
-MSC-SM-Delivery-Outcome,3318,5.3.3.16,Grouped,"M, V",,,,No
-SGSN-SM-Delivery-Outcome,3319,5.3.3.17,Grouped,"M, V",,,,No
-IP-SM-GW-SM-Delivery-Outcome,3320,5.3.3.18,Grouped,"M, V",,,,No
-SM-Delivery-Cause,3321,5.3.3.19,Enumerated,"M, V",,,,No
-Absent-User-Diagnostic-SM,3322,5.3.3.20,Unsigned32,"M, V",,,,No
-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,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.344 V15.1.0 (2019-09),,,,,,,,
-# Proximity-services (ProSe) Function to Home Subscriber,,,,,,,,
-# Server (HSS) aspects;,,,,,,,,
-# Stage 3,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 29344-f10.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 29.344 Table 6.3.1-1: PC4a specific Diameter AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-ProSe-Subscription-Data,3701,6.3.2,Grouped,"M,V",,,,No
-ProSe-Permission,3702,6.3.3,Unsigned32,"M,V",,,,No
-ProSe-Allowed-PLMN,3703,6.3.4,Grouped,"M,V",,,,No
-ProSe-Direct-Allowed,3704,6.3.5,Unsigned32,"M,V",,,,No
-UPR-Flags,3705,6.3.6,Unsigned32,"M,V",,,,No
-PNR-Flags,3706,6.3.7,Unsigned32,"M,V",,,,No
-ProSe-Initial-Location-Information,3707,6.3.9,Grouped,"M,V",,,,No
-,,,,,,,,
-@standard,3GPP TS 32.299,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 32.299 V15.7.0 (2019-06),,,,,,,,
-# Charging management;,,,,,,,,
-# Diameter charging applications,,,,,,,,
-# ,,,,,,,,
-# From 3GPP 32299-f70.doc,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-#=,,,,,,,,
-# 3GPP TS 32.299 Table 7.2.0.1: 3GPP specific AVPs,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
+,,,,,,,
+@standard,3GPP TS 29.329,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.329 V15.2.0 (2019-09),,,,,,,
+# Sh Interface based on the Diameter protocol;,,,,,,,
+# Protocol details,,,,,,,
+# ,,,,,,,
+# From 3GPP 29329-f20.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,
+# ,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+User-Identity,700,6.3.1,Grouped,"M, V",,,
+MSISDN,701,6.3.2,OctetString,"M, V",,,
+# Note: Name conflict with 3GPP TS 29.229 User-Data (606).,,,,,,,
+# User-Data (702) renamed to User-Data-29.329 (702).,,,,,,,
+User-Data-29.329,702,6.3.3,OctetString,"M, V",,,
+Data-Reference,703,6.3.4,Enumerated,"M, V",,,
+Service-Indication,704,6.3.5,OctetString,"M, V",,,
+Subs-Req-Type,705,6.3.6,Enumerated,"M, V",,,
+Requested-Domain,706,6.3.7,Enumerated,"M, V",,,
+Current-Location,707,6.3.8,Enumerated,"M, V",,,
+Identity-Set,708,6.3.10,Enumerated,V,,,M
+Expiry-Time,709,6.3.16,Time,V,,,M
+Send-Data-Indication,710,6.3.17,Enumerated,V,,,M
+DSAI-Tag,711,6.3.18,OctetString,"M, V",,,
+One-Time-Notification,712,6.3.22,Enumerated,V,,,M
+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
+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
+UDR-Flags,719,6.3.28,Unsigned32,V,,,M
+Call-Reference-Info,720,6.3.29,Grouped,V,,,M
+Call-Reference-Number,721,6.3.30,OctetString,V,,,M
+AS-Number,722,6.3.31,OctetString,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.336,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.336 V15.7.0 (2019-09),,,,,,,
+# Home Subscriber Server (HSS) diameter interfaces for,,,,,,,
+# interworking with packet data networks and applications,,,,,,,
+# ,,,,,,,
+# From 3GPP 29336-f70.docx,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.336 Table 6.4.1/1: S6m/S6n specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+IP-SM-GW-Number,3100,6.4.14,OctetString,"M,V",,,
+IP-SM-GW-Name,3101,6.4.15,DiameterIdentity,"M,V",,,
+User-Identifier,3102,6.4.2,Grouped,"M,V",,,
+Service-ID,3103,6.4.3,Enumerated,"M,V",,,
+SCS-Identity,3104,6.4.4,OctetString,"M,V",,,
+Service-Parameters,3105,6.4.5,Grouped,"M,V",,,
+T4-Parameters,3106,6.4.6,Grouped,"M,V",,,
+Service-Data,3107,6.4.7,Grouped,"M,V",,,
+T4-Data,3108,6.4.8,Grouped,"M,V",,,
+HSS-Cause,3109,6.4.9,Unsigned32,"M,V",,,
+SIR-Flags,3110,6.4.10,Unsigned32,"M,V",,,
+External-Identifier,3111,6.4.11,UTF8String,"M,V",,,
+IP-SM-GW-Realm,3112,6.4.18,DiameterIdentity,"M,V",,,
+#=,,,,,,,
+# 3GPP TS 29.336 Table 8.4.1-1: S6t specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+AESE-Communication-Pattern,3113,8.4.25,Grouped,"M,V",,,
+Communication-Pattern-Set,3114,8.4.26,Grouped,"M,V",,,
+Periodic-Communication-Indicator,3115,8.4.27,Unsigned32,"M,V",,,
+Communication-Duration-Time,3116,8.4.28,Unsigned32,"M,V",,,
+Periodic-time,3117,8.4.29,Unsigned32,"M,V",,,
+Scheduled-Communication-Time,3118,8.4.30,Grouped,"M,V",,,
+Stationary-Indication,3119,8.4.31,Unsigned32,"M,V",,,
+AESE-Communication-Pattern-Config-Status,3120,8.4.32,Grouped,"M,V",,,
+AESE-Error-Report,3121,8.4.33,Grouped,"M,V",,,
+Monitoring-Event-Configuration,3122,8.4.2,Grouped,"M,V",,,
+Monitoring-Event-Report,3123,8.4.3,Grouped,"M,V",,,
+SCEF-Reference-ID,3124,8.4.4,Unsigned32,"M,V",,,
+SCEF-ID,3125,8.4.5,DiameterIdentity,"M,V",,,
+SCEF-Reference-ID-for-Deletion,3126,8.4.6,Unsigned32,"M,V",,,
+Monitoring-Type,3127,8.4.7,Unsigned32,"M,V",,,
+Maximum-Number-of-Reports,3128,8.4.8,Unsigned32,"M,V",,,
+UE-Reachability-Configuration,3129,8.4.9,Grouped,"M,V",,,
+Monitoring-Duration,3130,8.4.10,Time,"M,V",,,
+Maximum-Detection-Time,3131,8.4.11,Unsigned32,"M,V",,,
+Reachability-Type,3132,8.4.12,Unsigned32,"M,V",,,
+Maximum-Latency,3133,8.4.13,Unsigned32,"M,V",,,
+Maximum-Response-Time,3134,8.4.14,Unsigned32,"M,V",,,
+Location-Information-Configuration,3135,8.4.15,Grouped,"M,V",,,
+MONTE-Location-Type,3136,8.4.16,Unsigned32,"M,V",,,
+Accuracy,3137,8.4.17,Unsigned32,"M,V",,,
+Association-Type,3138,8.4.18,Unsigned32,"M,V",,,
+Roaming-Information,3139,8.4.19,Unsigned32,"M,V",,,
+Reachability-Information,3140,8.4.20,Unsigned32,"M,V",,,
+IMEI-Change,3141,8.4.22,Unsigned32,"M,V",,,
+Monitoring-Event-Config-Status,3142,8.4.24,Grouped,"M,V",,,
+Supported-Services,3143,8.4.40,Grouped,"M,V",,,
+Supported-Monitoring-Events,3144,8.4.41,Unsigned64,"M,V",,,
+CIR-Flags,3145,8.4.39,Unsigned32,"M,V",,,
+Service-Result,3146,8.4.37,Grouped,"M,V",,,
+Service-Result-Code,3147,8.4.38,Unsigned32,"M,V",,,
+Reference-ID-Validity-Time,3148,8.4.42,Time,"M,V",,,
+Event-Handling,3149,8.4.43,Unsigned32,"M,V",,,
+NIDD-Authorization-Request,3150,8.4.44,Grouped,"M,V",,,
+NIDD-Authorization-Response,3151,8.4.45,Grouped,"M,V",,,
+Service-Report,3152,8.4.47,Grouped,"M,V",,,
+Node-Type,3153,8.4.48,Unsigned32,"M,V",,,
+S6t-HSS-Cause,3154,8.4.50,Unsigned32,"M,V",,,
+Enhanced-Coverage-Restriction,3155,8.4.51,Grouped,V,,,M
+Enhanced-Coverage-Restriction-Data,3156,8.4.52,Grouped,V,,,M
+Restricted-PLMN-List,3157,8.4.53,Grouped,V,,,M
+Allowed-PLMN-List,3158,8.4.54,Grouped,V,,,M
+Requested-Validity-Time,3159,8.4.55,Time,V,,,M
+Granted-Validity-Time,3160,8.4.56,Time,V,,,M
+NIDD-Authorization-Update,3161,8.4.57,Grouped,V,,,M
+Loss-Of-Connectivity-Reason,3162,8.4.58,Unsigned32,V,,,M
+Group-Reporting-Guard-Timer,3163,8.4.59,Unsigned32,V,,,M
+CIA-Flags,3164,8.4.60,Unsigned32,V,,,M
+Group-Monitoring-Event-Report,3165,8.4.61,Grouped,V,,,M
+Group-Monitoring-Event-Report-Item,3166,8.4.62,Grouped,V,,,M
+RIR-Flags,3167,8.4.63,Unsigned32,V,,,M
+Type-Of-External-Identifier,3168,8.4.64,Unsigned32,V,,,M
+APN-Validity-Time,3169,8.4.65,Grouped,V,,,M
+Suggested-Network-Configuration,3170,8.4.66,Grouped,V,,,M
+Monitoring-Event-Report-Status,3171,8.4.67,Grouped,V,,,M
+PLMN-ID-Requested,3172,8.4.68,Enumerated,V,,,M
+AdditionalIdentifiers,3173,8.4.69,Grouped,V,,,M
+NIR-Flags,3174,8.4.70,Unsigned32,V,,,M
+Reporting-Time-Stamp,3175,8.4.71,Time,V,,,M
+NIA-Flags,3176,8.4.72,Unsigned32,V,,,M
+Group-User-Identifier,3177,8.4.73,Grouped,V,,,M
+MTC-Provider-Info,3178,8.4.74,Grouped,V,,,M
+MTC-Provider-ID,3179,8.4.75,UTF8String,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.338,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.338 V15.1.0 (2018-12),,,,,,,
+# Diameter based protocols to support,,,,,,,
+# Short Message Service (SMS) capable,,,,,,,
+# Mobile Management Entities (MMEs),,,,,,,
+# ,,,,,,,
+# From 3GPP 29338-f10.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.338 Table 5.3.3.1/1: S6c specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+SM-RP-MTI,3308,5.3.3.2,Enumerated,"M, V",,,
+SM-RP-SMEA,3309,5.3.3.3,OctetString,"M, V",,,
+SRR-Flags,3310,5.3.3.4,Unsigned32,"M, V",,,
+SM-Delivery-Not-Intended,3311,5.3.3.5,Enumerated,"M, V",,,
+MWD-Status,3312,5.3.3.8,Unsigned32,"M, V",,,
+MME-Absent-User-Diagnostic-SM,3313,5.3.3.9,Unsigned32,"M, V",,,
+MSC-Absent-User-Diagnostic-SM,3314,5.3.3.10,Unsigned32,"M, V",,,
+SGSN-Absent-User-Diagnostic-SM,3315,5.3.3.11,Unsigned32,"M, V",,,
+SM-Delivery-Outcome,3316,5.3.3.14,Grouped,"M, V",,,
+MME-SM-Delivery-Outcome,3317,5.3.3.15,Grouped,"M, V",,,
+MSC-SM-Delivery-Outcome,3318,5.3.3.16,Grouped,"M, V",,,
+SGSN-SM-Delivery-Outcome,3319,5.3.3.17,Grouped,"M, V",,,
+IP-SM-GW-SM-Delivery-Outcome,3320,5.3.3.18,Grouped,"M, V",,,
+SM-Delivery-Cause,3321,5.3.3.19,Enumerated,"M, V",,,
+Absent-User-Diagnostic-SM,3322,5.3.3.20,Unsigned32,"M, V",,,
+RDR-Flags,3323,5.3.3.21,Unsigned32,V,,,M
+Maximum-UE-Availability-Time,3329,5.3.3.22,Time,V,,,M
+SMS-GMSC-Alert-Event,3333,5.3.3.23,Unsigned32,V,,,M
+#=,,,,,,,
+# 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",,,
+SM-RP-UI,3301,6.3.3.3,OctetString,"M, V",,,
+TFR-Flags,3302,6.3.3.4,Unsigned32,"M, V",,,
+SM-Delivery-Failure-Cause,3303,6.3.3.5,Grouped,"M, V",,,
+SM-Enumerated-Delivery-Failure-Cause,3304,6.3.3.6,Enumerated,"M, V",,,
+SM-Diagnostic-Info,3305,6.3.3.7,OctetString,"M, V",,,
+SM-Delivery-Timer,3306,6.3.3.10,Unsigned32,"M, V",,,
+SM-Delivery-Start-Time,3307,6.3.3.11,Time,"M, V",,,
+SMSMI-Correlation-ID,3324,6.3.3.13,Grouped,V,,,M
+HSS-ID,3325,6.3.3.14,OctetString,V,,,M
+Originating-SIP-URI,3326,6.3.3.15,UTF8String,V,,,M
+Destination-SIP-URI,3327,6.3.3.16,UTF8String,V,,,M
+OFR-Flags,3328,6.3.3.12,Unsigned32,V,,,M
+Maximum-Retransmission-Time,3330,6.3.3.17,Time,V,,,M
+Requested-Retransmission-Time,3331,6.3.3.18,Time,V,,,M
+SMS-GMSC-Address,3332,6.3.3.19,OctetString,V,,,M
+,,,,,,,
+@standard,3GPP TS 29.344,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.344 V15.1.0 (2019-09),,,,,,,
+# Proximity-services (ProSe) Function to Home Subscriber,,,,,,,
+# Server (HSS) aspects;,,,,,,,
+# Stage 3,,,,,,,
+# ,,,,,,,
+# From 3GPP 29344-f10.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 29.344 Table 6.3.1-1: PC4a specific Diameter AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+ProSe-Subscription-Data,3701,6.3.2,Grouped,"M,V",,,
+ProSe-Permission,3702,6.3.3,Unsigned32,"M,V",,,
+ProSe-Allowed-PLMN,3703,6.3.4,Grouped,"M,V",,,
+ProSe-Direct-Allowed,3704,6.3.5,Unsigned32,"M,V",,,
+UPR-Flags,3705,6.3.6,Unsigned32,"M,V",,,
+PNR-Flags,3706,6.3.7,Unsigned32,"M,V",,,
+ProSe-Initial-Location-Information,3707,6.3.9,Grouped,"M,V",,,
+,,,,,,,
+@standard,3GPP TS 32.299,,,,,,
+#=,,,,,,,
+# 3GPP TS 32.299 V15.7.0 (2019-06),,,,,,,
+# Charging management;,,,,,,,
+# Diameter charging applications,,,,,,,
+# ,,,,,,,
+# From 3GPP 32299-f70.doc,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+#=,,,,,,,
+# 3GPP TS 32.299 Table 7.2.0.1: 3GPP specific AVPs,,,,,,,
+#=,,,,,,,
+#,,,,,,,
 3GPP-OC-Specific-Reduction,1320,,Grouped,V,,,M
 3GPP-OC-Rating-Group,1321,,Unsigned32,V,,,M
 3GPP-OC-Request-Type,1322,,Enumerated,V,,,M
-# Note: Name conflict with 3GPP TS 29.212 3GPP-PS-Data-Off-Status (2847).,,,,,,,,
-# 3GPP-PS-Data-Off-Status (4406) renamed to 3GPP-PS-Data-Off-Status-32.299 (4406).,,,,,,,,
+# Note: Name conflict with 3GPP TS 29.212 3GPP-PS-Data-Off-Status (2847).,,,,,,,
+# 3GPP-PS-Data-Off-Status (4406) renamed to 3GPP-PS-Data-Off-Status-32.299 (4406).,,,,,,,
 3GPP-PS-Data-Off-Status-32.299,4406,,Enumerated,"V,M",,,
 Access-Network-Info-Change,4401,,Grouped,"V,M",,,
@@ -1408,9 +1408,9 @@
 LCS-Information,878,,Grouped,"V,M",,,
 LCS-Name-String,1238,,UTF8String,"V,M",,,
-# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,,
-# LCS-Requestor-Id (1239) to LCS-Requestor-ID (1239).,,,,,,,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,
+# LCS-Requestor-Id (1239) to LCS-Requestor-ID (1239).,,,,,,,
 LCS-Requestor-ID,1239,,Grouped,"V,M",,,
-# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,,
-# LCS-Requestor-Id-String (1240) to LCS-Requestor-ID-String (1240).,,,,,,,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,
+# LCS-Requestor-Id-String (1240) to LCS-Requestor-ID-String (1240).,,,,,,,
 LCS-Requestor-ID-String,1240,,UTF8String,"V,M",,,
 Local-GW-Inserted-Indication,2604,,Enumerated,"V,M",,,
@@ -1423,7 +1423,7 @@
 Low-Priority-Indicator,2602,,Enumerated,"V,M",,,
 MBMS-Charged-Party,2323,,Enumerated,"V,M",,,
-# Note: 3GPP TS 32.299 V11.8.0 (2013-07) table 7.2 changed,,,,,,,,
-# row MBMS-GW-Address (2307) to have a hyphen instead of space.,,,,,,,,
-# Generated name renamed from MBMSGW-Address (2307).,,,,,,,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) table 7.2 changed,,,,,,,
+# row MBMS-GW-Address (2307) to have a hyphen instead of space.,,,,,,,
+# Generated name renamed from MBMSGW-Address (2307).,,,,,,,
 MBMS-GW-Address,2307,,Address,"V,M",,,
 MBMS-Information,880,,Grouped,"V,M",,,
@@ -1487,8 +1487,8 @@
 PDP-Address-Prefix-Length,2606,,Unsigned32,"V,M",,,
 PDP-Context-Type,1247,,Enumerated,"V,M",,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Address (895).,,,,,,,,
-PDG-Address,895,,Address,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Charging-Id (896).,,,,,,,,
-PDG-Charging-Id,896,,Unsigned32,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Address (895).,,,,,,,
+PDG-Address,895,,Address,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Charging-Id (896).,,,,,,,
+PDG-Charging-Id,896,,Unsigned32,"M,V",P,,
 Play-Alternative,3913,,Enumerated,"V,M",,,
 PoC-Change-Condition,1261,,Enumerated,"V,M",,,
@@ -1504,6 +1504,6 @@
 PoC-User-Role,1252,,Grouped,"V,M",,,
 PoC-User-Role-IDs,1253,,UTF8String,"V,M",,,
-# Note: 3GPP TS 32.299 V13.1.0 (2015-06) renamed,,,,,,,,
-# PoC-User-Role-info-Units (1254) to PoC-User-Role-Info-Units (1254).,,,,,,,,
+# Note: 3GPP TS 32.299 V13.1.0 (2015-06) renamed,,,,,,,
+# PoC-User-Role-info-Units (1254) to PoC-User-Role-Info-Units (1254).,,,,,,,
 PoC-User-Role-Info-Units,1254,,Enumerated,"V,M",,,
 Positioning-Data,1245,,UTF8String,"V,M",,,
@@ -1626,8 +1626,8 @@
 Start-of-Charging,3419,,Time,"V,M",,,
 Start-Time,2041,,Time,"V,M",,,
-# Note: 3GPP TS 32.299 V11.10.0 (2013-12) renamed,,,,,,,,
-"# Status (2702) to Status-Code (2702), and then",,,,,,,,
-# 3GPP TS 32.299 V11.14.0 (2014-12) renamed,,,,,,,,
-# Status-Code (2702) to Status-AS-Code (2702).,,,,,,,,
+# Note: 3GPP TS 32.299 V11.10.0 (2013-12) renamed,,,,,,,
+"# Status (2702) to Status-Code (2702), and then",,,,,,,
+# 3GPP TS 32.299 V11.14.0 (2014-12) renamed,,,,,,,
+# Status-Code (2702) to Status-AS-Code (2702).,,,,,,,
 Status-AS-Code,2702,,Enumerated,"V,M",,,
 Stop-Time,2042,,Time,"V,M",,,
@@ -1682,58 +1682,58 @@
 VLR-Number,3420,,OctetString,"V,M",,,
 Volume-Quota-Threshold,869,,Unsigned32,"V,M",,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-Address (890).,,,,,,,,
-WAG-Address,890,,Address,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-PLMN-Id (891).,,,,,,,,
-WAG-PLMN-Id,891,,OctetString,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Information (875).,,,,,,,,
-WLAN-Information,875,,Grouped,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-Address (890).,,,,,,,
+WAG-Address,890,,Address,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-PLMN-Id (891).,,,,,,,
+WAG-PLMN-Id,891,,OctetString,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Information (875).,,,,,,,
+WLAN-Information,875,,Grouped,"M,V",P,,
 WLAN-Operator-Id,1306,,Grouped,V,,,M
 WLAN-Operator-Name,1307,,UTF8String,V,,,M
 WLAN-PLMN-Id,1308,,UTF8String,V,,,M
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Radio-Container (892).,,,,,,,,
-WLAN-Radio-Container,892,,Grouped,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Session-Id (1246).,,,,,,,,
-WLAN-Session-Id,1246,,UTF8String,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Technology (893).,,,,,,,,
-WLAN-Technology,893,,Unsigned32,"M,V",P,,,N
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-UE-Local-IPAddress (894).,,,,,,,,
-WLAN-UE-Local-IPAddress,894,,Address,"M,V",P,,,N
-,,,,,,,,
-@standard,OMA DDS Charging Data,,,,,,,
-#=,,,,,,,,
-# OMA DDS Charging_Data V1.0 20110201-A,,,,,,,,
-# Charging Data,,,,,,,,
-# ,,,,,,,,
-# From OMA OMA-DDS-Charging_Data-V1_0-20110201-A.pdf,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-Application-Server-Id,2101,8.4,UTF8String,"M,V",,,,Y
-# Note: Application-Service-Type (2102) corrected from UTF8String to Enumerated.,,,,,,,,
-Application-Service-Type,2102,8.4,Enumerated,"M,V",,,,Y
-# Note: Application–Session–Id (2103) corrected from UTF8String to Unsigned32.,,,,,,,,
-Application-Session-Id,2103,8.4,Unsigned32,"M,V",,,,Y
-Content-ID,2116,8.4,UTF8String,"M,V",,,,Y
-Content-provider-ID,2117,8.4,UTF8String,"M,V",,,,Y
-DCD-Information,2115,8.5.5,Grouped,"M,V",,,,Y
-Delivery-Status,2104,8.4,UTF8String,"M,V",,,,Y
-IM-Information,2110,8.5.6,Grouped,"M,V",,,,Y
-Number-Of-Messages-Successfully-Exploded,2111,8.4,Unsigned32,"M,V",,,,Y
-Number-Of-Messages-Successfully-Sent,2112,8.4,Unsigned32,"M,V",,,,Y
-Service-Generic-Information,1256,8.5.10,Grouped,"M,V",,,,Y
-Total-Number-Of-Messages-Exploded,2113,8.4,Unsigned32,"M,V",,,,Y
-Total-Number-Of-Messages-Sent,2114,8.4,Unsigned32,"M,V",,,,Y
-,,,,,,,,
-,,,,,,,,
-@vendor,5535,,,,,,,
-,,,,,,,,
-@standard,X.S0057-0,,,,,,,
-#=,,,,,,,,
-# 3GPP2 X.S0057-0 v2.0,,,,,,,,
-# E-UTRAN - eHRPD Connectivity and Interworking:,,,,,,,,
-# Core Network Aspects,,,,,,,,
-# ,,,,,,,,
-# From 3GPP2 X.S0057-0_v2.0_091215.pdf,,,,,,,,
-#=,,,,,,,,
-#,,,,,,,,
-# Note: 3GPP2-BSID (9010) corrected from OctetString to UTF8String.,,,,,,,,
-3GPP2-BSID,9010,5.6.2.1.1,UTF8String,"M,V",P,,,No
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Radio-Container (892).,,,,,,,
+WLAN-Radio-Container,892,,Grouped,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Session-Id (1246).,,,,,,,
+WLAN-Session-Id,1246,,UTF8String,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Technology (893).,,,,,,,
+WLAN-Technology,893,,Unsigned32,"M,V",P,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-UE-Local-IPAddress (894).,,,,,,,
+WLAN-UE-Local-IPAddress,894,,Address,"M,V",P,,
+,,,,,,,
+@standard,OMA DDS Charging Data,,,,,,
+#=,,,,,,,
+# OMA DDS Charging_Data V1.0 20110201-A,,,,,,,
+# Charging Data,,,,,,,
+# ,,,,,,,
+# From OMA OMA-DDS-Charging_Data-V1_0-20110201-A.pdf,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+Application-Server-Id,2101,8.4,UTF8String,"M,V",,,
+# Note: Application-Service-Type (2102) corrected from UTF8String to Enumerated.,,,,,,,
+Application-Service-Type,2102,8.4,Enumerated,"M,V",,,
+# Note: Application–Session–Id (2103) corrected from UTF8String to Unsigned32.,,,,,,,
+Application-Session-Id,2103,8.4,Unsigned32,"M,V",,,
+Content-ID,2116,8.4,UTF8String,"M,V",,,
+Content-provider-ID,2117,8.4,UTF8String,"M,V",,,
+DCD-Information,2115,8.5.5,Grouped,"M,V",,,
+Delivery-Status,2104,8.4,UTF8String,"M,V",,,
+IM-Information,2110,8.5.6,Grouped,"M,V",,,
+Number-Of-Messages-Successfully-Exploded,2111,8.4,Unsigned32,"M,V",,,
+Number-Of-Messages-Successfully-Sent,2112,8.4,Unsigned32,"M,V",,,
+Service-Generic-Information,1256,8.5.10,Grouped,"M,V",,,
+Total-Number-Of-Messages-Exploded,2113,8.4,Unsigned32,"M,V",,,
+Total-Number-Of-Messages-Sent,2114,8.4,Unsigned32,"M,V",,,
+,,,,,,,
+,,,,,,,
+@vendor,5535,,,,,,
+,,,,,,,
+@standard,X.S0057-0,,,,,,
+#=,,,,,,,
+# 3GPP2 X.S0057-0 v2.0,,,,,,,
+# E-UTRAN - eHRPD Connectivity and Interworking:,,,,,,,
+# Core Network Aspects,,,,,,,
+# ,,,,,,,
+# From 3GPP2 X.S0057-0_v2.0_091215.pdf,,,,,,,
+#=,,,,,,,
+#,,,,,,,
+# Note: 3GPP2-BSID (9010) corrected from OctetString to UTF8String.,,,,,,,
+3GPP2-BSID,9010,5.6.2.1.1,UTF8String,"M,V",P,,
