Mercurial > hg > freeDiameter

comparison libfdcore/dict_base_proto.c @ 1318:2a5620128a9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove '*' from the couple enumerated values that had them. This was inconsistent and caused trouble with extensions that want to add enumerated values to existing enumerations.
author Thomas Klausner <tk@giga.or.at>
date Mon, 23 Jan 2017 15:26:25 +0100
parents 60e7b02a3ce7
children acc7262af8fa
comparison
equal deleted inserted replaced
1317:bb5dd52bb9b8 1318:2a5620128a9a
807 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one. 807 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
808 * This is the reason for the "*" in the type name 808 * This is the reason for the "*" in the type name
809 */ 809 */
810 810
811 struct dict_object * type; 811 struct dict_object * type;
812 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Inband-Security-Id)" , NULL, NULL, NULL }; 812 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Inband-Security-Id)" , NULL, NULL, NULL };
813 struct dict_enumval_data t_0 = { "NO_INBAND_SECURITY", { .u32 = ACV_ISI_NO_INBAND_SECURITY }}; 813 struct dict_enumval_data t_0 = { "NO_INBAND_SECURITY", { .u32 = ACV_ISI_NO_INBAND_SECURITY }};
814 struct dict_enumval_data t_1 = { "TLS", { .u32 = ACV_ISI_TLS }}; 814 struct dict_enumval_data t_1 = { "TLS", { .u32 = ACV_ISI_TLS }};
815 struct dict_avp_data data = { 815 struct dict_avp_data data = {
816 299, /* Code */ 816 299, /* Code */
817 #if AC_INBAND_SECURITY_ID != 299 817 #if AC_INBAND_SECURITY_ID != 299
1102 1102
1103 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one. 1103 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
1104 * This is the reason for the "*" in the type name 1104 * This is the reason for the "*" in the type name
1105 */ 1105 */
1106 struct dict_object * type; 1106 struct dict_object * type;
1107 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Result-Code)" , NULL, NULL, NULL }; 1107 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Result-Code)" , NULL, NULL, NULL };
1108 struct dict_avp_data data = { 1108 struct dict_avp_data data = {
1109 268, /* Code */ 1109 268, /* Code */
1110 #if AC_RESULT_CODE != 268 1110 #if AC_RESULT_CODE != 268
1111 #error "AC_RESULT_CODE definition mismatch" 1111 #error "AC_RESULT_CODE definition mismatch"
1112 #endif 1112 #endif
1628 */ 1628 */
1629 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one. 1629 /* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
1630 * This is the reason for the "*" in the type name. Vendors will have to define their values. 1630 * This is the reason for the "*" in the type name. Vendors will have to define their values.
1631 */ 1631 */
1632 struct dict_object * type; 1632 struct dict_object * type;
1633 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Experimental-Result-Code)" , NULL, NULL, NULL }; 1633 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Experimental-Result-Code)" , NULL, NULL, NULL };
1634 struct dict_avp_data data = { 1634 struct dict_avp_data data = {
1635 298, /* Code */ 1635 298, /* Code */
1636 0, /* Vendor */ 1636 0, /* Vendor */
1637 "Experimental-Result-Code", /* Name */ 1637 "Experimental-Result-Code", /* Name */
1638 AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */ 1638 AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
2099 * The actual values of the AVP will not always be defined here, but at least it can be used in some cases. 2099 * The actual values of the AVP will not always be defined here, but at least it can be used in some cases.
2100 * ... maybe the code will be changed later to support bitfields AVP ... 2100 * ... maybe the code will be changed later to support bitfields AVP ...
2101 */ 2101 */
2102 2102
2103 struct dict_object * type; 2103 struct dict_object * type;
2104 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Session-Binding)" , NULL, NULL, NULL }; 2104 struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Session-Binding)" , NULL, NULL, NULL };
2105 struct dict_enumval_data t_1 = { "RE_AUTH", { .u32 = 1 }}; 2105 struct dict_enumval_data t_1 = { "RE_AUTH", { .u32 = 1 }};
2106 struct dict_enumval_data t_2 = { "STR", { .u32 = 2 }}; 2106 struct dict_enumval_data t_2 = { "STR", { .u32 = 2 }};
2107 struct dict_enumval_data t_4 = { "ACCOUNTING", { .u32 = 4 }}; 2107 struct dict_enumval_data t_4 = { "ACCOUNTING", { .u32 = 4 }};
2108 struct dict_avp_data data = { 2108 struct dict_avp_data data = {
2109 270, /* Code */ 2109 270, /* Code */
"Welcome to our mercurial repository"