X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=defaults.c;h=e1710c28e7d9b9dccb2807011874a565ba22e002;hb=bd574af529c0661c125336bdd9d0d1f2e09287c3;hp=1a25eaf8f3d96dd4c8e851e59367f5a6a73c6e69;hpb=ea1e5c25c1c4c8c82b51c0440d033944ccb4e2e2;p=project%2Ffirewall3.git

diff --git a/defaults.c b/defaults.c
index 1a25eaf..e1710c2 100644
--- a/defaults.c
+++ b/defaults.c
@@ -60,7 +60,7 @@ static const struct chain toplevel_rules[] = {
 	C(ANY, RAW,    UNSPEC,        "PREROUTING -j notrack"),
 };
 
-static struct fw3_option default_opts[] = {
+const struct fw3_option fw3_default_opts[] = {
 	FW3_OPT("input",               target,   defaults, policy_input),
 	FW3_OPT("forward",             target,   defaults, policy_forward),
 	FW3_OPT("output",              target,   defaults, policy_output),
@@ -82,12 +82,14 @@ static struct fw3_option default_opts[] = {
 
 	FW3_OPT("custom_chains",       bool,     defaults, custom_chains),
 	FW3_OPT("disable_ipv6",        bool,     defaults, disable_ipv6),
+
+	{ }
 };
 
 
 static bool
 print_chains(enum fw3_table table, enum fw3_family family,
-             const char *fmt, uint8_t flags,
+             const char *fmt, uint16_t flags,
              const struct chain *chains, int n)
 {
 	bool rv = false;
@@ -101,7 +103,7 @@ print_chains(enum fw3_table table, enum fw3_family family,
 		if (c->table != table)
 			continue;
 
-		if ((c->flag != FW3_DEFAULT_UNSPEC) && !(flags & (1 << c->flag)))
+		if ((c->flag != FW3_DEFAULT_UNSPEC) && !hasbit(flags, c->flag))
 			continue;
 
 		fw3_pr(fmt, c->name);
@@ -142,6 +144,8 @@ 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);
@@ -155,18 +159,20 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 
-		fw3_parse_options(&state->defaults,
-		                  default_opts, ARRAY_SIZE(default_opts), s);
+		fw3_parse_options(&state->defaults, fw3_default_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)
-			defs->has_flag |= (1 << FW3_DEFAULT_CUSTOM_CHAINS);
+			setbit(defs->flags, FW3_DEFAULT_CUSTOM_CHAINS);
 
 		if (defs->syn_flood)
-			defs->has_flag |= (1 << FW3_DEFAULT_SYN_FLOOD);
+			setbit(defs->flags, FW3_DEFAULT_SYN_FLOOD);
 	}
 }
 
@@ -175,24 +181,18 @@ fw3_print_default_chains(enum fw3_table table, enum fw3_family family,
                          struct fw3_state *state)
 {
 	struct fw3_defaults *defs = &state->defaults;
-	const char *policy[] = {
-		"(bug)",
-		"ACCEPT",
-		"DROP",
-		"DROP",
-		"(bug)",
-		"(bug)",
-		"(bug)",
-	};
+
+#define policy(t) \
+	((t == FW3_TARGET_REJECT) ? "DROP" : fw3_flag_names[t])
 
 	if (table == FW3_TABLE_FILTER)
 	{
-		fw3_pr(":INPUT %s [0:0]\n", policy[defs->policy_input]);
-		fw3_pr(":FORWARD %s [0:0]\n", policy[defs->policy_forward]);
-		fw3_pr(":OUTPUT %s [0:0]\n", policy[defs->policy_output]);
+		fw3_pr(":INPUT %s [0:0]\n", policy(defs->policy_input));
+		fw3_pr(":FORWARD %s [0:0]\n", policy(defs->policy_forward));
+		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));
 }
 
@@ -296,30 +296,29 @@ reset_policy(enum fw3_table table)
 
 void
 fw3_flush_rules(enum fw3_table table, enum fw3_family family,
-                bool pass2, struct list_head *statefile)
+                bool pass2, struct fw3_state *state)
 {
-	struct fw3_statefile_entry *e;
+	struct fw3_defaults *d = &state->running_defaults;
+
+	if (!hasbit(d->flags, family))
+		return;
 
-	list_for_each_entry(e, statefile, list)
+	if (!pass2)
 	{
-		if (e->type != FW3_TYPE_DEFAULTS)
-			continue;
+		reset_policy(table);
 
-		if (!pass2)
-		{
-			reset_policy(table);
+		print_chains(table, family, "-D %s\n", state->running_defaults.flags,
+					 toplevel_rules, ARRAY_SIZE(toplevel_rules));
 
-			print_chains(table, family, "-D %s\n", e->flags[0],
-			             toplevel_rules, ARRAY_SIZE(toplevel_rules));
+		print_chains(table, family, "-F %s\n", state->running_defaults.flags,
+					 default_chains, ARRAY_SIZE(default_chains));
+	}
+	else
+	{
+		print_chains(table, family, "-X %s\n", state->running_defaults.flags,
+					 default_chains, ARRAY_SIZE(default_chains));
 
-			print_chains(table, family, "-F %s\n", e->flags[0],
-			             default_chains, ARRAY_SIZE(default_chains));
-		}
-		else
-		{
-			print_chains(table, family, "-X %s\n", e->flags[0],
-			             default_chains, ARRAY_SIZE(default_chains));
-		}
+		delbit(d->flags, family);
 	}
 }