Changeset 1458:c25dea477d6a in freeDiameter for extensions

Timestamp:

Feb 28, 2020, 9:22:07 AM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

dbg_dict_dump: dump to conffile if provided

If conffile is provided, write to that file instead of the log.
Inspired by similar behaviour of dbg_dict_dump_json.

File:

• extensions/dbg_dict_dump/dbg_dict_dump.c (modified) (2 diffs)

extensions/dbg_dict_dump/dbg_dict_dump.c

@@ -34 +34 @@
 *********************************************************************************************************/
 
-/* This extension logs a dump of the global dictionary */
+/*
+ * Dump Diameter dictionary (using fd_dict_dump()) to a file or the log.
+ *
+ * If conffile is provided, write the dump to that file,
+ * otherwise write to log.
+ */
 
 #include <freeDiameter/extension.h>
@@ -42 +47 @@
         TRACE_ENTRY("%p", conffile);
 
+        FILE * out = NULL;
+        if (conffile) {
+                LOG_N("Dictionary dump to file '%s'", conffile);
+                out = fopen(conffile, "w");
+                if (NULL == out) {
+                        LOG_E("Cannot open output file '%s' for writing", conffile);
+                        return EINVAL;
+                }
+        } else {
+                LOG_N("Dictionary dump to log");
+        }
+
         char * tbuf = NULL; size_t tbuflen = 0;
-        LOG_N("Dumping dictionary information");
-        LOG_N("%s", fd_dict_dump(&tbuf, &tbuflen, NULL, fd_g_config->cnf_dict));
+        if (NULL == fd_dict_dump(&tbuf, &tbuflen, NULL, fd_g_config->cnf_dict)) {
+                LOG_E("Cannot dump dictionary");
+        } else if (out) {
+                fprintf(out, "%s\n", tbuf);
+        } else {
+                LOG_N("%s", fd_dict_dump(&tbuf, &tbuflen, NULL, fd_g_config->cnf_dict));
+        }
         free(tbuf);
+        if (out) {
+                fclose(out);
+                out = NULL;
+        }
 
-        LOG_N("Dictionary dumped");
-
+        LOG_N("Dictionary dump completed");
         return 0;
 }