convert remaining occurences to hasbit() / setbit() helper macros

[project/firewall3.git] / options.h

diff --git a/options.h b/options.h
index ee2c008..ced138a 100644 (file)
--- a/options.h
+++ b/options.h
@@ -77,6 +77,8 @@ enum fw3_default
        FW3_DEFAULT_SYN_FLOOD     = 2,
        FW3_DEFAULT_MTU_FIX       = 3,
        FW3_DEFAULT_DROP_INVALID  = 4,
+       FW3_DEFAULT_IPV4_LOADED   = 5,
+       FW3_DEFAULT_IPV6_LOADED   = 6,
 };
 
 enum fw3_limit_unit
@@ -210,7 +212,7 @@ struct fw3_defaults
 
        bool disable_ipv6;
 
-       uint8_t has_flag;
+       uint8_t flags;
 };
 
 struct fw3_zone
@@ -244,8 +246,8 @@ struct fw3_zone
 
        bool custom_chains;
 
-       uint8_t has_src_target;
-       uint8_t has_dest_target;
+       uint8_t src_flags;
+       uint8_t dst_flags;
 };
 
 struct fw3_rule