zones: add interface/subnet bound LOG rules

[project/firewall3.git] / defaults.c

diff --git a/defaults.c b/defaults.c
index bf2b51f..11fbf0d 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -58,6 +58,7 @@ const struct fw3_option fw3_flag_opts[] = {
        FW3_OPT("custom_chains",       bool,     defaults, custom_chains),
        FW3_OPT("disable_ipv6",        bool,     defaults, disable_ipv6),
        FW3_OPT("flow_offloading",     bool,     defaults, flow_offloading),
        FW3_OPT("custom_chains",       bool,     defaults, custom_chains),
        FW3_OPT("disable_ipv6",        bool,     defaults, disable_ipv6),
        FW3_OPT("flow_offloading",     bool,     defaults, flow_offloading),

+       FW3_OPT("flow_offloading_hw",  bool,     defaults, flow_offloading_hw),

 
        FW3_OPT("__flags_v4",          int,      defaults, flags[0]),
        FW3_OPT("__flags_v6",          int,      defaults, flags[1]),
 
        FW3_OPT("__flags_v4",          int,      defaults, flags[0]),
        FW3_OPT("__flags_v6",          int,      defaults, flags[1]),


@@ -224,7 +225,7 @@ fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
                        for (i = 0; i < ARRAY_SIZE(chains); i += 2)
                        {
                                r = fw3_ipt_rule_new(handle);
                        for (i = 0; i < ARRAY_SIZE(chains); i += 2)
                        {
                                r = fw3_ipt_rule_new(handle);

-                               fw3_ipt_rule_comment(r, "user chain for %s", chains[i+1]);
+                               fw3_ipt_rule_comment(r, "Custom %s rule chain", chains[i+1]);

                                fw3_ipt_rule_target(r, "%s_rule", chains[i+1]);
                                fw3_ipt_rule_append(r, chains[i]);
                        }
                                fw3_ipt_rule_target(r, "%s_rule", chains[i+1]);
                                fw3_ipt_rule_append(r, chains[i]);
                        }


@@ -233,8 +234,11 @@ fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
                if (defs->flow_offloading)
                {
                        r = fw3_ipt_rule_new(handle);
                if (defs->flow_offloading)
                {
                        r = fw3_ipt_rule_new(handle);

+                       fw3_ipt_rule_comment(r, "Traffic offloading");

                        fw3_ipt_rule_extra(r, "-m conntrack --ctstate RELATED,ESTABLISHED");
                        fw3_ipt_rule_target(r, "FLOWOFFLOAD");
                        fw3_ipt_rule_extra(r, "-m conntrack --ctstate RELATED,ESTABLISHED");
                        fw3_ipt_rule_target(r, "FLOWOFFLOAD");

+                       if (defs->flow_offloading_hw)
+                               fw3_ipt_rule_addarg(r, false, "--hw", NULL);

                        fw3_ipt_rule_append(r, "FORWARD");
                }
 
                        fw3_ipt_rule_append(r, "FORWARD");
                }
 


@@ -288,12 +292,12 @@ fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
                if (defs->custom_chains)
                {
                        r = fw3_ipt_rule_new(handle);
                if (defs->custom_chains)
                {
                        r = fw3_ipt_rule_new(handle);

-                       fw3_ipt_rule_comment(r, "user chain for prerouting");
+                       fw3_ipt_rule_comment(r, "Custom prerouting rule chain");

                        fw3_ipt_rule_target(r, "prerouting_rule");
                        fw3_ipt_rule_append(r, "PREROUTING");
 
                        r = fw3_ipt_rule_new(handle);
                        fw3_ipt_rule_target(r, "prerouting_rule");
                        fw3_ipt_rule_append(r, "PREROUTING");
 
                        r = fw3_ipt_rule_new(handle);

-                       fw3_ipt_rule_comment(r, "user chain for postrouting");
+                       fw3_ipt_rule_comment(r, "Custom postrouting rule chain");

                        fw3_ipt_rule_target(r, "postrouting_rule");
                        fw3_ipt_rule_append(r, "POSTROUTING");
                }
                        fw3_ipt_rule_target(r, "postrouting_rule");
                        fw3_ipt_rule_append(r, "POSTROUTING");
                }