X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ipsets.h;h=cbab741d4dadc1b0c87b66e7da3b5cbee80453c4;hp=49c6e669eda1a2650839c0201b45d784dc6ef0a3;hb=a1cf3074e2eae780226c79477e895479ba6e29f2;hpb=ea1e5c25c1c4c8c82b51c0440d033944ccb4e2e2

diff --git a/ipsets.h b/ipsets.h
index 49c6e66..cbab741 100644
--- a/ipsets.h
+++ b/ipsets.h
@@ -22,29 +22,16 @@
 #include "options.h"
 #include "utils.h"
 
-enum fw3_ipset_opts {
-	FW3_IPSET_OPT_IPRANGE   = (1 << 0),
-	FW3_IPSET_OPT_PORTRANGE = (1 << 1),
-	FW3_IPSET_OPT_NETMASK   = (1 << 2),
-	FW3_IPSET_OPT_HASHSIZE  = (1 << 3),
-	FW3_IPSET_OPT_MAXELEM   = (1 << 4),
-	FW3_IPSET_OPT_FAMILY    = (1 << 5),
-};
-
-struct fw3_ipset_settype {
-	enum fw3_ipset_method method;
-	uint32_t types;
-	uint8_t required;
-	uint8_t optional;
-};
+extern const struct fw3_option fw3_ipset_opts[];
 
+struct fw3_ipset * fw3_alloc_ipset(void);
 void fw3_load_ipsets(struct fw3_state *state, struct uci_package *p);
 void fw3_create_ipsets(struct fw3_state *state);
-
-void fw3_destroy_ipsets(struct list_head *statefile);
-
-void fw3_free_ipset(struct fw3_ipset *ipset);
+void fw3_destroy_ipsets(struct fw3_state *state, enum fw3_family family);
 
 struct fw3_ipset * fw3_lookup_ipset(struct fw3_state *state, const char *name);
 
+#define fw3_free_ipset(ipset) \
+	fw3_free_object(ipset, fw3_ipset_opts)
+
 #endif