# HG changeset patch # User Thomas Klausner # Date 1485181585 -3600 # Node ID 2a5620128a9a1a3edbc07db8cf405ae6b1b0ed3d # Parent bb5dd52bb9b8de6707e6df80cfbb672229bdca87 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. diff -r bb5dd52bb9b8 -r 2a5620128a9a extensions/dict_dcca/dict_dcca.c --- a/extensions/dict_dcca/dict_dcca.c Mon Jan 23 15:14:46 2017 +0100 +++ b/extensions/dict_dcca/dict_dcca.c Mon Jan 23 15:26:25 2017 +0100 @@ -79,7 +79,7 @@ /* Result codes */ { struct dict_object *ResultCodeType; - CHECK_dict_search(DICT_TYPE, TYPE_BY_NAME, "Enumerated*(Result-Code)", &ResultCodeType); + CHECK_dict_search(DICT_TYPE, TYPE_BY_NAME, "Enumerated(Result-Code)", &ResultCodeType); { struct dict_enumval_data error_code = {"END_USER_SERVICE_DENIED", diff -r bb5dd52bb9b8 -r 2a5620128a9a extensions/dict_legacy_xml/dict_lxml_xml.c --- a/extensions/dict_legacy_xml/dict_lxml_xml.c Mon Jan 23 15:14:46 2017 +0100 +++ b/extensions/dict_legacy_xml/dict_lxml_xml.c Mon Jan 23 15:26:25 2017 +0100 @@ -1479,7 +1479,7 @@ struct dict_type_data tdata; enumerated: - snprintf(typename, sizeof(typename), "Enumerated*(%s)", ad.avp_name); + snprintf(typename, sizeof(typename), "Enumerated(%s)", ad.avp_name); memset(&tdata, 0, sizeof(tdata)); tdata.type_base = AVP_TYPE_INTEGER32; tdata.type_name = &typename[0]; diff -r bb5dd52bb9b8 -r 2a5620128a9a extensions/dict_nasreq/dict_nasreq.c --- a/extensions/dict_nasreq/dict_nasreq.c Mon Jan 23 15:14:46 2017 +0100 +++ b/extensions/dict_nasreq/dict_nasreq.c Mon Jan 23 15:26:25 2017 +0100 @@ -467,7 +467,7 @@ */ struct dict_object *type; - struct dict_type_data tdata = { AVP_TYPE_OCTETSTRING, "Enumerated*(Originating-Line-Info)" , NULL, NULL}; + struct dict_type_data tdata = { AVP_TYPE_OCTETSTRING, "Enumerated(Originating-Line-Info)" , NULL, NULL}; struct dict_enumval_data tvals[] = { enumval_def_os( 2, "00", "Plain Old Telephone Service (POTS)"), enumval_def_os( 2, "01", "Multiparty Line (more than 2)"), diff -r bb5dd52bb9b8 -r 2a5620128a9a extensions/dict_sip/dict_sip.c --- a/extensions/dict_sip/dict_sip.c Mon Jan 23 15:14:46 2017 +0100 +++ b/extensions/dict_sip/dict_sip.c Mon Jan 23 15:26:25 2017 +0100 @@ -1438,7 +1438,7 @@ /* Complement of Result-Code AVP values */ { struct dict_object * resultcode_data_type; - CHECK_dict_search(DICT_TYPE,TYPE_BY_NAME,"Enumerated*(Result-Code)",&resultcode_data_type); + CHECK_dict_search(DICT_TYPE,TYPE_BY_NAME,"Enumerated(Result-Code)",&resultcode_data_type); { diff -r bb5dd52bb9b8 -r 2a5620128a9a libfdcore/dict_base_proto.c --- a/libfdcore/dict_base_proto.c Mon Jan 23 15:14:46 2017 +0100 +++ b/libfdcore/dict_base_proto.c Mon Jan 23 15:26:25 2017 +0100 @@ -809,7 +809,7 @@ */ struct dict_object * type; - struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Inband-Security-Id)" , NULL, NULL, NULL }; + struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Inband-Security-Id)" , NULL, NULL, NULL }; struct dict_enumval_data t_0 = { "NO_INBAND_SECURITY", { .u32 = ACV_ISI_NO_INBAND_SECURITY }}; struct dict_enumval_data t_1 = { "TLS", { .u32 = ACV_ISI_TLS }}; struct dict_avp_data data = { @@ -1104,7 +1104,7 @@ * This is the reason for the "*" in the type name */ struct dict_object * type; - struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Result-Code)" , NULL, NULL, NULL }; + struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Result-Code)" , NULL, NULL, NULL }; struct dict_avp_data data = { 268, /* Code */ #if AC_RESULT_CODE != 268 @@ -1630,7 +1630,7 @@ * This is the reason for the "*" in the type name. Vendors will have to define their values. */ struct dict_object * type; - struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Experimental-Result-Code)" , NULL, NULL, NULL }; + struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Experimental-Result-Code)" , NULL, NULL, NULL }; struct dict_avp_data data = { 298, /* Code */ 0, /* Vendor */ @@ -2101,7 +2101,7 @@ */ struct dict_object * type; - struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated*(Session-Binding)" , NULL, NULL, NULL }; + struct dict_type_data tdata = { AVP_TYPE_UNSIGNED32, "Enumerated(Session-Binding)" , NULL, NULL, NULL }; struct dict_enumval_data t_1 = { "RE_AUTH", { .u32 = 1 }}; struct dict_enumval_data t_2 = { "STR", { .u32 = 2 }}; struct dict_enumval_data t_4 = { "ACCOUNTING", { .u32 = 4 }};