Introduce fw3_no_family() helper macro and use it

[project/firewall3.git] / options.h

diff --git a/options.h b/options.h
index 1054658..0bfb3e8 100644 (file)
--- a/options.h
+++ b/options.h
@@ -70,17 +70,20 @@ enum fw3_target
        FW3_TARGET_NOTRACK       = 9,
        FW3_TARGET_DNAT          = 10,
        FW3_TARGET_SNAT          = 11,
-       FW3_TARGET_CUSTOM_CNS_V4 = 12,
-       FW3_TARGET_CUSTOM_CNS_V6 = 13,
+       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 = 14,
-       FW3_DEFAULT_SYN_FLOOD     = 15,
-       FW3_DEFAULT_MTU_FIX       = 16,
-       FW3_DEFAULT_DROP_INVALID  = 17,
+       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];
@@ -240,6 +243,7 @@ struct fw3_defaults
        bool disable_ipv6;
 
        uint32_t flags;
+       uint32_t running_flags;
 };
 
 struct fw3_zone
@@ -275,11 +279,8 @@ struct fw3_zone
 
        bool custom_chains;
 
-       uint32_t src_flags;
-       uint32_t dst_flags;
-
-       uint32_t running_src_flags;
-       uint32_t running_dst_flags;
+       uint32_t flags;
+       uint32_t running_flags;
 };
 
 struct fw3_rule
@@ -398,6 +399,7 @@ struct fw3_ipset
        const char *external;
 
        uint32_t flags;
+       uint32_t running_flags;
 };
 
 struct fw3_include
@@ -424,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;