X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.h;h=eee1f40b81915f56c73350e4e4aee528c6abbe35;hp=2178b5a9a1fdc74c42ad8bb823af29cf7fbfb020;hb=ff9d5e13c9150c62fe698e4bc5541e6f92b241d0;hpb=ea1e5c25c1c4c8c82b51c0440d033944ccb4e2e2

diff --git a/utils.h b/utils.h
index 2178b5a..eee1f40 100644
--- a/utils.h
+++ b/utils.h
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
@@ -34,32 +35,39 @@
 
 #define FW3_STATEFILE	"/var/run/fw3.state"
 #define FW3_LOCKFILE	"/var/run/fw3.lock"
+#define FW3_HOTPLUG     "/sbin/hotplug-call"
+
+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 set(field, family, flag) setbit(field[family == FW3_FAMILY_V6], flag)
+#define del(field, family, flag) delbit(field[family == FW3_FAMILY_V6], flag)
+#define has(field, family, flag) hasbit(field[family == FW3_FAMILY_V6], 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;
+#define fw3_is_family(p, f)                                                \
+	(!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
 
-	list_for_each_safe(cur, tmp, list)
-	{
-		list_del(cur);
-		free(cur);
-	}
-}
+#define fw3_no_family(flags)                                               \
+	(!(flags & ((1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6))))
+
+#define fw3_no_table(flags)                                                \
+    (!(flags & ((1<<FW3_TABLE_FILTER)|(1<<FW3_TABLE_NAT)|                  \
+                (1<<FW3_TABLE_MANGLE)|(1<<FW3_TABLE_RAW))))
 
-#define fw3_is_family(p, f)                                                \
-	(!p || p->family == FW3_FAMILY_ANY || p->family == f)
 
 const char * fw3_find_command(const char *cmd);
 
@@ -75,27 +83,33 @@ bool fw3_has_table(bool ipv6, const char *table);
 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
 {
 	FW3_TYPE_DEFAULTS = 0,
 	FW3_TYPE_ZONE     = 1,
-	FW3_TYPE_IPSET    = 2,
+	FW3_TYPE_NETWORK  = 2,
+	FW3_TYPE_IPSET    = 3,
 };
 
-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);
+
+void fw3_set_running(void *object, struct list_head *dest);
+
+void fw3_free_object(void *obj, const void *opts);
+
+
+struct fw3_rule_spec {
+	int family;
+	int table;
+	int flag;
+	const char *format;
 };
 
-struct list_head * fw3_read_state(void);
-void fw3_free_state(struct list_head *statefile);
+bool fw3_pr_rulespec(int table, int family, uint32_t *flags, uint32_t mask,
+                     const struct fw3_rule_spec *r, const char *fmt, ...);
+
+bool fw3_hotplug(bool add, void *zone, void *device);
 
 #endif