rename flag fields in structures

diff --git a/defaults.c b/defaults.c
index 556d3b9eae398007b17e7822ea2de5e4f84d4808..886da2fb8478d0b1ea212a5ad62c65934f10b0f2 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -142,7 +142,7 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
        defs->tcp_window_scaling   = true;
        defs->custom_chains        = true;
 
-       defs->has_flag = (1 << FW3_DEFAULT_IPV4_LOADED);
+       defs->flags = (1 << FW3_DEFAULT_IPV4_LOADED);
 
        uci_foreach_element(&p->sections, e)
        {
@@ -165,13 +165,13 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
                check_policy(e, &defs->policy_forward, "forward");
 
                if (!defs->disable_ipv6)
-                       setbit(defs->has_flag, FW3_DEFAULT_IPV6_LOADED);
+                       setbit(defs->flags, FW3_DEFAULT_IPV6_LOADED);
 
                if (defs->custom_chains)
-                       setbit(defs->has_flag, FW3_DEFAULT_CUSTOM_CHAINS);
+                       setbit(defs->flags, FW3_DEFAULT_CUSTOM_CHAINS);
 
                if (defs->syn_flood)
-                       setbit(defs->has_flag, FW3_DEFAULT_SYN_FLOOD);
+                       setbit(defs->flags, FW3_DEFAULT_SYN_FLOOD);
        }
 }
 
@@ -197,7 +197,7 @@ fw3_print_default_chains(enum fw3_table table, enum fw3_family family,
                fw3_pr(":OUTPUT %s [0:0]\n", policy[defs->policy_output]);
        }
 
-       print_chains(table, family, ":%s - [0:0]\n", defs->has_flag,
+       print_chains(table, family, ":%s - [0:0]\n", defs->flags,
                     default_chains, ARRAY_SIZE(default_chains));
 }
 

diff --git a/forwards.c b/forwards.c
index 8f899bde40f69c6a369226293c03d2e39cb78357..e653356054d2a7616cd8810c4e367a6166f4c2cc 100644 (file)
--- a/forwards.c
+++ b/forwards.c
@@ -76,7 +76,7 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 
                if (forward->_dest)
                {
-                       setbit(forward->_dest->has_dest_target, FW3_TARGET_ACCEPT);
+                       setbit(forward->_dest->dst_flags, FW3_TARGET_ACCEPT);
 
                        if (forward->_src &&
                            (forward->_src->conntrack || forward->_dest->conntrack))

diff --git a/main.c b/main.c
index a58f582332af00683241f2ab2fc9cae3800df766..65afacd161f2d55b7520f6dc5dbfbe5d7a7c4775 100644 (file)
--- a/main.c
+++ b/main.c
@@ -162,16 +162,16 @@ family_used(enum fw3_family family)
 static bool
 family_loaded(struct fw3_state *state, enum fw3_family family)
 {
-       return hasbit(state->defaults.has_flag, family_flag(family));
+       return hasbit(state->defaults.flags, family_flag(family));
 }
 
 static void
 family_set(struct fw3_state *state, enum fw3_family family, bool set)
 {
        if (set)
-               setbit(state->defaults.has_flag, family_flag(family));
+               setbit(state->defaults.flags, family_flag(family));
        else
-               delbit(state->defaults.has_flag, family_flag(family));
+               delbit(state->defaults.flags, family_flag(family));
 }
 
 static int

diff --git a/options.h b/options.h
index e4a507f7356b6e052f79f550e47903d2bf6f1b3f..ced138ad2c0ab1ebf6d13b90edebff4506326b98 100644 (file)
--- a/options.h
+++ b/options.h
@@ -212,7 +212,7 @@ struct fw3_defaults
 
        bool disable_ipv6;
 
-       uint8_t has_flag;
+       uint8_t flags;
 };
 
 struct fw3_zone
@@ -246,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

diff --git a/redirects.c b/redirects.c
index f8eaed3f6e8c02fb63623c740f94e969932342d2..da149713fb3dfebece93a444e9872c69b0947db6 100644 (file)
--- a/redirects.c
+++ b/redirects.c
@@ -133,16 +133,16 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                                warn_elem(e, "has no source specified");
                        else
                        {
-                               setbit(redir->_src->has_dest_target, redir->target);
+                               setbit(redir->_src->dst_flags, redir->target);
                                redir->_src->conntrack = true;
                                valid = true;
                        }
 
                        if (redir->reflection && redir->_dest && redir->_src->masq)
                        {
-                               setbit(redir->_dest->has_dest_target, FW3_TARGET_ACCEPT);
-                               setbit(redir->_dest->has_dest_target, FW3_TARGET_DNAT);
-                               setbit(redir->_dest->has_dest_target, FW3_TARGET_SNAT);
+                               setbit(redir->_dest->dst_flags, FW3_TARGET_ACCEPT);
+                               setbit(redir->_dest->dst_flags, FW3_TARGET_DNAT);
+                               setbit(redir->_dest->dst_flags, FW3_TARGET_SNAT);
                        }
                }
                else
@@ -155,7 +155,7 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                                warn_elem(e, "has no src_dip option specified");
                        else
                        {
-                               setbit(redir->_dest->has_dest_target, redir->target);
+                               setbit(redir->_dest->dst_flags, redir->target);
                                redir->_dest->conntrack = true;
                                valid = true;
                        }

diff --git a/rules.c b/rules.c
index d29bba2fb8c50d9cccce5db8e9ce99830c52927d..f9986282e3e9f266c62fa73589fecd8e8ee4704f 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -142,7 +142,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                }
 
                if (rule->_dest)
