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

diff --git a/options.h b/options.h
index 7881375..c4d94d2 100644
--- a/options.h
+++ b/options.h
@@ -70,16 +70,17 @@ enum fw3_target
 	FW3_TARGET_NOTRACK       = 9,
 	FW3_TARGET_DNAT          = 10,
 	FW3_TARGET_SNAT          = 11,
-	FW3_TARGET_CUSTOM_CHAINS = 12, /* alias to FW3_DEFAULT_CUSTOM_CHAINS */
+	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];
@@ -170,7 +171,7 @@ struct fw3_protocol
 
 	bool any;
 	bool invert;
-	uint16_t protocol;
+	uint32_t protocol;
 };
 
 struct fw3_port
@@ -238,7 +239,8 @@ struct fw3_defaults
 
 	bool disable_ipv6;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_zone
@@ -274,8 +276,11 @@ 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
@@ -393,7 +398,8 @@ struct fw3_ipset
 
 	const char *external;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_include
@@ -420,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;