add debug flag to monitor fw3_pr() calls, set policies to drop during reload

[project/firewall3.git] / utils.c

diff --git a/utils.c b/utils.c
index f01ba73..1b9d672 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -27,6 +27,9 @@ static int lock_fd = -1;
 static pid_t pipe_pid = -1;
 static FILE *pipe_fd = NULL;
 
+bool fw3_pr_debug = false;
+
+
 static void
 warn_elem_section_name(struct uci_section *s, bool find_name)
 {
@@ -250,10 +253,18 @@ __fw3_command_pipe(bool silent, const char *command, ...)
 void
 fw3_pr(const char *fmt, ...)
 {
-    va_list args;
-    va_start(args, fmt);
-    vfprintf(pipe_fd, fmt, args);
-    va_end(args);
+       va_list args;
+
+       if (fw3_pr_debug && pipe_fd != stdout)
+       {
+               va_start(args, fmt);
+               vfprintf(stderr, fmt, args);
+               va_end(args);
+       }
+
+       va_start(args, fmt);
+       vfprintf(pipe_fd, fmt, args);
+       va_end(args);
 }
 
 void
@@ -488,10 +499,20 @@ void
 fw3_free_object(void *obj, const void *opts)
 {
        const struct fw3_option *ol;
+       struct list_head *list, *cur, *tmp;
 
        for (ol = opts; ol->name; ol++)
-               if (ol->elem_size)
-                       fw3_free_list((struct list_head *)((char *)obj + ol->offset));
+       {
+               if (!ol->elem_size)
+                       continue;
+
+               list = (struct list_head *)((char *)obj + ol->offset);
+               list_for_each_safe(cur, tmp, list)
+               {
+                       list_del(cur);
+                       free(cur);
+               }
+       }
 
        free(obj);
 }