rework runtime state tracking

[project/firewall3.git] / utils.h

diff --git a/utils.h b/utils.h
index 2178b5a..f157daf 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -40,6 +40,10 @@ void warn(const char *format, ...);
 void error(const char *format, ...);
 void info(const char *format, ...);
 
 void error(const char *format, ...);
 void info(const char *format, ...);
 

+#define setbit(field, flag) field |= (1 << (flag))
+#define delbit(field, flag) field &= ~(1 << (flag))
+#define hasbit(field, flag) (field & (1 << (flag)))
+

 #define fw3_foreach(p, h)                                                  \
        for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \
          list_empty(h) ? (p == NULL) : (&p->list != (h));                  \
 #define fw3_foreach(p, h)                                                  \
        for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \
          list_empty(h) ? (p == NULL) : (&p->list != (h));                  \


@@ -59,7 +63,7 @@ fw3_free_list(struct list_head *list)
 }
 
 #define fw3_is_family(p, f)                                                \
 }
 
 #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);
 
 
 const char * fw3_find_command(const char *cmd);
 


@@ -75,10 +79,6 @@ bool fw3_has_table(bool ipv6, const char *table);
 bool fw3_lock(void);
 void fw3_unlock(void);
 
 bool fw3_lock(void);
 void fw3_unlock(void);
 

-bool fw3_has_state(void);
-void fw3_write_state(void *state);
-void fw3_remove_state(void);
-

 
 enum fw3_statefile_type
 {
 
 enum fw3_statefile_type
 {


@@ -87,15 +87,9 @@ enum fw3_statefile_type
        FW3_TYPE_IPSET    = 2,
 };
 
        FW3_TYPE_IPSET    = 2,
 };
 

-struct fw3_statefile_entry
-{
-       struct list_head list;
-       enum fw3_statefile_type type;
-       const char *name;
-       uint32_t flags[2];
-};
+bool fw3_read_statefile(void *state);
+void fw3_write_statefile(void *state);

 
 

-struct list_head * fw3_read_state(void);
-void fw3_free_state(struct list_head *statefile);
+void fw3_set_running(void *object, struct list_head *dest);

 
 #endif
 
 #endif