X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils.h;h=d2e1aa68e8eacc9b8d196b83d89a55a102e6c9bd;hb=91953d6a6e90df988f442f53097bd208784a295d;hp=43f30f46480de0a8ab546b98798813fdeed47c8f;hpb=8eb517c56988da4c5a4c755672ae8f99e97bb4b2;p=project%2Ffirewall3.git

diff --git a/utils.h b/utils.h
index 43f30f4..d2e1aa6 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,6 +35,7 @@
 
 #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;
 
@@ -46,6 +48,10 @@ void info(const char *format, ...);
 #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));                  \
@@ -55,6 +61,17 @@ void info(const char *format, ...);
 #define fw3_is_family(p, f)                                                \
 	(!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
 
+#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))))
+
+
+void * fw3_alloc(size_t size);
+char * fw3_strdup(const char *s);
+
 const char * fw3_find_command(const char *cmd);
 
 bool fw3_stdout_pipe(void);
@@ -70,18 +87,16 @@ 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);
 
+void fw3_free_list(struct list_head *head);
+
+bool fw3_hotplug(bool add, void *zone, void *device);
+
+int fw3_netmask2bitlen(int family, void *mask);
+
+bool fw3_bitlen2netmask(int family, int bits, void *mask);
+
 #endif