X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.h;h=834d97932b1c240e1fafc24c988f0d8ff091e981;hp=eee1f40b81915f56c73350e4e4aee528c6abbe35;hb=c03e20d7f594058ff223f30cf34de1b5e8210b8d;hpb=6da847c446c29c349b0edd757c1afd529565c619

diff --git a/utils.h b/utils.h
index eee1f40..834d979 100644
--- a/utils.h
+++ b/utils.h
@@ -28,6 +28,8 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <ifaddrs.h>
 
 #include <libubox/list.h>
 #include <uci.h>
@@ -69,6 +71,9 @@ void info(const char *format, ...);
                 (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);
@@ -84,32 +89,18 @@ bool fw3_lock(void);
 void fw3_unlock(void);
 
 
-enum fw3_statefile_type
-{
-	FW3_TYPE_DEFAULTS = 0,
-	FW3_TYPE_ZONE     = 1,
-	FW3_TYPE_NETWORK  = 2,
-	FW3_TYPE_IPSET    = 3,
-};
-
-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);
 
-struct fw3_rule_spec {
-	int family;
-	int table;
-	int flag;
-	const char *format;
-};
+bool fw3_hotplug(bool add, void *zone, void *device);
 
-bool fw3_pr_rulespec(int table, int family, uint32_t *flags, uint32_t mask,
-                     const struct fw3_rule_spec *r, const char *fmt, ...);
+int fw3_netmask2bitlen(int family, void *mask);
 
-bool fw3_hotplug(bool add, void *zone, void *device);
+bool fw3_bitlen2netmask(int family, int bits, void *mask);
+
+void fw3_flush_conntrack(void *zone);
 
 #endif