defaults: fix check_kmod() function

[project/firewall3.git] / defaults.c

diff --git a/defaults.c b/defaults.c
index 11fbf0dd8f74a51e4b2d95fd0bb7e742d65cd8f4..91bd61712f6276cca6721a780247a6551becfa13 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -41,6 +41,8 @@ const struct fw3_option fw3_flag_opts[] = {
        FW3_OPT("output",              target,   defaults, policy_output),
 
        FW3_OPT("drop_invalid",        bool,     defaults, drop_invalid),
+       FW3_OPT("tcp_reject_code",     reject_code, defaults, tcp_reject_code),
+       FW3_OPT("any_reject_code",     reject_code, defaults, any_reject_code),
 
        FW3_OPT("syn_flood",           bool,     defaults, syn_flood),
        FW3_OPT("synflood_protect",    bool,     defaults, syn_flood),
@@ -83,14 +85,17 @@ check_policy(struct uci_element *e, enum fw3_flag *pol, const char *name)
 }
 
 static void
-check_offloading(struct uci_element *e, bool *offloading)
+check_kmod(struct uci_element *e, bool *module, const char *name)
 {
        FILE *f;
+       char buf[128];
 
-       if (!*offloading)
+       if (!*module)
                return;
 
-       f = fopen("/sys/module/xt_FLOWOFFLOAD/refcnt", "r");
+       snprintf(buf, sizeof(buf), "/sys/module/%s/refcnt", name);
+
+       f = fopen(buf, "r");
 
        if (f)
        {
@@ -98,8 +103,32 @@ check_offloading(struct uci_element *e, bool *offloading)
                return;
        }
 
-       warn_elem(e, "enables offloading but missing kernel support, disabling");
-       *offloading = false;
+       warn_elem(e, "requires not available kernel module %s, disabling", name);
+       *module = false;
+}
+
+static void
+check_any_reject_code(struct uci_element *e, enum fw3_reject_code *any_reject_code)
+{
+       if (*any_reject_code == FW3_REJECT_CODE_TCP_RESET) {
+               warn_elem(e, "tcp-reset not valid for any_reject_code, defaulting to port-unreach");
+               *any_reject_code = FW3_REJECT_CODE_PORT_UNREACH;
+       }
+}
+
+static const char*
+get_reject_code(enum fw3_family family, enum fw3_reject_code reject_code)
+{
+       switch (reject_code) {
+       case FW3_REJECT_CODE_TCP_RESET:
+               return "tcp-reset";
+       case FW3_REJECT_CODE_PORT_UNREACH:
+               return "port-unreach";
+       case FW3_REJECT_CODE_ADM_PROHIBITED:
+               return family == FW3_FAMILY_V6 ? "adm-prohibited": "admin-prohib";
+       default:
+               return "unknown";
+       }
 }
 
 void
@@ -111,6 +140,8 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
 
        bool seen = false;
 
+       defs->tcp_reject_code      = FW3_REJECT_CODE_TCP_RESET;
+       defs->any_reject_code      = FW3_REJECT_CODE_PORT_UNREACH;
        defs->syn_flood_rate.rate  = 25;
        defs->syn_flood_rate.burst = 50;
        defs->tcp_syncookies       = true;
@@ -138,7 +169,9 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
                check_policy(e, &defs->policy_output, "output");
                check_policy(e, &defs->policy_forward, "forward");
 
-               check_offloading(e, &defs->flow_offloading);
+               check_any_reject_code(e, &defs->any_reject_code);
+
+               check_kmod(e, &defs->flow_offloading, "xt_FLOWOFFLOAD");
        }
 }
 
@@ -278,12 +311,12 @@ fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
 
                r = fw3_ipt_rule_create(handle, &tcp, NULL, NULL, NULL, NULL);
                fw3_ipt_rule_target(r, "REJECT");
-               fw3_ipt_rule_addarg(r, false, "--reject-with", "tcp-reset");
+               fw3_ipt_rule_addarg(r, false, "--reject-with", get_reject_code(handle->family, defs->tcp_reject_code));
                fw3_ipt_rule_append(r, "reject");
 
                r = fw3_ipt_rule_new(handle);
                fw3_ipt_rule_target(r, "REJECT");
-               fw3_ipt_rule_addarg(r, false, "--reject-with", "port-unreach");
+               fw3_ipt_rule_addarg(r, false, "--reject-with", get_reject_code(handle->family, defs->any_reject_code));
                fw3_ipt_rule_append(r, "reject");
 
                break;