projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firewall3: fix left shift on 64 bit systems in fw3_bitlen2netmask
[project/firewall3.git]
/
zones.c
diff --git
a/zones.c
b/zones.c
index
53c6246
..
2ddd7b4
100644
(file)
--- a/
zones.c
+++ b/
zones.c
@@
-83,6
+83,8
@@
const struct fw3_option fw3_zone_opts[] = {
FW3_OPT("__flags_v4", int, zone, flags[0]),
FW3_OPT("__flags_v6", int, zone, flags[1]),
FW3_OPT("__flags_v4", int, zone, flags[0]),
FW3_OPT("__flags_v6", int, zone, flags[1]),
+ FW3_LIST("__addrs", address, zone, old_addrs),
+
{ }
};
{ }
};
@@
-138,6
+140,8
@@
fw3_alloc_zone(void)
INIT_LIST_HEAD(&zone->masq_src);
INIT_LIST_HEAD(&zone->masq_dest);
INIT_LIST_HEAD(&zone->masq_src);
INIT_LIST_HEAD(&zone->masq_dest);
+ INIT_LIST_HEAD(&zone->old_addrs);
+
zone->enabled = true;
zone->custom_chains = true;
zone->log_limit.rate = 10;
zone->enabled = true;
zone->custom_chains = true;
zone->log_limit.rate = 10;
@@
-223,11
+227,11
@@
fw3_load_zones(struct fw3_state *state, struct uci_package *p)
}
setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
}
setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
- setbit(zone->flags[0],
fw3_to_src_target(zone->policy_forward)
);
+ setbit(zone->flags[0],
zone->policy_forward
);
setbit(zone->flags[0], zone->policy_output);
setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
setbit(zone->flags[0], zone->policy_output);
setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
- setbit(zone->flags[1],
fw3_to_src_target(zone->policy_forward)
);
+ setbit(zone->flags[1],
zone->policy_forward
);
setbit(zone->flags[1], zone->policy_output);
list_add_tail(&zone->list, &state->zones);
setbit(zone->flags[1], zone->policy_output);
list_add_tail(&zone->list, &state->zones);
@@
-491,7
+495,7
@@
print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
r = fw3_ipt_rule_new(handle);
fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
r = fw3_ipt_rule_new(handle);
- fw3_ipt_rule_target(r, "zone_%s_
src
_%s", zone->name,
+ fw3_ipt_rule_target(r, "zone_%s_
dest
_%s", zone->name,
fw3_flag_names[zone->policy_forward]);
fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
fw3_flag_names[zone->policy_forward]);
fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
@@
-674,11
+678,11
@@
fw3_lookup_zone(struct fw3_state *state, const char *name)
}
struct list_head *
}
struct list_head *
-fw3_resolve_zone_addresses(struct fw3_zone *zone)
+fw3_resolve_zone_addresses(struct fw3_zone *zone
, struct fw3_address *addr
)
{
struct fw3_device *net;
{
struct fw3_device *net;
- struct fw3_address *
add
r, *tmp;
- struct list_head *a
ddrs, *a
ll;
+ struct fw3_address *
cu
r, *tmp;
+ struct list_head *all;
all = calloc(1, sizeof(*all));
if (!all)
all = calloc(1, sizeof(*all));
if (!all)
@@
-686,31
+690,31
@@
fw3_resolve_zone_addresses(struct fw3_zone *zone)
INIT_LIST_HEAD(all);
INIT_LIST_HEAD(all);
-
list_for_each_entry(net, &zone->networks, lis
t)
+
if (addr && addr->se
t)
{
{
- addrs = fw3_ubus_address(net->name);
-
- if (!addrs)
- continue;
+ tmp = malloc(sizeof(*tmp));
-
list_for_each_entry_safe(addr, tmp, addrs, list
)
+
if (tmp
)
{
{
-
list_del(&addr->list)
;
- list_add_tail(&
addr
->list, all);
+
*tmp = *addr
;
+ list_add_tail(&
tmp
->list, all);
}
}
-
- free(addrs);
}
}
-
- list_for_each_entry(addr, &zone->subnets, list)
+ else
{
{
- tmp = malloc(sizeof(*tmp));
+ list_for_each_entry(net, &zone->networks, list)
+ fw3_ubus_address(all, net->name);
- if (!tmp)
- continue;
+ list_for_each_entry(cur, &zone->subnets, list)
+ {
+ tmp = malloc(sizeof(*tmp));
+
+ if (!tmp)
+ continue;
- memcpy(tmp, addr, sizeof(*tmp));
- list_add_tail(&tmp->list, all);
+ *tmp = *cur;
+ list_add_tail(&tmp->list, all);
+ }
}
return all;
}
return all;