X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.h;h=0bfb3e82daeeb87ec75edcf664e1fdc87641dfa5;hp=a9257a3685ab1ab58635fa361d78b99d6cbf6a2d;hb=e791a6a39a4f06b33fedaefe03a42354f3a85b6d;hpb=bd574af529c0661c125336bdd9d0d1f2e09287c3

diff --git a/options.h b/options.h
index a9257a3..0bfb3e8 100644
--- a/options.h
+++ b/options.h
@@ -63,22 +63,27 @@ 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_SRC_ACCEPT    = 12,
+	FW3_TARGET_SRC_REJECT    = 13,
+	FW3_TARGET_SRC_DROP      = 14,
+	FW3_TARGET_CUSTOM_CNS_V4 = 15,
+	FW3_TARGET_CUSTOM_CNS_V6 = 16,
 };
 
 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 = 17,
+	FW3_DEFAULT_SYN_FLOOD     = 18,
+	FW3_DEFAULT_MTU_FIX       = 19,
+	FW3_DEFAULT_DROP_INVALID  = 20,
 };
 
 extern const char *fw3_flag_names[FW3_DEFAULT_DROP_INVALID + 1];
@@ -169,7 +174,7 @@ struct fw3_protocol
 
 	bool any;
 	bool invert;
-	uint16_t protocol;
+	uint32_t protocol;
 };
 
 struct fw3_port
@@ -228,7 +233,6 @@ struct fw3_defaults
 
 	bool tcp_syncookies;
 	bool tcp_ecn;
-	bool tcp_westwood;
 	bool tcp_window_scaling;
 
 	bool accept_redirects;
@@ -238,7 +242,8 @@ struct fw3_defaults
 
 	bool disable_ipv6;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_zone
@@ -246,6 +251,7 @@ struct fw3_zone
 	struct list_head list;
 	struct list_head running_list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -273,14 +279,15 @@ struct fw3_zone
 
 	bool custom_chains;
 
-	uint16_t src_flags;
-	uint16_t dst_flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_rule
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -317,6 +324,7 @@ struct fw3_redirect
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -355,6 +363,7 @@ struct fw3_forward
 {
 	struct list_head list;
 
+	bool enabled;
 	const char *name;
 
 	enum fw3_family family;
@@ -371,6 +380,7 @@ struct fw3_ipset
 	struct list_head list;
 	struct list_head running_list;
 
+	bool enabled;
 	const char *name;
 	enum fw3_family family;
 
@@ -388,7 +398,8 @@ struct fw3_ipset
 
 	const char *external;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_include
@@ -396,6 +407,7 @@ struct fw3_include
 	struct list_head list;
 	struct list_head running_list;
 
+	bool enabled;
 	const char *name;
 	enum fw3_family family;
 
@@ -414,7 +426,6 @@ struct fw3_state
 	struct list_head ipsets;
 	struct list_head includes;
 
-	struct fw3_defaults running_defaults;
 	struct list_head running_zones;
 	struct list_head running_ipsets;