Remove src_flags and running_src_flags from fw3_zone struct, rename dst_flags and...

[project/firewall3.git] / utils.h

diff --git a/utils.h b/utils.h
index 5cadd58..43f30f4 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -35,6 +35,8 @@
 #define FW3_STATEFILE  "/var/run/fw3.state"
 #define FW3_LOCKFILE   "/var/run/fw3.lock"
 
+extern bool fw3_pr_debug;
+
 void warn_elem(struct uci_element *e, const char *format, ...);
 void warn(const char *format, ...);
 void error(const char *format, ...);
@@ -50,18 +52,6 @@ void info(const char *format, ...);
             p = list_empty(h) ? list_first_entry(h, typeof(*p), list)         \
                            : list_entry(p->list.next, typeof(*p), list))
 
-static inline void
-fw3_free_list(struct list_head *list)
-{
-       struct list_head *cur, *tmp;
-
-       list_for_each_safe(cur, tmp, list)
-       {
-               list_del(cur);
-               free(cur);
-       }
-}
-
 #define fw3_is_family(p, f)                                                \
        (!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
 
@@ -87,16 +77,11 @@ enum fw3_statefile_type
        FW3_TYPE_IPSET    = 2,
 };
 
-struct fw3_statefile_entry
-{
-       struct list_head list;
-       enum fw3_statefile_type type;
-       char *name;
-       uint32_t flags[2];
-};
-
-struct list_head * fw3_read_statefile(void);
+bool fw3_read_statefile(void *state);
 void fw3_write_statefile(void *state);
-void fw3_free_statefile(struct list_head *statefile);
+
+void fw3_set_running(void *object, struct list_head *dest);
+
+void fw3_free_object(void *obj, const void *opts);
 
 #endif