Changeset 1486:eeb5706333c3 in freeDiameter for extensions
- Timestamp:
- Mar 27, 2020, 8:30:27 AM (4 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- extensions/dict_dcca_3gpp
- Files:
-
- 2 edited
-
dict_dcca_3gpp.c (modified) (52 diffs)
-
dict_dcca_3gpp.csv (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/dict_dcca_3gpp/dict_dcca_3gpp.c
r1485 r1486 369 369 370 370 /*==================================================================*/ 371 /* 3GPP 29.061-c00 (12.0.0 2012.12.20) */ 372 /* 3GPP 29.061 is not very clear and self-inconsistent about M */ 373 /* for this reason, other sources are assumed more trustworthy */ 371 /* 3GPP TS 29.061 V15.5.0 (2018-12) */ 372 /* From 3GPP 29061-f50.doc */ 374 373 /*==================================================================*/ 375 374 376 /* M inconsistently specified */ 375 /*==================================================================*/ 376 /* 3GPP TS 29.061 Table 9a: Gi/Sgi specific AVPs */ 377 378 /* Note: 3GPP TS 29.061 is unclear and inconsistent about M. */ 379 /* For this reason, other sources are assumed more trustworthy. */ 380 /*==================================================================*/ 381 382 /* Note: 3GPP-IMSI (1) changed to Must M. */ 377 383 /* 3GPP-IMSI, UTF8String, code 1, section 16.4.7 */ 378 384 { … … 388 394 }; 389 395 390 /* 29.061 says OctetString; dumps say UInt32; manually changed*/391 /* 29.061 says MUST NOT M; dumps say MUST*/396 /* Note: 3GPP-Charging-Id (2) type changed from OctetString to Unsigned32, */ 397 /* per 3GPP TS 29.061 clause 16.4.7.2/2 and packet dumps. */ 392 398 /* 3GPP-Charging-Id, Unsigned32, code 2, section 16.4.7 */ 393 399 { … … 403 409 }; 404 410 405 /* 29.061 says MUST NOT M; dumps say MUST*/411 /* Note: 3GPP-PDP-Type (3) changed to Must M. */ 406 412 /* 3GPP-PDP-Type, Enumerated, code 3, section 16.4.7 */ 407 413 { … … 433 439 }; 434 440 435 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/441 /* Note: 3GPP-GPRS-Negotiated-QoS-Profile (5) changed to Must M per contrib/3gpp. */ 436 442 /* 3GPP-GPRS-Negotiated-QoS-Profile, UTF8String, code 5, section 16.4.7 */ 437 443 { … … 447 453 }; 448 454 449 /* M inconsistently specified; old contrib/3gg says MUST NOT */450 455 /* 3GPP-SGSN-Address, OctetString, code 6, section 16.4.7 */ 451 456 { … … 474 479 }; 475 480 476 /* 29.061 says MUST NOT M; dumps say MUST*/481 /* Note: 3GPP-IMSI-MCC-MNC (8) changed to Must M per packet dumps. */ 477 482 /* 3GPP-IMSI-MCC-MNC, UTF8String, code 8, section 16.4.7 */ 478 483 { … … 488 493 }; 489 494 490 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/495 /* Note: 3GPP-GGSN-MCC-MNC (9) changed to Must M per contrib/3gpp. */ 491 496 /* 3GPP-GGSN-MCC-MNC, UTF8String, code 9, section 16.4.7 */ 492 497 { … … 502 507 }; 503 508 504 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/509 /* Note: 3GPP-NSAPI (10) changed to Must M per contrib/3gpp. */ 505 510 /* 3GPP-NSAPI, OctetString, code 10, section 16.4.7 */ 506 511 { … … 516 521 }; 517 522 518 /* added manually, missing in AVP table */ 523 /* Note: 3GPP TS 29.061 table 9a does not define */ 524 /* 3GPP-Session-Stop-Indicator (11) even when it is referenced */ 525 /* by other 3GPP Diameter AVPs including PS-Information (874). */ 519 526 /* 3GPP-Session-Stop-Indicator, OctetString, code 11, section 16.4.7 */ 520 527 { … … 530 537 }; 531 538 532 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/539 /* Note: 3GPP-Selection-Mode (12) changed to Must M per contrib/3gpp. */ 533 540 /* 3GPP-Selection-Mode, UTF8String, code 12, section 16.4.7 */ 534 541 { … … 544 551 }; 545 552 546 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/553 /* Note: 3GPP-Charging-Characteristics (13) changed to Must M per contrib/3gpp. */ 547 554 /* 3GPP-Charging-Characteristics, UTF8String, code 13, section 16.4.7 */ 548 555 { … … 558 565 }; 559 566 560 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST */ 567 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 568 /* 3GPP-CG-IPv6-Address (14) to 3GPP-CG-Ipv6-Address. */ 569 /* This rename was not applied. */ 570 /* 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp. */ 561 571 /* 3GPP-CG-IPv6-Address, OctetString, code 14, section 16.4.7 */ 562 572 { … … 572 582 }; 573 583 574 /* M inconsistently specified */ 575 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST */ 584 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 585 /* 3GPP-SGSN-IPv6-Address (15) to 3GPP-SGSN-Ipv6-Address. */ 586 /* This rename was not applied. */ 587 /* 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp. */ 576 588 /* 3GPP-SGSN-IPv6-Address, OctetString, code 15, section 16.4.7 */ 577 589 { … … 587 599 }; 588 600 589 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST */ 601 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 602 /* 3GPP-GGSN-IPv6-Address (16) to 3GPP-GGSN-Ipv6-Address. */ 603 /* This rename was not applied. */ 604 /* 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp. */ 590 605 /* 3GPP-GGSN-IPv6-Address, OctetString, code 16, section 16.4.7 */ 591 606 { … … 601 616 }; 602 617 603 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST */ 618 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 619 /* 3GPP-IPv6-DNS-Servers (17) to 3GPP-Ipv6-DNS-Servers. */ 620 /* This rename was not applied. */ 621 /* 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp. */ 604 622 /* 3GPP-IPv6-DNS-Servers, OctetString, code 17, section 16.4.7 */ 605 623 { … … 615 633 }; 616 634 617 /* 29.061 says MUST NOT M; old contrib/3gpp says MUST*/635 /* Note: 3GPP-SGSN-MCC-MNC (18) changed to Must M per contrib/3gpp. */ 618 636 /* 3GPP-SGSN-MCC-MNC, UTF8String, code 18, section 16.4.7 */ 619 637 { … … 629 647 }; 630 648 631 /* M inconsistently specified*/649 /* Note: 3GPP-IMEISV (20) changed to Must M. */ 632 650 /* 3GPP-IMEISV, OctetString, code 20, section 16.4.7 */ 633 651 { … … 643 661 }; 644 662 645 /* M inconsistently specified*/663 /* Note: 3GPP-RAT-Type (21) changed to Must M. */ 646 664 /* 3GPP-RAT-Type, OctetString, code 21, section 16.4.7 */ 647 665 { … … 657 675 }; 658 676 659 /* M inconsistently specified*/677 /* Note: 3GPP-User-Location-Info (22) changed to Must M. */ 660 678 /* 3GPP-User-Location-Info, OctetString, code 22, section 16.4.7 */ 661 679 { … … 671 689 }; 672 690 673 /* M inconsistently specified*/691 /* Note: 3GPP-MS-TimeZone (23) changed to Must M. */ 674 692 /* 3GPP-MS-TimeZone, OctetString, code 23, section 16.4.7 */ 675 693 { … … 745 763 /* External-Identifier (3111) UTF8String. */ 746 764 747 /* TMGI, OctetString, code 900, section 17.07.02 */ 765 766 /* TWAN-Identifier, OctetString, code 29, section 16.4.7 */ 767 { 768 struct dict_avp_data data = { 769 29, /* Code */ 770 10415, /* Vendor */ 771 "TWAN-Identifier", /* Name */ 772 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 773 AVP_FLAG_VENDOR, /* Fixed flag values */ 774 AVP_TYPE_OCTETSTRING /* base type of data */ 775 }; 776 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 777 }; 778 779 /* 3GPP-User-Location-Info-Time, OctetString, code 30, section 16.4.7 */ 780 { 781 struct dict_avp_data data = { 782 30, /* Code */ 783 10415, /* Vendor */ 784 "3GPP-User-Location-Info-Time", /* Name */ 785 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 786 AVP_FLAG_VENDOR, /* Fixed flag values */ 787 AVP_TYPE_OCTETSTRING /* base type of data */ 788 }; 789 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 790 }; 791 792 /* 3GPP-Secondary-RAT-Usage, OctetString, code 31, section 16.4.7 */ 793 { 794 struct dict_avp_data data = { 795 31, /* Code */ 796 10415, /* Vendor */ 797 "3GPP-Secondary-RAT-Usage", /* Name */ 798 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 799 AVP_FLAG_VENDOR, /* Fixed flag values */ 800 AVP_TYPE_OCTETSTRING /* base type of data */ 801 }; 802 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 803 }; 804 805 /*==================================================================*/ 806 /* 3GPP TS 29.061 Table 10: Gmb specific AVPs */ 807 /*==================================================================*/ 808 809 /* TMGI, OctetString, code 900, section 17.7.2 */ 748 810 { 749 811 struct dict_avp_data data = { … … 758 820 }; 759 821 760 /* Required-MBMS-Bearer-Capabilities, UTF8String, code 901, section 17. 07.03 */822 /* Required-MBMS-Bearer-Capabilities, UTF8String, code 901, section 17.7.3 */ 761 823 { 762 824 struct dict_avp_data data = { … … 771 833 }; 772 834 773 /* MBMS-StartStop-Indication, Enumerated, code 902, section 17. 07.05*/835 /* MBMS-StartStop-Indication, Enumerated, code 902, section 17.7.5 */ 774 836 { 775 837 struct dict_avp_data data = { … … 787 849 }; 788 850 789 /* MBMS-Service-Area, OctetString, code 903, section 17. 07.06*/851 /* MBMS-Service-Area, OctetString, code 903, section 17.7.6 */ 790 852 { 791 853 struct dict_avp_data data = { … … 800 862 }; 801 863 802 /* MBMS-Session-Duration, OctetString, code 904, section 17. 07.07*/864 /* MBMS-Session-Duration, OctetString, code 904, section 17.7.7 */ 803 865 { 804 866 struct dict_avp_data data = { … … 813 875 }; 814 876 815 /* Alternative-APN, UTF8String, code 905, section 17. 07.08*/877 /* Alternative-APN, UTF8String, code 905, section 17.7.8 */ 816 878 { 817 879 struct dict_avp_data data = { … … 826 888 }; 827 889 828 /* MBMS-Service-Type, Enumerated, code 906, section 17. 07.09*/890 /* MBMS-Service-Type, Enumerated, code 906, section 17.7.9 */ 829 891 { 830 892 struct dict_avp_data data = { … … 842 904 }; 843 905 844 /* MBMS-2G-3G-Indicator, Enumerated, code 907, section 17. 07.10*/906 /* MBMS-2G-3G-Indicator, Enumerated, code 907, section 17.7.10 */ 845 907 { 846 908 struct dict_avp_data data = { … … 858 920 }; 859 921 860 /* MBMS-Session-Identity, OctetString, code 908, section 17. 07.11*/922 /* MBMS-Session-Identity, OctetString, code 908, section 17.7.11 */ 861 923 { 862 924 struct dict_avp_data data = { … … 871 933 }; 872 934 873 /* RAI, UTF8String, code 909, section 17. 07.12*/935 /* RAI, UTF8String, code 909, section 17.7.12 */ 874 936 { 875 937 struct dict_avp_data data = { … … 884 946 }; 885 947 886 /* Additional-MBMS-Trace-Info, OctetString, code 910, section 17. 07.13 */948 /* Additional-MBMS-Trace-Info, OctetString, code 910, section 17.7.13 */ 887 949 { 888 950 struct dict_avp_data data = { … … 897 959 }; 898 960 899 /* MBMS-Time-To-Data-Transfer, OctetString, code 911, section 17. 07.14 */961 /* MBMS-Time-To-Data-Transfer, OctetString, code 911, section 17.7.14 */ 900 962 { 901 963 struct dict_avp_data data = { … … 910 972 }; 911 973 912 /* MBMS-Session-Repetition-Number, OctetString, code 912, section 17. 07.15 */974 /* MBMS-Session-Repetition-Number, OctetString, code 912, section 17.7.15 */ 913 975 { 914 976 struct dict_avp_data data = { … … 923 985 }; 924 986 925 /* MBMS-Required-QoS, UTF8String, code 913, section 17. 07.16*/987 /* MBMS-Required-QoS, UTF8String, code 913, section 17.7.16 */ 926 988 { 927 989 struct dict_avp_data data = { … … 936 998 }; 937 999 938 /* MBMS-Counting-Information, Enumerated, code 914, section 17. 07.17 */1000 /* MBMS-Counting-Information, Enumerated, code 914, section 17.7.17 */ 939 1001 { 940 1002 struct dict_avp_data data = { … … 952 1014 }; 953 1015 954 /* MBMS-User-Data-Mode-Indication, Enumerated, code 915, section 17. 07.18 */1016 /* MBMS-User-Data-Mode-Indication, Enumerated, code 915, section 17.7.18 */ 955 1017 { 956 1018 struct dict_avp_data data = { … … 968 1030 }; 969 1031 970 /* MBMS-GGSN-Address, OctetString, code 916, section 17. 07.19*/1032 /* MBMS-GGSN-Address, OctetString, code 916, section 17.7.19 */ 971 1033 { 972 1034 struct dict_avp_data data = { … … 981 1043 }; 982 1044 983 /* MBMS-GGSN-IPv6-Address, OctetString, code 917, section 17.07.20 */ 1045 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 1046 /* MBMS-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address. */ 1047 /* This rename was not applied. */ 1048 /* MBMS-GGSN-IPv6-Address, OctetString, code 917, section 17.7.20 */ 984 1049 { 985 1050 struct dict_avp_data data = { … … 994 1059 }; 995 1060 996 /* MBMS-BMSC-SSM-IP-Address, OctetString, code 918, section 17. 07.21 */1061 /* MBMS-BMSC-SSM-IP-Address, OctetString, code 918, section 17.7.21 */ 997 1062 { 998 1063 struct dict_avp_data data = { … … 1007 1072 }; 1008 1073 1009 /* MBMS-BMSC-SSM-IPv6-Address, OctetString, code 919, section 17.07.22 */ 1074 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 1075 /* MBMS-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address. */ 1076 /* This rename was not applied. */ 1077 /* MBMS-BMSC-SSM-IPv6-Address, OctetString, code 919, section 17.7.22 */ 1010 1078 { 1011 1079 struct dict_avp_data data = { … … 1063 1131 CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type); 1064 1132 CHECK_dict_new(DICT_AVP, &data, type, NULL); 1133 }; 1134 1135 /*==================================================================*/ 1136 /* 3GPP TS 29.061 Table 20.5a.1: SGmb specific AVPs */ 1137 /*==================================================================*/ 1138 1139 /* MBMS-Access-Indicator, Enumerated, code 923, section 20.5a.1 */ 1140 { 1141 struct dict_avp_data data = { 1142 923, /* Code */ 1143 10415, /* Vendor */ 1144 "MBMS-Access-Indicator", /* Name */ 1145 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1146 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flag values */ 1147 AVP_TYPE_INTEGER32 /* base type of data */ 1148 }; 1149 struct dict_object *type; 1150 struct dict_type_data tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/MBMS-Access-Indicator)", NULL, NULL, NULL }; 1151 CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type); 1152 CHECK_dict_new(DICT_AVP, &data, type, NULL); 1153 }; 1154 1155 /* MBMS-GW-SSM-IP-Address, OctetString, code 924, section 20.5a.2 */ 1156 { 1157 struct dict_avp_data data = { 1158 924, /* Code */ 1159 10415, /* Vendor */ 1160 "MBMS-GW-SSM-IP-Address", /* Name */ 1161 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1162 AVP_FLAG_VENDOR, /* Fixed flag values */ 1163 AVP_TYPE_OCTETSTRING /* base type of data */ 1164 }; 1165 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1166 }; 1167 1168 /* Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed */ 1169 /* MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address. */ 1170 /* This rename was not applied. */ 1171 /* MBMS-GW-SSM-IPv6-Address, OctetString, code 925, section 20.5a.3 */ 1172 { 1173 struct dict_avp_data data = { 1174 925, /* Code */ 1175 10415, /* Vendor */ 1176 "MBMS-GW-SSM-IPv6-Address", /* Name */ 1177 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1178 AVP_FLAG_VENDOR, /* Fixed flag values */ 1179 AVP_TYPE_OCTETSTRING /* base type of data */ 1180 }; 1181 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1182 }; 1183 1184 /* MBMS-BMSC-SSM-UDP-Port, OctetString, code 926, section 20.5a.4 */ 1185 { 1186 struct dict_avp_data data = { 1187 926, /* Code */ 1188 10415, /* Vendor */ 1189 "MBMS-BMSC-SSM-UDP-Port", /* Name */ 1190 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1191 AVP_FLAG_VENDOR, /* Fixed flag values */ 1192 AVP_TYPE_OCTETSTRING /* base type of data */ 1193 }; 1194 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1195 }; 1196 1197 /* MBMS-GW-UDP-Port, OctetString, code 927, section 20.5a.5 */ 1198 { 1199 struct dict_avp_data data = { 1200 927, /* Code */ 1201 10415, /* Vendor */ 1202 "MBMS-GW-UDP-Port", /* Name */ 1203 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1204 AVP_FLAG_VENDOR, /* Fixed flag values */ 1205 AVP_TYPE_OCTETSTRING /* base type of data */ 1206 }; 1207 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1208 }; 1209 1210 /* MBMS-GW-UDP-Port-Indicator, Enumerated, code 928, section 20.5a.6 */ 1211 { 1212 struct dict_avp_data data = { 1213 928, /* Code */ 1214 10415, /* Vendor */ 1215 "MBMS-GW-UDP-Port-Indicator", /* Name */ 1216 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1217 AVP_FLAG_VENDOR, /* Fixed flag values */ 1218 AVP_TYPE_INTEGER32 /* base type of data */ 1219 }; 1220 struct dict_object *type; 1221 struct dict_type_data tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/MBMS-GW-UDP-Port-Indicator)", NULL, NULL, NULL }; 1222 CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type); 1223 CHECK_dict_new(DICT_AVP, &data, type, NULL); 1224 }; 1225 1226 /* MBMS-Data-Transfer-Start, Unsigned64, code 929, section 20.5a.7 */ 1227 { 1228 struct dict_avp_data data = { 1229 929, /* Code */ 1230 10415, /* Vendor */ 1231 "MBMS-Data-Transfer-Start", /* Name */ 1232 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1233 AVP_FLAG_VENDOR, /* Fixed flag values */ 1234 AVP_TYPE_UNSIGNED64 /* base type of data */ 1235 }; 1236 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1237 }; 1238 1239 /* MBMS-Data-Transfer-Stop, Unsigned64, code 930, section 20.5a.8 */ 1240 { 1241 struct dict_avp_data data = { 1242 930, /* Code */ 1243 10415, /* Vendor */ 1244 "MBMS-Data-Transfer-Stop", /* Name */ 1245 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1246 AVP_FLAG_VENDOR, /* Fixed flag values */ 1247 AVP_TYPE_UNSIGNED64 /* base type of data */ 1248 }; 1249 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1250 }; 1251 1252 /* MBMS-Flag, Unsigned32, code 931, section 20.5a.9 */ 1253 { 1254 struct dict_avp_data data = { 1255 931, /* Code */ 1256 10415, /* Vendor */ 1257 "MBMS-Flag", /* Name */ 1258 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1259 AVP_FLAG_VENDOR, /* Fixed flag values */ 1260 AVP_TYPE_UNSIGNED32 /* base type of data */ 1261 }; 1262 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1263 }; 1264 1265 /* Restart-Counter, Unsigned32, code 932, section 20.5a.10 */ 1266 { 1267 struct dict_avp_data data = { 1268 932, /* Code */ 1269 10415, /* Vendor */ 1270 "Restart-Counter", /* Name */ 1271 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1272 AVP_FLAG_VENDOR, /* Fixed flag values */ 1273 AVP_TYPE_UNSIGNED32 /* base type of data */ 1274 }; 1275 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1276 }; 1277 1278 /* Diagnostic-Info, Unsigned32, code 933, section 20.5a.11 */ 1279 { 1280 struct dict_avp_data data = { 1281 933, /* Code */ 1282 10415, /* Vendor */ 1283 "Diagnostic-Info", /* Name */ 1284 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1285 AVP_FLAG_VENDOR, /* Fixed flag values */ 1286 AVP_TYPE_UNSIGNED32 /* base type of data */ 1287 }; 1288 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1289 }; 1290 1291 /* MBMS-Cell-List, OctetString, code 934, section 20.5a.12 */ 1292 { 1293 struct dict_avp_data data = { 1294 934, /* Code */ 1295 10415, /* Vendor */ 1296 "MBMS-Cell-List", /* Name */ 1297 AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY, /* Fixed flags */ 1298 AVP_FLAG_VENDOR, /* Fixed flag values */ 1299 AVP_TYPE_OCTETSTRING /* base type of data */ 1300 }; 1301 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 1065 1302 }; 1066 1303 … … 1640 1877 1641 1878 /* Note: Name conflict with 3GPP TS 32.299 Status (2702). */ 1879 /* Status (1116) renamed to Status-29.140 (1116). */ 1642 1880 /* Status-29.140, Grouped, code 1116, section 6.3.19 */ 1643 1881 { … … 4879 5117 /*==================================================================*/ 4880 5118 /* 3GPP TS 29.229 Table 6.3.1: Diameter Multimedia Application AVPs */ 5119 /* */ 5120 /* Note: AVPs referenced from other sources are not added here. */ 4881 5121 /*==================================================================*/ 4882 5122 … … 5381 5621 }; 5382 5622 5383 /* Note: Uses RFC 4590 Digest-Realm (104). */5384 /* Note: Uses RFC 4590 Digest-Algorithm (111). */5385 /* Note: Uses RFC 4590 Digest-QoP (110). */5386 /* Note: Uses RFC 4590 Digest-HA1 (121). */5387 5388 5623 /* UAR-Flags, Unsigned32, code 637, section 6.3.44 */ 5389 5624 { … … 5619 5854 }; 5620 5855 5621 /* Note: Uses RFC 7683 OC-Supported-Features (621). */5622 /* Note: Uses RFC 7683 OC-OLR (623). */5623 5624 5856 /* Initial-CSeq-Sequence-Number, Unsigned32, code 654, section 6.3.62 */ 5625 5857 { … … 5686 5918 CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL); 5687 5919 }; 5688 5689 /* Note: Uses RFC 7944 DRMP (301). */5690 /* Note: Uses RFC 8583 Load (650). */5691 5920 5692 5921 /* RTR-Flags, Unsigned32, code 659, section 6.3.69 */ … … 6699 6928 /* Note: 3GPP TS 29.272 V12.5.0 (2014-06) table 7.3.1/1 */ 6700 6929 /* changed row SS-Status (1477) to be OctetString instead of Grouped. */ 6701 /* Clause 7.3.88 already described SS-Status as OctetString.*/6930 /* Clause 7.3.88 already described SS-Status (1147) as OctetString. */ 6702 6931 /* SS-Status, OctetString, code 1477, section 7.3.88 */ 6703 6932 { … … 8421 8650 /*==================================================================*/ 8422 8651 /* 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs */ 8652 /* */ 8653 /* Note: AVPs referenced from other sources are not added here. */ 8423 8654 /*==================================================================*/ 8424 8655 … … 8450 8681 8451 8682 /* Note: Name conflict with 3GPP TS 29.229 User-Data (606). */ 8683 /* User-Data (702) renamed to User-Data-29.329 (702). */ 8452 8684 /* User-Data-29.329, OctetString, code 702, section 6.3.3 */ 8453 8685 { … … 8585 8817 }; 8586 8818 8587 /* Note: Uses 3GPP TS 29.229 Server-Name (602). */8588 /* Note: Uses 3GPP TS 29.229 Supported-Features (628). */8589 /* Note: Uses 3GPP TS 29.229 Feature-List-ID (629). */8590 /* Note: Uses 3GPP TS 29.229 Feature-List (630). */8591 /* Note: Uses 3GPP TS 29.229 Supported-Applications (631). */8592 /* Note: Uses 3GPP TS 29.229 Public-Identity (601). */8593 8594 8819 /* DSAI-Tag, OctetString, code 711, section 6.3.18 */ 8595 8820 { … … 8604 8829 CHECK_dict_new(DICT_AVP, &data, NULL, NULL); 8605 8830 }; 8606 8607 /* Note: Uses 3GPP TS 29.229 Wildcarded-Public-Identity (634). */8608 /* Note: Uses 3GPP TS 29.229 Wildcarded-IMPU (636). */8609 /* Note: Uses 3GPP TS 29.229 Session-Priority (650). */8610 8831 8611 8832 /* One-Time-Notification, Enumerated, code 712, section 6.3.22 */ … … 8840 9061 8841 9062 /* Note: Name conflict with 3GPP TS 29.212 3GPP-PS-Data-Off-Status (2847). */ 9063 /* 3GPP-PS-Data-Off-Status (4406) renamed to 3GPP-PS-Data-Off-Status-32.299 (4406). */ 8842 9064 /* 3GPP-PS-Data-Off-Status-32.299, Enumerated, code 4406 */ 8843 9065 { -
extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
r1485 r1486 4 4 @standard,3GPP TS 29.061,,,,,,, 5 5 #=,,,,,,,, 6 # 3GPP 29.061-c00 (12.0.0 2012.12.20),,,,,,,, 7 # 3GPP 29.061 is not very clear and self-inconsistent about M,,,,,,,, 8 "# for this reason, other sources are assumed more trustworthy",,,,,,,, 9 #=,,,,,,,, 10 #,,,,,,,, 11 # M inconsistently specified,,,,,,,, 12 3GPP-IMSI,1,16.4.7,UTF8String,"M,V",P,,, 13 # 29.061 says OctetString; dumps say UInt32; manually changed,,,,,,,, 14 # 29.061 says MUST NOT M; dumps say MUST,,,,,,,, 15 3GPP-Charging-Id,2,16.4.7,Unsigned32,"M,V",P,,, 16 # 29.061 says MUST NOT M; dumps say MUST,,,,,,,, 17 3GPP-PDP-Type,3,16.4.7,Enumerated,"M,V",P,,, 18 3GPP-CG-Address,4,16.4.7,OctetString,V,P,,M, 19 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 20 3GPP-GPRS-Negotiated-QoS-Profile,5,16.4.7,UTF8String,"M,V",P,,, 21 # M inconsistently specified; old contrib/3gg says MUST NOT,,,,,,,, 22 3GPP-SGSN-Address,6,16.4.7,OctetString,V,P,,M, 23 3GPP-GGSN-Address,7,16.4.7,OctetString,V,P,,M, 24 # 29.061 says MUST NOT M; dumps say MUST,,,,,,,, 25 3GPP-IMSI-MCC-MNC,8,16.4.7,UTF8String,"M,V",P,,, 26 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 27 3GPP-GGSN-MCC-MNC,9,16.4.7,UTF8String,"M,V",P,,, 28 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 29 3GPP-NSAPI,10,16.4.7,OctetString,"M,V",P,,, 30 "# added manually, missing in AVP table",,,,,,,, 6 # 3GPP TS 29.061 V15.5.0 (2018-12),,,,,,,, 7 # From 3GPP 29061-f50.doc,,,,,,,, 8 #=,,,,,,,, 9 #,,,,,,,, 10 #=,,,,,,,, 11 # 3GPP TS 29.061 Table 9a: Gi/Sgi specific AVPs,,,,,,,, 12 #,,,,,,,, 13 # Note: 3GPP TS 29.061 is unclear and inconsistent about M.,,,,,,,, 14 "# For this reason, other sources are assumed more trustworthy.",,,,,,,, 15 #=,,,,,,,, 16 #,,,,,,,, 17 # Note: 3GPP-IMSI (1) changed to Must M.,,,,,,,, 18 3GPP-IMSI,1,16.4.7,UTF8String,"M,V",P,,,Y 19 "# Note: 3GPP-Charging-Id (2) type changed from OctetString to Unsigned32,",,,,,,,, 20 # per 3GPP TS 29.061 clause 16.4.7.2/2 and packet dumps.,,,,,,,, 21 3GPP-Charging-Id,2,16.4.7,Unsigned32,"M,V",P,,,Y 22 # Note: 3GPP-PDP-Type (3) changed to Must M.,,,,,,,, 23 3GPP-PDP-Type,3,16.4.7,Enumerated,"M,V",P,,,Y 24 3GPP-CG-Address,4,16.4.7,OctetString,V,P,,M,Y 25 # Note: 3GPP-GPRS-Negotiated-QoS-Profile (5) changed to Must M per contrib/3gpp.,,,,,,,, 26 3GPP-GPRS-Negotiated-QoS-Profile,5,16.4.7,UTF8String,"M,V",P,,,Y 27 3GPP-SGSN-Address,6,16.4.7,OctetString,V,P,,M,Y 28 3GPP-GGSN-Address,7,16.4.7,OctetString,V,P,,M,Y 29 # Note: 3GPP-IMSI-MCC-MNC (8) changed to Must M per packet dumps.,,,,,,,, 30 3GPP-IMSI-MCC-MNC,8,16.4.7,UTF8String,"M,V",P,,,Y 31 # Note: 3GPP-GGSN-MCC-MNC (9) changed to Must M per contrib/3gpp.,,,,,,,, 32 3GPP-GGSN-MCC-MNC,9,16.4.7,UTF8String,"M,V",P,,,Y 33 # Note: 3GPP-NSAPI (10) changed to Must M per contrib/3gpp.,,,,,,,, 34 3GPP-NSAPI,10,16.4.7,OctetString,"M,V",P,,,Y 35 # Note: 3GPP TS 29.061 table 9a does not define,,,,,,,, 36 # 3GPP-Session-Stop-Indicator (11) even when it is referenced,,,,,,,, 37 # by other 3GPP Diameter AVPs including PS-Information (874).,,,,,,,, 31 38 3GPP-Session-Stop-Indicator,11,16.4.7,OctetString,V,P,,M, 32 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 33 3GPP-Selection-Mode,12,16.4.7,UTF8String,"M,V",P,,, 34 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 35 3GPP-Charging-Characteristics,13,16.4.7,UTF8String,"M,V",P,,, 36 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 37 3GPP-CG-IPv6-Address,14,16.4.7,OctetString,"M,V",P,,, 38 # M inconsistently specified,,,,,,,, 39 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 40 3GPP-SGSN-IPv6-Address,15,16.4.7,OctetString,"M,V",P,,, 41 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 42 3GPP-GGSN-IPv6-Address,16,16.4.7,OctetString,"M,V",P,,, 43 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 44 3GPP-IPv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,,, 45 # 29.061 says MUST NOT M; old contrib/3gpp says MUST,,,,,,,, 46 3GPP-SGSN-MCC-MNC,18,16.4.7,UTF8String,"M,V",P,,, 47 # M inconsistently specified,,,,,,,, 48 3GPP-IMEISV,20,16.4.7,OctetString,"M,V",P,,, 49 # M inconsistently specified,,,,,,,, 50 3GPP-RAT-Type,21,16.4.7,OctetString,"M,V",P,,, 51 # M inconsistently specified,,,,,,,, 52 3GPP-User-Location-Info,22,16.4.7,OctetString,"M,V",P,,, 53 # M inconsistently specified,,,,,,,, 54 3GPP-MS-TimeZone,23,16.4.7,OctetString,"M,V",P,,, 55 3GPP-CAMEL-Charging-Info,24,16.4.7,OctetString,V,P,,M, 56 3GPP-Packet-Filter,25,16.4.7,OctetString,V,P,,M, 57 3GPP-Negotiated-DSCP,26,16.4.7,OctetString,V,P,,M, 58 3GPP-Allocate-IP-Type,27,16.4.7,OctetString,V,P,,M, 39 # Note: 3GPP-Selection-Mode (12) changed to Must M per contrib/3gpp.,,,,,,,, 40 3GPP-Selection-Mode,12,16.4.7,UTF8String,"M,V",P,,,Y 41 # Note: 3GPP-Charging-Characteristics (13) changed to Must M per contrib/3gpp.,,,,,,,, 42 3GPP-Charging-Characteristics,13,16.4.7,UTF8String,"M,V",P,,,Y 43 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 44 # 3GPP-CG-IPv6-Address (14) to 3GPP-CG-Ipv6-Address.,,,,,,,, 45 # This rename was not applied.,,,,,,,, 46 # 3GPP-CG-IPv6-Address (14) changed to Must M per contrib/3gpp.,,,,,,,, 47 3GPP-CG-IPv6-Address,14,16.4.7,OctetString,"M,V",P,,,Y 48 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 49 # 3GPP-SGSN-IPv6-Address (15) to 3GPP-SGSN-Ipv6-Address.,,,,,,,, 50 # This rename was not applied.,,,,,,,, 51 # 3GPP-SGSN-IPv6-Address (15) changed to Must M per contrib/3gpp.,,,,,,,, 52 3GPP-SGSN-IPv6-Address,15,16.4.7,OctetString,"M,V",P,,,Y 53 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 54 # 3GPP-GGSN-IPv6-Address (16) to 3GPP-GGSN-Ipv6-Address.,,,,,,,, 55 # This rename was not applied.,,,,,,,, 56 # 3GPP-GGSN-IPv6-Address (16) changed to Must M per contrib/3gpp.,,,,,,,, 57 3GPP-GGSN-IPv6-Address,16,16.4.7,OctetString,"M,V",P,,,Y 58 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 59 # 3GPP-IPv6-DNS-Servers (17) to 3GPP-Ipv6-DNS-Servers.,,,,,,,, 60 # This rename was not applied.,,,,,,,, 61 # 3GPP-IPv6-DNS-Servers (17) changed to Must M per contrib/3gpp.,,,,,,,, 62 3GPP-IPv6-DNS-Servers,17,16.4.7,OctetString,"M,V",P,,,Y 63 # Note: 3GPP-SGSN-MCC-MNC (18) changed to Must M per contrib/3gpp.,,,,,,,, 64 3GPP-SGSN-MCC-MNC,18,16.4.7,UTF8String,"M,V",P,,,Y 65 # Note: 3GPP-IMEISV (20) changed to Must M.,,,,,,,, 66 3GPP-IMEISV,20,16.4.7,OctetString,"M,V",P,,,Y 67 # Note: 3GPP-RAT-Type (21) changed to Must M.,,,,,,,, 68 3GPP-RAT-Type,21,16.4.7,OctetString,"M,V",P,,,Y 69 # Note: 3GPP-User-Location-Info (22) changed to Must M.,,,,,,,, 70 3GPP-User-Location-Info,22,16.4.7,OctetString,"M,V",P,,,Y 71 # Note: 3GPP-MS-TimeZone (23) changed to Must M.,,,,,,,, 72 3GPP-MS-TimeZone,23,16.4.7,OctetString,"M,V",P,,,Y 73 3GPP-CAMEL-Charging-Info,24,16.4.7,OctetString,V,P,,M,Y 74 3GPP-Packet-Filter,25,16.4.7,OctetString,V,P,,M,Y 75 3GPP-Negotiated-DSCP,26,16.4.7,OctetString,V,P,,M,Y 76 3GPP-Allocate-IP-Type,27,16.4.7,OctetString,V,P,,M,Y 59 77 # Note: 3GPP TS 29.061 table 9a does not define,,,,,,,, 60 78 # External-Identifier (28) for Diameter.,,,,,,,, … … 65 83 # External-Identifier (3111) UTF8String.,,,,,,,, 66 84 #,,,,,,,, 67 TMGI,900,17.07.02,OctetString,"M,V",P,,, 68 Required-MBMS-Bearer-Capabilities,901,17.07.03,UTF8String,"M,V",P,,, 69 MBMS-StartStop-Indication,902,17.07.05,Enumerated,"M,V",P,,, 70 MBMS-Service-Area,903,17.07.06,OctetString,"M,V",P,,, 71 MBMS-Session-Duration,904,17.07.07,OctetString,"M,V",P,,, 72 Alternative-APN,905,17.07.08,UTF8String,"M,V",P,,, 73 MBMS-Service-Type,906,17.07.09,Enumerated,"M,V",P,,, 74 MBMS-2G-3G-Indicator,907,17.07.10,Enumerated,"M,V",P,,, 75 MBMS-Session-Identity,908,17.07.11,OctetString,"M,V",P,,, 76 RAI,909,17.07.12,UTF8String,"M,V",P,,, 77 Additional-MBMS-Trace-Info,910,17.07.13,OctetString,"M,V",P,,, 78 MBMS-Time-To-Data-Transfer,911,17.07.14,OctetString,"M,V",P,,, 79 MBMS-Session-Repetition-Number,912,17.07.15,OctetString,"M,V",P,,, 80 MBMS-Required-QoS,913,17.07.16,UTF8String,"M,V",P,,, 81 MBMS-Counting-Information,914,17.07.17,Enumerated,"M,V",P,,, 82 MBMS-User-Data-Mode-Indication,915,17.07.18,Enumerated,"M,V",P,,, 83 MBMS-GGSN-Address,916,17.07.19,OctetString,"M,V",P,,, 84 MBMS-GGSN-IPv6-Address,917,17.07.20,OctetString,"M,V",P,,, 85 MBMS-BMSC-SSM-IP-Address,918,17.07.21,OctetString,"M,V",P,,, 86 MBMS-BMSC-SSM-IPv6-Address,919,17.07.22,OctetString,"M,V",P,,, 87 MBMS-Flow-Identifier,920,17.7.23,OctetString,"M,V",P,,, 88 CN-IP-Multicast-Distribution,921,17.7.24,Enumerated,"M,V",P,,, 89 MBMS-HC-Indicator,922,17.7.25,Enumerated,"M,V",P,,, 85 #,,,,,,,, 86 TWAN-Identifier,29,16.4.7,OctetString,V,P,,M,Y 87 3GPP-User-Location-Info-Time,30,16.4.7,OctetString,V,P,,M,Y 88 3GPP-Secondary-RAT-Usage,31,16.4.7,OctetString,V,P,,M,Y 89 #=,,,,,,,, 90 # 3GPP TS 29.061 Table 10: Gmb specific AVPs,,,,,,,, 91 #=,,,,,,,, 92 #,,,,,,,, 93 TMGI,900,17.7.2,OctetString,"M,V",P,,,Y 94 Required-MBMS-Bearer-Capabilities,901,17.7.3,UTF8String,"M,V",P,,,Y 95 MBMS-StartStop-Indication,902,17.7.5,Enumerated,"M,V",P,,,Y 96 MBMS-Service-Area,903,17.7.6,OctetString,"M,V",P,,,Y 97 MBMS-Session-Duration,904,17.7.7,OctetString,"M,V",P,,,Y 98 Alternative-APN,905,17.7.8,UTF8String,"M,V",P,,,Y 99 MBMS-Service-Type,906,17.7.9,Enumerated,"M,V",P,,,Y 100 MBMS-2G-3G-Indicator,907,17.7.10,Enumerated,"M, V",P,,,Y 101 MBMS-Session-Identity,908,17.7.11,OctetString,"M,V",P,,,Y 102 RAI,909,17.7.12,UTF8String,"M, V",P,,,Y 103 Additional-MBMS-Trace-Info,910,17.7.13,OctetString,"M,V",P,,,Y 104 MBMS-Time-To-Data-Transfer,911,17.7.14,OctetString,"M,V",P,,,Y 105 MBMS-Session-Repetition-Number,912,17.7.15,OctetString,"M,V",P,,,Y 106 MBMS-Required-QoS,913,17.7.16,UTF8String,"M,V",P,,,Y 107 MBMS-Counting-Information,914,17.7.17,Enumerated,"M,V",P,,,Y 108 MBMS-User-Data-Mode-Indication,915,17.7.18,Enumerated,"M,V",P,,,Y 109 MBMS-GGSN-Address,916,17.7.19,OctetString,"M,V",P,,,Y 110 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 111 # MBMS-GGSN-IPv6-Address (917) to MBMS-GGSN-Ipv6-Address.,,,,,,,, 112 # This rename was not applied.,,,,,,,, 113 MBMS-GGSN-IPv6-Address,917,17.7.20,OctetString,"M,V",P,,,Y 114 MBMS-BMSC-SSM-IP-Address,918,17.7.21,OctetString,"M,V",P,,,Y 115 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 116 # MBMS-BMSC-SSM-IPv6-Address (919) to MBMS-BMSC-SSM-Ipv6-Address.,,,,,,,, 117 # This rename was not applied.,,,,,,,, 118 MBMS-BMSC-SSM-IPv6-Address,919,17.7.22,OctetString,"M,V",P,,,Y 119 MBMS-Flow-Identifier,920,17.7.23,OctetString,"M,V",P,,,Y 120 CN-IP-Multicast-Distribution,921,17.7.24,Enumerated,"M,V",P,,,Y 121 MBMS-HC-Indicator,922,17.7.25,Enumerated,"M,V",P,,,Y 122 ,,,,,,,, 123 #=,,,,,,,, 124 # 3GPP TS 29.061 Table 20.5a.1: SGmb specific AVPs,,,,,,,, 125 #=,,,,,,,, 126 #,,,,,,,, 127 MBMS-Access-Indicator,923,20.5a.1,Enumerated,"M,V",P,,,Y 128 MBMS-GW-SSM-IP-Address,924,20.5a.2,OctetString,V,P,,M,Y 129 # Note: 3GPP TS 29.061 V12.6.0 (2014-06) renamed,,,,,,,, 130 # MBMS-GW-SSM-IPv6-Address (925) to MBMS-GW-SSM-Ipv6-Address.,,,,,,,, 131 # This rename was not applied.,,,,,,,, 132 MBMS-GW-SSM-IPv6-Address,925,20.5a.3,OctetString,V,P,,M,Y 133 MBMS-BMSC-SSM-UDP-Port,926,20.5a.4,OctetString,V,P,,M,Y 134 MBMS-GW-UDP-Port,927,20.5a.5,OctetString,V,P,,M,Y 135 MBMS-GW-UDP-Port-Indicator,928,20.5a.6,Enumerated,V,P,,M,Y 136 MBMS-Data-Transfer-Start,929,20.5a.7,Unsigned64,V,P,,M,Y 137 MBMS-Data-Transfer-Stop,930,20.5a.8,Unsigned64,V,P,,M,Y 138 MBMS-Flag,931,20.5a.9,Unsigned32,V,P,,M,Y 139 Restart-Counter,932,20.5a.10,Unsigned32,V,P,,M,Y 140 Diagnostic-Info,933,20.5a.11,Unsigned32,V,P,,M,Y 141 MBMS-Cell-List,934,20.5a.12,OctetString,V,P,,M,Y 90 142 ,,,,,,,, 91 143 @standard,3GPP TS 29.129,,,,,,,
Note: See TracChangeset
for help on using the changeset viewer.
