rework runtime state tracking

[project/firewall3.git] / utils.h

diff --git a/utils.h b/utils.h
index 590895a..f157daf 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -63,7 +63,7 @@ fw3_free_list(struct list_head *list)
 }
 
 #define fw3_is_family(p, f)                                                \
-       (!p || p->family == FW3_FAMILY_ANY || p->family == f)
+       (!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
 
 const char * fw3_find_command(const char *cmd);
 
@@ -87,16 +87,9 @@ 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);
 
 #endif