# HG changeset patch # User Luke Mewburn # Date 1587347096 -36000 # Node ID f8561a0f7ac1f6f5c9910946532eb01c9a22839a # Parent 64d0a145b0411e1f2de813212876518ec71350f7 Rename IPv6 AVPs per 3GPP TS 29.061 The following AVPs were renamed in 3GPP TS 29.061 V12.6.0 (2014-06) (where "IPv6" was globally changed to "Ipv6" in the standard): - 3GPP-CG-IPv6-Address (14) renamed to 3GPP-CG-Ipv6-Address (14). - 3GPP-SGSN-IPv6-Address (15) renamed to 3GPP-SGSN-Ipv6-Address (15). - 3GPP-GGSN-IPv6-Address (16) renamed to 3GPP-GGSN-Ipv6-Address (16). - 3GPP-IPv6-DNS-Servers (17) renamed to 3GPP-Ipv6-DNS-Servers (17). - MBMS-GGSN-IPv6-Address (917) renamed to MBMS-GGSN-Ipv6-Address (917). - MBMS-BMSC-SSM-IPv6-Address (919) renamed to MBMS-BMSC-SSM-Ipv6-Address (919). diff -r 64d0a145b041 -r f8561a0f7ac1 extensions/dict_dcca_3gpp/add_avps.c --- a/extensions/dict_dcca_3gpp/add_avps.c Sat Apr 18 17:31:05 2020 +1000 +++ b/extensions/dict_dcca_3gpp/add_avps.c Mon Apr 20 11:44:56 2020 +1000 @@ -237,16 +237,16 @@ }; /* 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. */ - /* */ - /* Fix: 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp. */ - /* 3GPP-CG-IPv6-Address, OctetString, code 14, section 16.4.7 */ + /* 3GPP-CG-IPv6-Address (14) to 3GPP-CG-Ipv6-Address. */ + /* */ + /* Fix: 3GPP-CG-Ipv6-Address (14) changed to Must M per contrib/3gpp. */ + /* Change-1.4.0: 3GPP-CG-IPv6-Address (14) renamed to 3GPP-CG-Ipv6-Address (14). */ + /* 3GPP-CG-Ipv6-Address, OctetString, code 14, section 16.4.7 */ { struct dict_avp_data data = { 14, /* Code */ 10415, /* Vendor */ - "3GPP-CG-IPv6-Address", /* Name */ + "3GPP-CG-Ipv6-Address", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -255,16 +255,16 @@ }; /* 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. */ - /* */ - /* Fix: 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp. */ - /* 3GPP-SGSN-IPv6-Address, OctetString, code 15, section 16.4.7 */ + /* 3GPP-SGSN-IPv6-Address (15) to 3GPP-SGSN-Ipv6-Address. */ + /* */ + /* Fix: 3GPP-SGSN-Ipv6-Address (15) changed to Must M per contrib/3gpp. */ + /* Change-1.4.0: 3GPP-SGSN-IPv6-Address (15) renamed to 3GPP-SGSN-Ipv6-Address (15). */ + /* 3GPP-SGSN-Ipv6-Address, OctetString, code 15, section 16.4.7 */ { struct dict_avp_data data = { 15, /* Code */ 10415, /* Vendor */ - "3GPP-SGSN-IPv6-Address", /* Name */ + "3GPP-SGSN-Ipv6-Address", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -273,16 +273,16 @@ }; /* 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. */ - /* */ - /* Fix: 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp. */ - /* 3GPP-GGSN-IPv6-Address, OctetString, code 16, section 16.4.7 */ + /* 3GPP-GGSN-IPv6-Address (16) to 3GPP-GGSN-Ipv6-Address. */ + /* */ + /* Fix: 3GPP-GGSN-Ipv6-Address (16) changed to Must M per contrib/3gpp. */ + /* Change-1.4.0: 3GPP-GGSN-IPv6-Address (16) renamed to 3GPP-GGSN-Ipv6-Address (16). */ + /* 3GPP-GGSN-Ipv6-Address, OctetString, code 16, section 16.4.7 */ { struct dict_avp_data data = { 16, /* Code */ 10415, /* Vendor */ - "3GPP-GGSN-IPv6-Address", /* Name */ + "3GPP-GGSN-Ipv6-Address", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -291,16 +291,16 @@ }; /* 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. */ - /* */ - /* Fix: 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp. */ - /* 3GPP-IPv6-DNS-Servers, OctetString, code 17, section 16.4.7 */ + /* 3GPP-IPv6-DNS-Servers (17) to 3GPP-Ipv6-DNS-Servers. */ + /* */ + /* Fix: 3GPP-Ipv6-DNS-Servers (17) changed to Must M per contrib/3gpp. */ + /* Change-1.4.0: 3GPP-IPv6-DNS-Servers (17) renamed to 3GPP-Ipv6-DNS-Servers (17). */ + /* 3GPP-Ipv6-DNS-Servers, OctetString, code 17, section 16.4.7 */ { struct dict_avp_data data = { 17, /* Code */ 10415, /* Vendor */ - "3GPP-IPv6-DNS-Servers", /* Name */ + "3GPP-Ipv6-DNS-Servers", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -717,14 +717,15 @@ }; /* 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, OctetString, code 917, section 17.7.20 */ + /* MBMS-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address. */ + /* */ + /* Change-1.4.0: MBMS-GGSN-IPv6-Address (917) renamed to MBMS-GGSN-Ipv6-Address (917). */ + /* MBMS-GGSN-Ipv6-Address, OctetString, code 917, section 17.7.20 */ { struct dict_avp_data data = { 917, /* Code */ 10415, /* Vendor */ - "MBMS-GGSN-IPv6-Address", /* Name */ + "MBMS-GGSN-Ipv6-Address", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -746,14 +747,15 @@ }; /* 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, OctetString, code 919, section 17.7.22 */ + /* MBMS-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address. */ + /* */ + /* Change-1.4.0: MBMS-BMSC-SSM-IPv6-Address (919) renamed to MBMS-BMSC-SSM-Ipv6-Address (919). */ + /* MBMS-BMSC-SSM-Ipv6-Address, OctetString, code 919, section 17.7.22 */ { struct dict_avp_data data = { 919, /* Code */ 10415, /* Vendor */ - "MBMS-BMSC-SSM-IPv6-Address", /* Name */ + "MBMS-BMSC-SSM-Ipv6-Address", /* Name */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ AVP_TYPE_OCTETSTRING /* base type of data */ @@ -843,10 +845,11 @@ }; /* 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) to MBMS-GW-SSM-Ipv6-Address. */ /* Note: Name conflict with 3GPP TS 29.061 MBMS-GW-SSM-IPv6-Address (3523). */ /* 3GPP TS 29.061 V10.4.0 (2011-09) CR 0355 added MBMS-GW-SSM-IPv6-Address (925). */ + /* 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ + /* MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address. */ /* 3GPP TS 29.468 V14.0.0 (2016-12) CR 0021 added MBMS-GW-SSM-IPv6-Address (3523). */ /* MBMS-GW-SSM-IPv6-Address, OctetString, code 925, section 20.5a.3 */ { @@ -15127,6 +15130,8 @@ /* Note: Name conflict with 3GPP TS 29.061 MBMS-GW-SSM-IPv6-Address (925). */ /* 3GPP TS 29.061 V10.4.0 (2011-09) CR 0355 added MBMS-GW-SSM-IPv6-Address (925). */ + /* 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ + /* MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address. */ /* 3GPP TS 29.468 V14.0.0 (2016-12) CR 0021 added MBMS-GW-SSM-IPv6-Address (3523). */ /* */ /* Fix: MBMS-GW-SSM-IPv6-Address (3523) renamed to MBMS-GW-SSM-IPv6-Address-29.468 (3523). */ diff -r 64d0a145b041 -r f8561a0f7ac1 extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv --- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Sat Apr 18 17:31:05 2020 +1000 +++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv Mon Apr 20 11:44:56 2020 +1000 @@ -47,29 +47,29 @@ # Fix: 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) to 3GPP-CG-Ipv6-Address.,,,,,,, # ,,,,,,, -# Fix: 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp.,,,,,,, -3GPP-CG-IPv6-Address,14,16.4.7,OctetString,"M,V",P,, +# Fix: 3GPP-CG-Ipv6-Address (14) changed to Must M per contrib/3gpp.,,,,,,, +# Change-1.4.0: 3GPP-CG-IPv6-Address (14) renamed to 3GPP-CG-Ipv6-Address (14).,,,,,,, +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) to 3GPP-SGSN-Ipv6-Address.,,,,,,, # ,,,,,,, -# Fix: 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp.,,,,,,, -3GPP-SGSN-IPv6-Address,15,16.4.7,OctetString,"M,V",P,, +# Fix: 3GPP-SGSN-Ipv6-Address (15) changed to Must M per contrib/3gpp.,,,,,,, +# Change-1.4.0: 3GPP-SGSN-IPv6-Address (15) renamed to 3GPP-SGSN-Ipv6-Address (15).,,,,,,, +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) to 3GPP-GGSN-Ipv6-Address.,,,,,,, # ,,,,,,, -# Fix: 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp.,,,,,,, -3GPP-GGSN-IPv6-Address,16,16.4.7,OctetString,"M,V",P,, +# Fix: 3GPP-GGSN-Ipv6-Address (16) changed to Must M per contrib/3gpp.,,,,,,, +# Change-1.4.0: 3GPP-GGSN-IPv6-Address (16) renamed to 3GPP-GGSN-Ipv6-Address (16).,,,,,,, +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) to 3GPP-Ipv6-DNS-Servers.,,,,,,, # ,,,,,,, -# Fix: 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp.,,,,,,, -3GPP-IPv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,, +# Fix: 3GPP-Ipv6-DNS-Servers (17) changed to Must M per contrib/3gpp.,,,,,,, +# Change-1.4.0: 3GPP-IPv6-DNS-Servers (17) renamed to 3GPP-Ipv6-DNS-Servers (17).,,,,,,, +3GPP-Ipv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,, # Fix: 3GPP-SGSN-MCC-MNC (18) changed to Must M per contrib/3gpp.,,,,,,, 3GPP-SGSN-MCC-MNC,18,16.4.7,UTF8String,"M,V",P,, # Fix: 3GPP-IMEISV (20) changed to Must M.,,,,,,, @@ -116,14 +116,16 @@ 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-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address.,,,,,,, +# ,,,,,,, +# Change-1.4.0: MBMS-GGSN-IPv6-Address (917) renamed to MBMS-GGSN-Ipv6-Address (917).,,,,,,, +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-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address.,,,,,,, +# ,,,,,,, +# Change-1.4.0: MBMS-BMSC-SSM-IPv6-Address (919) renamed to MBMS-BMSC-SSM-Ipv6-Address (919).,,,,,,, +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,, @@ -137,10 +139,11 @@ # 3GPP TS 29.468 V14.0.0 (2016-12) CR 0021 added MBMS-GW-SSM-IP-Address (3522).,,,,,,, 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) to MBMS-GW-SSM-Ipv6-Address.,,,,,,, # Note: Name conflict with 3GPP TS 29.061 MBMS-GW-SSM-IPv6-Address (3523).,,,,,,, # 3GPP TS 29.061 V10.4.0 (2011-09) CR 0355 added MBMS-GW-SSM-IPv6-Address (925).,,,,,,, +# 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,, +# MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address.,,,,,,, # 3GPP TS 29.468 V14.0.0 (2016-12) CR 0021 added MBMS-GW-SSM-IPv6-Address (3523).,,,,,,, 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 @@ -1836,6 +1839,8 @@ MBMS-GW-SSM-IP-Address-29.468,3522,6.4.24,Address,V,P,,M # Note: Name conflict with 3GPP TS 29.061 MBMS-GW-SSM-IPv6-Address (925).,,,,,,, # 3GPP TS 29.061 V10.4.0 (2011-09) CR 0355 added MBMS-GW-SSM-IPv6-Address (925).,,,,,,, +# 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,, +# MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address.,,,,,,, # 3GPP TS 29.468 V14.0.0 (2016-12) CR 0021 added MBMS-GW-SSM-IPv6-Address (3523).,,,,,,, # ,,,,,,, # Fix: MBMS-GW-SSM-IPv6-Address (3523) renamed to MBMS-GW-SSM-IPv6-Address-29.468 (3523).,,,,,,,