X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ipsets.h;h=186a4171b1bd4e1f4d791f491c906388d49db544;hp=410c712f117fa9ae41b555f005886bd9901c448f;hb=ff9d5e13c9150c62fe698e4bc5541e6f92b241d0;hpb=275a37dbf280bd471ebb2c673267c49a81071bbb;ds=sidebyside

diff --git a/ipsets.h b/ipsets.h
index 410c712..186a417 100644
--- a/ipsets.h
+++ b/ipsets.h
@@ -22,30 +22,17 @@
 #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 fw3_state *state);
-
-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,
                                     bool running);
 
+#define fw3_free_ipset(ipset) \
+	fw3_free_object(ipset, fw3_ipset_opts)
+
 #endif