#include <uci.h>
-#define FW3_STATEFILE "/var/run/fw3.lock"
+#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, ...);
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)); \
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)
+ (!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
+
+#define fw3_no_family(p) \
+ (!p || !((p)->flags & ((1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6))))
const char * fw3_find_command(const char *cmd);
bool fw3_has_table(bool ipv6, const char *table);
-bool fw3_check_statefile(bool test_exists);
-void fw3_remove_statefile(void);
-void fw3_close_statefile(void);
+bool fw3_lock(void);
+void fw3_unlock(void);
+
+
+enum fw3_statefile_type
+{
+ FW3_TYPE_DEFAULTS = 0,
+ FW3_TYPE_ZONE = 1,
+ FW3_TYPE_IPSET = 2,
+};
+
+bool fw3_read_statefile(void *state);
+void fw3_write_statefile(void *state);
+
+void fw3_set_running(void *object, struct list_head *dest);
+
+void fw3_free_object(void *obj, const void *opts);
#endif