projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also read addresses from "ipv6-prefix-assignment" ifstatus table
[project/firewall3.git]
/
ipsets.c
diff --git
a/ipsets.c
b/ipsets.c
index
62877c8
..
48aaa9c
100644
(file)
--- a/
ipsets.c
+++ b/
ipsets.c
@@
-296,7
+296,7
@@
create_ipset(struct fw3_ipset *ipset, struct fw3_state *state)
if (ipset->external && *ipset->external)
return;
if (ipset->external && *ipset->external)
return;
- info("Creating ipset %s", ipset->name);
+ info("
*
Creating ipset %s", ipset->name);
first = true;
fw3_pr("create %s %s", ipset->name, methods[ipset->method]);
first = true;
fw3_pr("create %s %s", ipset->name, methods[ipset->method]);
@@
-373,22
+373,17
@@
fw3_create_ipsets(struct fw3_state *state)
}
void
}
void
-fw3_destroy_ipsets(struct fw3_state *state)
+fw3_destroy_ipsets(struct fw3_state *state
, enum fw3_family family
)
{
struct fw3_ipset *s, *tmp;
{
struct fw3_ipset *s, *tmp;
- int mask = (1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6);
list_for_each_entry_safe(s, tmp, &state->running_ipsets, running_list)
{
list_for_each_entry_safe(s, tmp, &state->running_ipsets, running_list)
{
- if (!hasbit(state->defaults.flags, FW3_FAMILY_V4))
- delbit(s->flags, FW3_FAMILY_V4);
+ del(s->flags, family, family);
- if (!hasbit(state->defaults.flags, FW3_FAMILY_V6))
- delbit(s->flags, FW3_FAMILY_V6);
-
- if (!(s->flags & mask))
+ if (fw3_no_family(s->flags[family == FW3_FAMILY_V6]))
{
{
- info("Deleting ipset %s", s->name);
+ info("
*
Deleting ipset %s", s->name);
fw3_pr("flush %s\n", s->name);
fw3_pr("destroy %s\n", s->name);
fw3_pr("flush %s\n", s->name);
fw3_pr("destroy %s\n", s->name);