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

diff --git a/ipsets.h b/ipsets.h
index 49c6e66..47579b8 100644
--- a/ipsets.h
+++ b/ipsets.h
@@ -19,32 +19,51 @@
 #ifndef __FW3_IPSETS_H
 #define __FW3_IPSETS_H
 
+#include <linux/netfilter/ipset/ip_set.h>
+
 #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);
+
+struct fw3_ipset * fw3_lookup_ipset(struct fw3_state *state, const char *name);
 
-void fw3_destroy_ipsets(struct list_head *statefile);
+bool fw3_check_ipset(struct fw3_ipset *set);
 
-void fw3_free_ipset(struct fw3_ipset *ipset);
+#define fw3_free_ipset(ipset) \
+	fw3_free_object(ipset, fw3_ipset_opts)
 
-struct fw3_ipset * fw3_lookup_ipset(struct fw3_state *state, const char *name);
+
+#ifndef SO_IP_SET
+
+#define SO_IP_SET           83
+#define IPSET_MAXNAMELEN    32
+#define IPSET_INVALID_ID    65535
+
+union ip_set_name_index {
+    char name[IPSET_MAXNAMELEN];
+    uint16_t index;
+};
+
+#define IP_SET_OP_GET_BYNAME    0x00000006
+struct ip_set_req_get_set {
+    uint32_t op;
+    uint32_t version;
+    union ip_set_name_index set;
+};
+
+#define IP_SET_OP_VERSION       0x00000100
+struct ip_set_req_version {
+    uint32_t op;
+    uint32_t version;
+};
+
+#endif /* SO_IP_SET */
 
 #endif