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

diff --git a/options.h b/options.h
index 2af443b..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
@@ -237,7 +242,8 @@ struct fw3_defaults
 
 	bool disable_ipv6;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_zone
@@ -273,8 +279,8 @@ struct fw3_zone
 
 	bool custom_chains;
 
-	uint16_t src_flags;
-	uint16_t dst_flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_rule
@@ -392,7 +398,8 @@ struct fw3_ipset
 
 	const char *external;
 
-	uint16_t flags;
+	uint32_t flags;
+	uint32_t running_flags;
 };
 
 struct fw3_include
@@ -419,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;