X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ipsets.h;h=debe0e88962f6748ffc617b96808f1646d61b709;hp=5ad6d998146dcac4353acb22855868f704d19e3b;hb=83ff4b94b044086d80b1e189e5601274bd5b4852;hpb=8fee8f9c520c58d07772cc6bd8f65d9eb1776a56

diff --git a/ipsets.h b/ipsets.h
index 5ad6d99..debe0e8 100644
--- a/ipsets.h
+++ b/ipsets.h
@@ -22,28 +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);
+struct fw3_ipset * fw3_lookup_ipset(struct fw3_state *state, const char *name,
+                                    bool running);
 
-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