Mercurial > hg > freeDiameter
changeset 1317:bb5dd52bb9b8
extensions/dict_legacy_xml: enumerated has base type integer32
Not unsigned32.
| author | Thomas Klausner <tk@giga.or.at> |
|---|---|
| date | Mon, 23 Jan 2017 15:14:46 +0100 |
| parents | a04bea4d1aa6 |
| children | 2a5620128a9a |
| files | extensions/dict_legacy_xml/dict_lxml_xml.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/dict_legacy_xml/dict_lxml_xml.c Mon Sep 19 00:24:15 2016 +0900 +++ b/extensions/dict_legacy_xml/dict_lxml_xml.c Mon Jan 23 15:14:46 2017 +0100 @@ -1313,7 +1313,7 @@ PREDEF_TYPES( "Integer32", AVP_TYPE_INTEGER32 ); PREDEF_TYPES( "Integer64", AVP_TYPE_INTEGER64 ); PREDEF_TYPES( "Unsigned32", AVP_TYPE_UNSIGNED32 ); - PREDEF_TYPES( "Enumerated", AVP_TYPE_UNSIGNED32 ); + PREDEF_TYPES( "Enumerated", AVP_TYPE_INTEGER32 ); PREDEF_TYPES( "Unsigned64", AVP_TYPE_UNSIGNED64 ); PREDEF_TYPES( "Float32", AVP_TYPE_FLOAT32 ); PREDEF_TYPES( "Float64", AVP_TYPE_FLOAT64 ); @@ -1453,8 +1453,8 @@ /* special exception: we use per-AVP enumerated types in fD */ if (!strcasecmp("Enumerated", (char *)((struct t_avptype *)a->type.next)->type_name)) goto enumerated; - /* Let's allow "Unsigned32" instead of "Enumerated" also... */ - if ((!FD_IS_LIST_EMPTY(&a->enums)) && (!strcasecmp("Unsigned32", (char *)((struct t_avptype *)a->type.next)->type_name))) + /* Let's allow "Integer32" instead of "Enumerated" also... */ + if ((!FD_IS_LIST_EMPTY(&a->enums)) && (!strcasecmp("Integer32", (char *)((struct t_avptype *)a->type.next)->type_name))) goto enumerated; /* The type was explicitly specified, resolve it */ @@ -1481,13 +1481,13 @@ enumerated: snprintf(typename, sizeof(typename), "Enumerated*(%s)", ad.avp_name); memset(&tdata, 0, sizeof(tdata)); - tdata.type_base = AVP_TYPE_UNSIGNED32; + tdata.type_base = AVP_TYPE_INTEGER32; tdata.type_name = &typename[0]; CHECK_FCT( fd_dict_new ( fD_dict, DICT_TYPE, &tdata, fd_appl, &type ) ); if (nb_added) *nb_added += 1; - ad.avp_basetype = AVP_TYPE_UNSIGNED32; + ad.avp_basetype = AVP_TYPE_INTEGER32; } } }