#include "ubus.h"
-#define C(f, tbl, tgt, name) \
- { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_TARGET_##tgt, name }
-
-struct chain {
- enum fw3_family family;
- enum fw3_table table;
- enum fw3_target target;
- const char *name;
-};
+#define C(f, tbl, tgt, fmt) \
+ { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt }
-static const struct chain zone_chains[] = {
+static const struct fw3_rule_spec zone_chains[] = {
C(ANY, FILTER, UNSPEC, "zone_%1$s_input"),
C(ANY, FILTER, UNSPEC, "zone_%1$s_output"),
C(ANY, FILTER, UNSPEC, "zone_%1$s_forward"),
C(V4, NAT, CUSTOM_CHAINS, "prerouting_%1$s_rule"),
C(V4, NAT, CUSTOM_CHAINS, "postrouting_%1$s_rule"),
+
+ { }
};
"zone_%1$s_" #dir1 " -m comment --comment \"user chain for %1$s " \
#dir2 "\" -j " #dir2 "_%1$s_rule"
-static const struct chain zone_rules[] = {
+static const struct fw3_rule_spec zone_rules[] = {
C(ANY, FILTER, CUSTOM_CHAINS, R(input, input)),
C(ANY, FILTER, CUSTOM_CHAINS, R(output, output)),
C(ANY, FILTER, CUSTOM_CHAINS, R(forward, forwarding)),
C(V4, NAT, CUSTOM_CHAINS, R(prerouting, prerouting)),
C(V4, NAT, CUSTOM_CHAINS, R(postrouting, postrouting)),
+
+ { }
};
const struct fw3_option fw3_zone_opts[] = {
};
-static bool
-print_chains(enum fw3_table table, enum fw3_family family,
- const char *fmt, const char *name, uint32_t *targets, uint32_t mask,
- const struct chain *chains, int n)
-{
- bool rv = false;
- char cn[256] = { 0 };
- const struct chain *c;
- uint32_t t = targets ? targets[family == FW3_FAMILY_V6] : 0;
-
- if (mask)
- t &= mask;
-
- for (c = chains; n > 0; c++, n--)
- {
- if (!fw3_is_family(c, family))
- continue;
-
- if (c->table != table)
- continue;
-
- if ((c->target != FW3_TARGET_UNSPEC) && !hasbit(t, c->target))
- continue;
-
- snprintf(cn, sizeof(cn), c->name, name);
- fw3_pr(fmt, cn);
-
- rv = true;
- }
-
- return rv;
-}
-
static void
-check_policy(struct uci_element *e, enum fw3_target *pol, enum fw3_target def,
+check_policy(struct uci_element *e, enum fw3_flag *pol, enum fw3_flag def,
const char *name)
{
- if (*pol == FW3_TARGET_UNSPEC)
+ if (*pol == FW3_FLAG_UNSPEC)
{
warn_elem(e, "has no %s policy specified, using default", name);
*pol = def;
}
- else if (*pol > FW3_TARGET_DROP)
+ else if (*pol > FW3_FLAG_DROP)
{
warn_elem(e, "has invalid %s policy, using default", name);
*pol = def;
continue;
}
+ tmp->network = net;
list_add_tail(&tmp->list, &zone->devices);
}
}
INIT_LIST_HEAD(&zone->masq_src);
INIT_LIST_HEAD(&zone->masq_dest);
+ INIT_LIST_HEAD(&zone->running_networks);
+ INIT_LIST_HEAD(&zone->running_devices);
+
zone->enabled = true;
zone->custom_chains = true;
zone->log_limit.rate = 10;
if (zone->masq)
{
- setbit(zone->flags[0], FW3_TARGET_SNAT);
+ setbit(zone->flags[0], FW3_FLAG_SNAT);
zone->conntrack = true;
}
if (zone->custom_chains)
{
- setbit(zone->flags[0], FW3_TARGET_SNAT);
- setbit(zone->flags[0], FW3_TARGET_DNAT);
+ setbit(zone->flags[0], FW3_FLAG_SNAT);
+ setbit(zone->flags[0], FW3_FLAG_DNAT);
}
setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
/* Don't touch user chains on reload */
if (reload)
- delbit(custom_mask, FW3_TARGET_CUSTOM_CHAINS);
+ delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS);
if (zone->custom_chains)
- set(zone->flags, family, FW3_TARGET_CUSTOM_CHAINS);
+ set(zone->flags, family, FW3_FLAG_CUSTOM_CHAINS);
if (!zone->conntrack && !state->defaults.drop_invalid)
- set(zone->flags, family, FW3_TARGET_NOTRACK);
+ set(zone->flags, family, FW3_FLAG_NOTRACK);
- c = print_chains(table, family, ":%s - [0:0]\n", zone->name,
- zone->flags, custom_mask,
- zone_chains, ARRAY_SIZE(zone_chains));
+ c = fw3_pr_rulespec(table, family, zone->flags, custom_mask, zone_chains,
+ ":%s - [0:0]\n", zone->name);
- r = print_chains(table, family, "-A %s\n", zone->name,
- zone->flags, 0,
- zone_rules, ARRAY_SIZE(zone_rules));
+ r = fw3_pr_rulespec(table, family, zone->flags, 0, zone_rules,
+ "-A %s\n", zone->name);
if (c || r)
{
struct fw3_zone *zone, struct fw3_device *dev,
struct fw3_address *sub, bool reload, bool disable_notrack)
{
- enum fw3_target t;
+ enum fw3_flag t;
#define jump_target(t) \
- ((t == FW3_TARGET_REJECT) ? "reject" : fw3_flag_names[t])
+ ((t == FW3_FLAG_REJECT) ? "reject" : fw3_flag_names[t])
if (table == FW3_TABLE_FILTER)
{
- for (t = FW3_TARGET_ACCEPT; t <= FW3_TARGET_DROP; t++)
+ for (t = FW3_FLAG_ACCEPT; t <= FW3_FLAG_DROP; t++)
{
if (has(zone->flags, family, fw3_to_src_target(t)))
{
}
else if (table == FW3_TABLE_NAT)
{
- if (has(zone->flags, family, FW3_TARGET_DNAT))
+ if (has(zone->flags, family, FW3_FLAG_DNAT))
{
fw3_pr("-A delegate_prerouting");
fw3_format_in_out(dev, NULL);
fw3_pr(" -j zone_%s_prerouting\n", zone->name);
}
- if (has(zone->flags, family, FW3_TARGET_SNAT))
+ if (has(zone->flags, family, FW3_FLAG_SNAT))
{
fw3_pr("-A delegate_postrouting");
fw3_format_in_out(NULL, dev);
struct fw3_address *msrc;
struct fw3_address *mdest;
- enum fw3_target t;
+ enum fw3_flag t;
if (!fw3_is_family(zone, family))
return;
if (zone->log)
{
- for (t = FW3_TARGET_REJECT; t <= FW3_TARGET_DROP; t++)
+ for (t = FW3_FLAG_REJECT; t <= FW3_FLAG_DROP; t++)
{
if (has(zone->flags, family, fw3_to_src_target(t)))
{
/* don't touch user chains on selective stop */
if (reload)
- delbit(custom_mask, FW3_TARGET_CUSTOM_CHAINS);
+ delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS);
list_for_each_entry_safe(z, tmp, &state->running_zones, running_list)
{
if (!has(z->flags, family, table))
continue;
- print_chains(table, family, pass2 ? "-X %s\n" : "-F %s\n",
- z->name, z->flags, custom_mask,
- zone_chains, ARRAY_SIZE(zone_chains));
+ fw3_pr_rulespec(table, family, z->flags, custom_mask, zone_chains,
+ pass2 ? "-X %s\n" : "-F %s\n", z->name);
if (pass2)
{
projects / project / firewall3.git / blobdiff