projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetic output changes
[project/firewall3.git]
/
utils.c
diff --git
a/utils.c
b/utils.c
index
9b383a3
..
2747a85
100644
(file)
--- a/
utils.c
+++ b/
utils.c
@@
-405,7
+405,7
@@
fw3_read_statefile(void *state)
list_add_tail(&zone->list, &s->zones);
}
list_add_tail(&zone->list, &s->zones);
}
- zone->running_
dst_
flags = flags;
+ zone->running_flags = flags;
list_add_tail(&zone->running_list, &s->running_zones);
break;
list_add_tail(&zone->running_list, &s->running_zones);
break;
@@
-441,9
+441,7
@@
fw3_write_statefile(void *state)
struct fw3_zone *z;
struct fw3_ipset *i;
struct fw3_zone *z;
struct fw3_ipset *i;
- int mask = (1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6);
-
- if (!(d->flags & mask))
+ if (fw3_no_family(d))
{
if (unlink(FW3_STATEFILE))
warn("Unable to remove state %s: %s",
{
if (unlink(FW3_STATEFILE))
warn("Unable to remove state %s: %s",
@@
-464,7
+462,7
@@
fw3_write_statefile(void *state)
list_for_each_entry(z, &s->running_zones, running_list)
{
list_for_each_entry(z, &s->running_zones, running_list)
{
- fprintf(sf, "%x %s %x\n", FW3_TYPE_ZONE, z->name, z->
dst_
flags);
+ fprintf(sf, "%x %s %x\n", FW3_TYPE_ZONE, z->name, z->flags);
}
list_for_each_entry(i, &s->running_ipsets, running_list)
}
list_for_each_entry(i, &s->running_ipsets, running_list)