X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=options.h;h=c4d94d260297239cc398040334af8d79d256f889;hb=54c0625e83a5ddf77e1753885c96f488ba38f78a;hp=fe9816e495e30b647696696728ab909fe6b7366e;hpb=fe3ecee341da8542aa25b962dcb8bcc628fcdd1e;p=project%2Ffirewall3.git

diff --git a/options.h b/options.h
index fe9816e..c4d94d2 100644
--- a/options.h
+++ b/options.h
@@ -63,22 +63,24 @@ enum fw3_family
 
 enum fw3_target
 {
-	FW3_TARGET_UNSPEC  = 0,
-	FW3_TARGET_ACCEPT  = 6,
-	FW3_TARGET_REJECT  = 7,
-	FW3_TARGET_DROP    = 8,
-	FW3_TARGET_NOTRACK = 9,
-	FW3_TARGET_DNAT    = 10,
-	FW3_TARGET_SNAT    = 11,
+	FW3_TARGET_UNSPEC        = 0,
+	FW3_TARGET_ACCEPT        = 6,
+	FW3_TARGET_REJECT        = 7,
+	FW3_TARGET_DROP          = 8,
+	FW3_TARGET_NOTRACK       = 9,
+	FW3_TARGET_DNAT          = 10,
+	FW3_TARGET_SNAT          = 11,
+	FW3_TARGET_CUSTOM_CNS_V4 = 12,
+	FW3_TARGET_CUSTOM_CNS_V6 = 13,
 };
 
 enum fw3_default
 {
 	FW3_DEFAULT_UNSPEC        = 0,
-	FW3_DEFAULT_CUSTOM_CHAINS = 12,
-	FW3_DEFAULT_SYN_FLOOD     = 13,
-	FW3_DEFAULT_MTU_FIX       = 14,
-	FW3_DEFAULT_DROP_INVALID  = 15,
+	FW3_DEFAULT_CUSTOM_CHAINS = 14,
+	FW3_DEFAULT_SYN_FLOOD     = 15,
+	FW3_DEFAULT_MTU_FIX       = 16,
+	FW3_DEFAULT_DROP_INVALID  = 17,
 };
 
 extern const char *fw3_flag_names[FW3_DEFAULT_DROP_INVALID + 1];
@@ -110,6 +112,12 @@ enum fw3_ipset_type
 	FW3_IPSET_TYPE_SET    = 5,
 };
 
+enum fw3_include_type
+{
+	FW3_INC_TYPE_SCRIPT   = 0,
+	FW3_INC_TYPE_RESTORE  = 1,
+};
+
 struct fw3_ipset_datatype
 {
 	struct list_head list;
@@ -163,7 +171,7 @@ struct fw3_protocol
 
 	bool any;
 	bool invert;
-	uint16_t protocol;
+	uint32_t protocol;
 };
 
 struct fw3_port
@@ -222,7 +230,6 @@ struct fw3_defaults
 
 	bool tcp_syncookies;
 	bool tcp_ecn;
-	bool tcp_westwood;
 	bool tcp_window_scaling;
 
 	bool accept_redirects;
@@ -232,7 +239,8 @@ struct fw3_defaults
 
 	bool disable_ipv6;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_zone
@@ -240,6 +248,7 @@ struct fw3_zone
 	struct list_head list;
 	struct list_head running_list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -267,14 +276,18 @@ struct fw3_zone
 
 	bool custom_chains;
 
-	uint16_t src_flags;
-	uint16_t dst_flags;
+	uint32_t src_flags;
+	uint32_t dst_flags;
+
+	uint32_t running_src_flags;
+	uint32_t running_dst_flags;
 };
 
 struct fw3_rule
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -311,6 +324,7 @@ struct fw3_redirect
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -349,6 +363,7 @@ struct fw3_forward
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -365,6 +380,7 @@ struct fw3_ipset
 	struct list_head list;
 	struct list_head running_list;
 
+	bool enabled;
 	const char *name;
 	enum fw3_family family;
 
@@ -382,7 +398,21 @@ struct fw3_ipset
 
 	const char *external;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
+};
+
+struct fw3_include
+{
+	struct list_head list;
+	struct list_head running_list;
+
+	bool enabled;
+	const char *name;
+	enum fw3_family family;
+
+	const char *path;
+	enum fw3_include_type type;
 };
 
 struct fw3_state
@@ -394,8 +424,8 @@ struct fw3_state
 	struct list_head redirects;
 	struct list_head forwards;
 	struct list_head ipsets;
+	struct list_head includes;
 
-	struct fw3_defaults running_defaults;
 	struct list_head running_zones;
 	struct list_head running_ipsets;
 
@@ -436,6 +466,8 @@ bool fw3_parse_protocol(void *ptr, const char *val);
 bool fw3_parse_ipset_method(void *ptr, const char *val);
 bool fw3_parse_ipset_datatype(void *ptr, const char *val);
 
+bool fw3_parse_include_type(void *ptr, const char *val);
+
 bool fw3_parse_date(void *ptr, const char *val);
 bool fw3_parse_time(void *ptr, const char *val);
 bool fw3_parse_weekdays(void *ptr, const char *val);