-                       setbit(rule->_dest->has_dest_target, rule->target);
+                       setbit(rule->_dest->dst_flags, rule->target);
 
                list_add_tail(&rule->list, &state->rules);
                continue;

diff --git a/utils.c b/utils.c
index c3dbb3d93fc61bce6b401763d0aa76ddde9903fc..f43a859bbb038b86cce8839552281531c5e1dbf8 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -405,7 +405,7 @@ fw3_write_statefile(void *state)
 
        int mask = (1 << FW3_DEFAULT_IPV4_LOADED) | (1 << FW3_DEFAULT_IPV6_LOADED);
 
-       if (!(d->has_flag & mask))
+       if (!(d->flags & mask))
        {
                if (unlink(FW3_STATEFILE))
                        warn("Unable to remove state %s: %s",
@@ -422,12 +422,12 @@ fw3_write_statefile(void *state)
                return;
        }
 
-       fprintf(sf, "%u - %u\n", FW3_TYPE_DEFAULTS, d->has_flag);
+       fprintf(sf, "%u - %u\n", FW3_TYPE_DEFAULTS, d->flags);
 
        list_for_each_entry(z, &s->zones, list)
        {
                fprintf(sf, "%u %s %u %u\n", FW3_TYPE_ZONE,
-                       z->name, z->has_src_target, z->has_dest_target);
+                       z->name, z->src_flags, z->dst_flags);
        }
 
        list_for_each_entry(i, &s->ipsets, list)

diff --git a/zones.c b/zones.c
index 434d758cef985441525da20194ab5b5607036631..584ebca8a117fbbfc28369533dc64f327faf7ec3 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -201,13 +201,13 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 
                if (zone->masq)
                {
-                       setbit(zone->has_dest_target, FW3_TARGET_SNAT);
+                       setbit(zone->dst_flags, FW3_TARGET_SNAT);
                        zone->conntrack = true;
                }
 
-               setbit(zone->has_src_target, zone->policy_input);
-               setbit(zone->has_dest_target, zone->policy_output);
-               setbit(zone->has_dest_target, zone->policy_forward);
+               setbit(zone->src_flags, zone->policy_input);
+               setbit(zone->dst_flags, zone->policy_output);
+               setbit(zone->dst_flags, zone->policy_forward);
 
                list_add_tail(&zone->list, &state->zones);
        }
@@ -224,13 +224,13 @@ print_zone_chain(enum fw3_table table, enum fw3_family family,
                return;
 
        if (!zone->conntrack && !disable_notrack)
-               setbit(zone->has_dest_target, FW3_TARGET_NOTRACK);
+               setbit(zone->dst_flags, FW3_TARGET_NOTRACK);
 
        s = print_chains(table, family, ":%s - [0:0]\n", zone->name,
-                        zone->has_src_target, src_chains, ARRAY_SIZE(src_chains));
+                        zone->src_flags, src_chains, ARRAY_SIZE(src_chains));
 
        d = print_chains(table, family, ":%s - [0:0]\n", zone->name,
-                        zone->has_dest_target, dst_chains, ARRAY_SIZE(dst_chains));
+                        zone->dst_flags, dst_chains, ARRAY_SIZE(dst_chains));
 
        if (s || d)
                info("   * Zone '%s'", zone->name);
@@ -253,7 +253,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family,
        {
                for (t = FW3_TARGET_ACCEPT; t <= FW3_TARGET_DROP; t++)
                {
-                       if (zone->has_src_target & (1 << t))
+                       if (zone->src_flags & (1 << t))
                        {
                                fw3_pr("-A zone_%s_src_%s", zone->name, targets[t*2]);
                                fw3_format_in_out(dev, NULL);
@@ -262,7 +262,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family,
                                fw3_pr(" -j %s\n", targets[t*2+1]);
                        }
 
-                       if (zone->has_dest_target & (1 << t))
+                       if (zone->dst_flags & (1 << t))
                        {
                                fw3_pr("-A zone_%s_dest_%s", zone->name, targets[t*2]);
                                fw3_format_in_out(NULL, dev);
@@ -292,7 +292,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family,
        }
        else if (table == FW3_TABLE_NAT)
        {
-               if (zone->has_dest_target & (1 << FW3_TARGET_DNAT))
+               if (zone->dst_flags & (1 << FW3_TARGET_DNAT))
                {
                        fw3_pr("-A delegate_prerouting");
                        fw3_format_in_out(dev, NULL);
@@ -301,7 +301,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family,
                        fw3_pr(" -j zone_%s_prerouting\n", zone->name);
                }
 
-               if (zone->has_dest_target & (1 << FW3_TARGET_SNAT))
+               if (zone->dst_flags & (1 << FW3_TARGET_SNAT))
                {
                        fw3_pr("-A delegate_postrouting");
                        fw3_format_in_out(NULL, dev);
@@ -404,7 +404,7 @@ print_zone_rule(enum fw3_table table, enum fw3_family family,
                {
                        for (t = FW3_TARGET_REJECT; t <= FW3_TARGET_DROP; t++)
                        {
-                               if (zone->has_src_target & (1 << t))
+                               if (zone->src_flags & (1 << t))
                                {
                                        fw3_pr("-A zone_%s_src_%s", zone->name, targets[t]);
                                        fw3_format_limit(&zone->log_limit);
@@ -412,7 +412,7 @@ print_zone_rule(enum fw3_table table, enum fw3_family family,
                                                   targets[t], zone->name);
                                }
 
-                               if (zone->has_dest_target & (1 << t))
+                               if (zone->dst_flags & (1 << t))
                                {
                                        fw3_pr("-A zone_%s_dest_%s", zone->name, targets[t]);
                                        fw3_format_limit(&zone->log_limit);