X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=defaults.c;h=b5a94e6b284a9dc362caadfd7ac56d7243fd23e9;hp=973b3a7cadfa2cab7a6eb0ef4a40a0b6ab177f0f;hb=54f0b072a03fded1070ce228676d93e574ccac09;hpb=b2b2e69b19a20a46f3db6d717a899248fa24628c diff --git a/defaults.c b/defaults.c index 973b3a7..b5a94e6 100644 --- a/defaults.c +++ b/defaults.c @@ -19,24 +19,17 @@ #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"), + C(ANY, FILTER, UNSPEC, "reject"), C(ANY, FILTER, CUSTOM_CHAINS, "input_rule"), C(ANY, FILTER, CUSTOM_CHAINS, "output_rule"), C(ANY, FILTER, CUSTOM_CHAINS, "forwarding_rule"), - C(ANY, FILTER, UNSPEC, "reject"), C(ANY, FILTER, SYN_FLOOD, "syn_flood"), C(V4, NAT, UNSPEC, "delegate_prerouting"), @@ -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), @@ -86,45 +87,18 @@ const struct fw3_option fw3_default_opts[] = { }; -static bool -print_chains(enum fw3_table table, enum fw3_family family, - const char *fmt, uint16_t flags, - const struct chain *chains, int n) -{ - bool rv = false; - const struct chain *c; - - 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(flags, 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; } } @@ -143,8 +117,6 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p) defs->tcp_window_scaling = true; defs->custom_chains = true; - setbit(defs->flags, FW3_FAMILY_V4); - uci_foreach_element(&p->sections, e) { s = uci_to_section(e); @@ -158,32 +130,27 @@ 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"); check_policy(e, &defs->policy_forward, "forward"); - - if (!defs->disable_ipv6) - setbit(defs->flags, FW3_FAMILY_V6); - - if (defs->custom_chains) - setbit(defs->flags, FW3_DEFAULT_CUSTOM_CHAINS); - - if (defs->syn_flood) - setbit(defs->flags, FW3_DEFAULT_SYN_FLOOD); } } void -fw3_print_default_chains(enum fw3_table table, enum fw3_family family, - 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; - uint16_t mask = ~0; + 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; if (table == FW3_TABLE_FILTER) { @@ -192,28 +159,36 @@ fw3_print_default_chains(enum fw3_table table, enum fw3_family family, fw3_pr(":OUTPUT %s [0:0]\n", policy(defs->policy_output)); } - /* user chains already loaded, don't create again */ - if (hasbit(state->running_defaults.flags, FW3_DEFAULT_CUSTOM_CHAINS)) - delbit(mask, FW3_DEFAULT_CUSTOM_CHAINS); + /* Don't touch user chains on reload */ + if (reload) + delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS); + + if (defs->custom_chains) + set(defs->flags, family, FW3_FLAG_CUSTOM_CHAINS); + + if (defs->syn_flood) + set(defs->flags, family, FW3_FLAG_SYN_FLOOD); - print_chains(table, family, ":%s - [0:0]\n", defs->flags & 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, - 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; const char *chains[] = { - "input", - "output", - "forward", + "input", "input", + "output", "output", + "forward", "forwarding", }; - print_chains(table, family, "-A %s\n", 0, - toplevel_rules, ARRAY_SIZE(toplevel_rules)); + fw3_pr_rulespec(table, family, NULL, 0, toplevel_rules, "-A %s\n"); switch (table) { @@ -223,17 +198,15 @@ fw3_print_default_head_rules(enum fw3_table table, enum fw3_family family, if (defs->custom_chains) { - fw3_pr("-A delegate_input -j input_rule " - "-m comment --comment \"user chain for input\"\n"); - - fw3_pr("-A delegate_output -j output_rule " - "-m comment --comment \"user chain for output\"\n"); - - fw3_pr("-A delegate_forward -j forwarding_rule " - "-m comment --comment \"user chain for forwarding\"\n"); + for (i = 0; i < ARRAY_SIZE(chains); i += 2) + { + fw3_pr("-A delegate_%s -m comment " + "--comment \"user chain for %s\" -j %s_rule\n", + chains[i], chains[i+1], chains[i+1]); + } } - for (i = 0; i < ARRAY_SIZE(chains); i++) + for (i = 0; i < ARRAY_SIZE(chains); i += 2) { fw3_pr("-A delegate_%s -m conntrack --ctstate RELATED,ESTABLISHED " "-j ACCEPT\n", chains[i]); @@ -263,11 +236,13 @@ fw3_print_default_head_rules(enum fw3_table table, enum fw3_family family, case FW3_TABLE_NAT: if (defs->custom_chains) { - fw3_pr("-A delegate_prerouting -j prerouting_rule " - "-m comment --comment \"user chain for prerouting\"\n"); + fw3_pr("-A delegate_prerouting " + "-m comment --comment \"user chain for prerouting\" " + "-j prerouting_rule\n"); - fw3_pr("-A delegate_postrouting -j postrouting_rule " - "-m comment --comment \"user chain for postrouting\"\n"); + fw3_pr("-A delegate_postrouting " + "-m comment --comment \"user chain for postrouting\" " + "-j postrouting_rule\n"); } break; @@ -277,21 +252,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, - 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"); } @@ -318,15 +293,13 @@ set_default(const char *name, bool set) void fw3_set_defaults(struct fw3_state *state) { - info("Setting sysctl values"); - set_default("ecn", state->defaults.tcp_ecn); set_default("syncookies", state->defaults.tcp_syncookies); set_default("window_scaling", state->defaults.tcp_window_scaling); } 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; @@ -337,41 +310,42 @@ reset_policy(enum fw3_table table, enum fw3_target policy) } void -fw3_flush_rules(enum fw3_table table, enum fw3_family family, - bool pass2, struct fw3_state *state, enum fw3_target policy) +fw3_flush_rules(struct fw3_state *state, enum fw3_family family, + enum fw3_table table, bool reload, bool pass2) { - struct fw3_defaults *d = &state->running_defaults; - uint16_t mask = ~0; + struct fw3_defaults *defs = &state->defaults; + uint32_t custom_mask = ~0; - if (!hasbit(d->flags, family)) + if (!has(defs->flags, family, table)) return; /* don't touch user chains on selective stop */ - delbit(mask, FW3_DEFAULT_CUSTOM_CHAINS); + if (reload) + delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS); if (!pass2) { - reset_policy(table, policy); + reset_policy(table, reload ? FW3_FLAG_DROP : FW3_FLAG_ACCEPT); - print_chains(table, family, "-D %s\n", d->flags & 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", d->flags & 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", d->flags & mask, - default_chains, ARRAY_SIZE(default_chains)); + fw3_pr_rulespec(table, family, defs->flags, custom_mask, + default_chains, "-X %s\n"); - delbit(d->flags, family); + del(defs->flags, family, table); } } 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");