X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=defaults.c;h=f87ac92d0e2420b59b04304b006f54f4d19e0b7f;hp=8bf1aa366c174939025dad7d29116aa370c5c993;hb=b6bfb7a067c5699fd5aec28d407d773d3a022567;hpb=16037f5d804ef952d61f93d09d7f9f0060072401;ds=sidebyside diff --git a/defaults.c b/defaults.c index 8bf1aa3..f87ac92 100644 --- a/defaults.c +++ b/defaults.c @@ -19,17 +19,10 @@ #include "defaults.h" -#define C(f, tbl, def, name) \ - { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_DEFAULT_##def, name } - -struct chain { - enum fw3_family family; - enum fw3_table table; - enum fw3_default flag; - const char *name; -}; +#define C(f, tbl, def, fmt) \ + { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##def, fmt } -static const struct chain default_chains[] = { +static const struct fw3_rule_spec default_chains[] = { C(ANY, FILTER, UNSPEC, "delegate_input"), C(ANY, FILTER, UNSPEC, "delegate_output"), C(ANY, FILTER, UNSPEC, "delegate_forward"), @@ -45,10 +38,14 @@ static const struct chain default_chains[] = { C(V4, NAT, CUSTOM_CHAINS, "postrouting_rule"), C(ANY, MANGLE, UNSPEC, "mssfix"), + C(ANY, MANGLE, UNSPEC, "fwmark"), + C(ANY, RAW, UNSPEC, "notrack"), + + { } }; -static const struct chain toplevel_rules[] = { +static const struct fw3_rule_spec toplevel_rules[] = { C(ANY, FILTER, UNSPEC, "INPUT -j delegate_input"), C(ANY, FILTER, UNSPEC, "OUTPUT -j delegate_output"), C(ANY, FILTER, UNSPEC, "FORWARD -j delegate_forward"), @@ -57,10 +54,14 @@ static const struct chain toplevel_rules[] = { C(V4, NAT, UNSPEC, "POSTROUTING -j delegate_postrouting"), C(ANY, MANGLE, UNSPEC, "FORWARD -j mssfix"), + C(ANY, MANGLE, UNSPEC, "PREROUTING -j fwmark"), + C(ANY, RAW, UNSPEC, "PREROUTING -j notrack"), + + { } }; -const struct fw3_option fw3_default_opts[] = { +const struct fw3_option fw3_flag_opts[] = { FW3_OPT("input", target, defaults, policy_input), FW3_OPT("forward", target, defaults, policy_forward), FW3_OPT("output", target, defaults, policy_output), @@ -82,53 +83,25 @@ const struct fw3_option fw3_default_opts[] = { FW3_OPT("custom_chains", bool, defaults, custom_chains), FW3_OPT("disable_ipv6", bool, defaults, disable_ipv6), + FW3_OPT("__flags_v4", int, defaults, flags[0]), + FW3_OPT("__flags_v6", int, defaults, flags[1]), + { } }; -static bool -print_chains(enum fw3_table table, enum fw3_family family, - const char *fmt, uint32_t *flags, uint32_t mask, - const struct chain *chains, int n) -{ - bool rv = false; - const struct chain *c; - uint32_t f = flags ? flags[family == FW3_FAMILY_V6] : 0; - - if (mask) - f &= mask; - - for (c = chains; n > 0; c++, n--) - { - if (!fw3_is_family(c, family)) - continue; - - if (c->table != table) - continue; - - if ((c->flag != FW3_DEFAULT_UNSPEC) && !hasbit(f, c->flag)) - continue; - - fw3_pr(fmt, c->name); - - rv = true; - } - - return rv; -} - static void -check_policy(struct uci_element *e, enum fw3_target *pol, const char *name) +check_policy(struct uci_element *e, enum fw3_flag *pol, const char *name) { - if (*pol == FW3_TARGET_UNSPEC) + if (*pol == FW3_FLAG_UNSPEC) { warn_elem(e, "has no %s policy specified, defaulting to DROP", name); - *pol = FW3_TARGET_DROP; + *pol = FW3_FLAG_DROP; } - else if (*pol > FW3_TARGET_DROP) + else if (*pol > FW3_FLAG_DROP) { warn_elem(e, "has invalid %s policy, defaulting to DROP", name); - *pol = FW3_TARGET_DROP; + *pol = FW3_FLAG_DROP; } } @@ -160,7 +133,7 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p) continue; } - fw3_parse_options(&state->defaults, fw3_default_opts, s); + fw3_parse_options(&state->defaults, fw3_flag_opts, s); check_policy(e, &defs->policy_input, "input"); check_policy(e, &defs->policy_output, "output"); @@ -169,15 +142,15 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p) } void -fw3_print_default_chains(enum fw3_table table, enum fw3_family family, - bool reload, struct fw3_state *state) +fw3_print_default_chains(struct fw3_state *state, enum fw3_family family, + enum fw3_table table, bool reload) { bool rv; struct fw3_defaults *defs = &state->defaults; uint32_t custom_mask = ~0; #define policy(t) \ - ((t == FW3_TARGET_REJECT) ? "DROP" : fw3_flag_names[t]) + ((t == FW3_FLAG_REJECT) ? "DROP" : fw3_flag_names[t]) if (family == FW3_FAMILY_V6 && defs->disable_ipv6) return; @@ -191,24 +164,24 @@ fw3_print_default_chains(enum fw3_table table, enum fw3_family family, /* Don't touch user chains on reload */ if (reload) - delbit(custom_mask, FW3_DEFAULT_CUSTOM_CHAINS); + delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS); if (defs->custom_chains) - set(defs->flags, family, FW3_DEFAULT_CUSTOM_CHAINS); + set(defs->flags, family, FW3_FLAG_CUSTOM_CHAINS); if (defs->syn_flood) - set(defs->flags, family, FW3_DEFAULT_SYN_FLOOD); + set(defs->flags, family, FW3_FLAG_SYN_FLOOD); - rv = print_chains(table, family, ":%s - [0:0]\n", defs->flags, custom_mask, - default_chains, ARRAY_SIZE(default_chains)); + rv = fw3_pr_rulespec(table, family, defs->flags, custom_mask, + default_chains, ":%s - [0:0]\n"); if (rv) set(defs->flags, family, table); } void -fw3_print_default_head_rules(enum fw3_table table, enum fw3_family family, - bool reload, struct fw3_state *state) +fw3_print_default_head_rules(struct fw3_state *state, enum fw3_family family, + enum fw3_table table, bool reload) { int i; struct fw3_defaults *defs = &state->defaults; @@ -218,8 +191,7 @@ fw3_print_default_head_rules(enum fw3_table table, enum fw3_family family, "forward", "forwarding", }; - print_chains(table, family, "-A %s\n", NULL, 0, - toplevel_rules, ARRAY_SIZE(toplevel_rules)); + fw3_pr_rulespec(table, family, NULL, 0, toplevel_rules, "-A %s\n"); switch (table) { @@ -283,21 +255,21 @@ fw3_print_default_head_rules(enum fw3_table table, enum fw3_family family, } void -fw3_print_default_tail_rules(enum fw3_table table, enum fw3_family family, - bool reload, struct fw3_state *state) +fw3_print_default_tail_rules(struct fw3_state *state, enum fw3_family family, + enum fw3_table table, bool reload) { struct fw3_defaults *defs = &state->defaults; if (table != FW3_TABLE_FILTER) return; - if (defs->policy_input == FW3_TARGET_REJECT) + if (defs->policy_input == FW3_FLAG_REJECT) fw3_pr("-A delegate_input -j reject\n"); - if (defs->policy_output == FW3_TARGET_REJECT) + if (defs->policy_output == FW3_FLAG_REJECT) fw3_pr("-A delegate_output -j reject\n"); - if (defs->policy_forward == FW3_TARGET_REJECT) + if (defs->policy_forward == FW3_FLAG_REJECT) fw3_pr("-A delegate_forward -j reject\n"); } @@ -330,7 +302,7 @@ fw3_set_defaults(struct fw3_state *state) } static void -reset_policy(enum fw3_table table, enum fw3_target policy) +reset_policy(enum fw3_table table, enum fw3_flag policy) { if (table != FW3_TABLE_FILTER) return; @@ -341,8 +313,8 @@ reset_policy(enum fw3_table table, enum fw3_target policy) } void -fw3_flush_rules(enum fw3_table table, enum fw3_family family, - bool pass2, bool reload, struct fw3_state *state) +fw3_flush_rules(struct fw3_state *state, enum fw3_family family, + enum fw3_table table, bool reload, bool pass2) { struct fw3_defaults *defs = &state->defaults; uint32_t custom_mask = ~0; @@ -352,25 +324,22 @@ fw3_flush_rules(enum fw3_table table, enum fw3_family family, /* don't touch user chains on selective stop */ if (reload) - delbit(custom_mask, FW3_DEFAULT_CUSTOM_CHAINS); + delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS); if (!pass2) { - reset_policy(table, reload ? FW3_TARGET_DROP : FW3_TARGET_ACCEPT); + reset_policy(table, reload ? FW3_FLAG_DROP : FW3_FLAG_ACCEPT); - print_chains(table, family, "-D %s\n", - defs->flags, custom_mask, - toplevel_rules, ARRAY_SIZE(toplevel_rules)); + fw3_pr_rulespec(table, family, defs->flags, custom_mask, + toplevel_rules, "-D %s\n"); - print_chains(table, family, "-F %s\n", - defs->flags, custom_mask, - default_chains, ARRAY_SIZE(default_chains)); + fw3_pr_rulespec(table, family, defs->flags, custom_mask, + default_chains, "-F %s\n"); } else { - print_chains(table, family, "-X %s\n", - defs->flags, custom_mask, - default_chains, ARRAY_SIZE(default_chains)); + fw3_pr_rulespec(table, family, defs->flags, custom_mask, + default_chains, "-X %s\n"); del(defs->flags, family, table); } @@ -379,7 +348,7 @@ fw3_flush_rules(enum fw3_table table, enum fw3_family family, void fw3_flush_all(enum fw3_table table) { - reset_policy(table, FW3_TARGET_ACCEPT); + reset_policy(table, FW3_FLAG_ACCEPT); fw3_pr("-F\n"); fw3_pr("-X\n");