Changeset 1457:da5e5b9c9623 in freeDiameter

Timestamp:

Feb 28, 2020, 9:05:24 AM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

dbg_dict_dump_json: fix ERROR warnings in log

fd_dict_search(TYPE_OF_AVP) matches NULL when the AVP is not derived,
so don't call fd_dict_getval() in that case.
Fixes the ERROR logs from dbg_dict_dump_json.

File:

• extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc (modified) (2 diffs)

extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc

@@ -33 +33 @@
 /*
  * Dump Diameter dictionary to JSON file.
- *
- * TODO: find out reason for many warnings in log
  */
 
@@ -162 +160 @@
         char flags[10];
 
-        fd_dict_search(fd_g_config->cnf_dict, DICT_TYPE, TYPE_OF_AVP, self, &type, ENOENT);
-        if (fd_dict_getval(type, &type_data) != 0) {
+        if (fd_dict_search(fd_g_config->cnf_dict, DICT_TYPE, TYPE_OF_AVP, self, &type, 0) != 0) {
+                /* TODO: fd_dict_search error */
+                return;
+        }
+
+        if ((type == NULL) || (fd_dict_getval(type, &type_data) != 0)) {
                 avp["Type"] = Json::Value(type_base_name[data->avp_basetype]);
         } else {