Separate running from current state flags in ipset handling, remove ipsets per family

[project/firewall3.git] / options.h

diff --git a/options.h b/options.h
index 1054658..c4d94d2 100644 (file)
--- a/options.h
+++ b/options.h
@@ -240,6 +240,7 @@ struct fw3_defaults
        bool disable_ipv6;
 
        uint32_t flags;
        bool disable_ipv6;
 
        uint32_t flags;

+       uint32_t running_flags;

 };
 
 struct fw3_zone
 };
 
 struct fw3_zone


@@ -398,6 +399,7 @@ struct fw3_ipset
        const char *external;
 
        uint32_t flags;
        const char *external;
 
        uint32_t flags;

+       uint32_t running_flags;

 };
 
 struct fw3_include
 };
 
 struct fw3_include


@@ -424,7 +426,6 @@ struct fw3_state
        struct list_head ipsets;
        struct list_head includes;
 
        struct list_head ipsets;
        struct list_head includes;
 

-       struct fw3_defaults running_defaults;

        struct list_head running_zones;
        struct list_head running_ipsets;
 
        struct list_head running_zones;
        struct list_head running_ipsets;