X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=2747a853a8b99f9b4e021b2c867092f8fd4d3156;hp=9b383a35a414e764cad51a2b8d833deb3bb66b0d;hb=e791a6a39a4f06b33fedaefe03a42354f3a85b6d;hpb=61cc1d220c95168faf24bececc752a5af7ce6431 diff --git a/utils.c b/utils.c index 9b383a3..2747a85 100644 --- a/utils.c +++ b/utils.c @@ -405,7 +405,7 @@ fw3_read_statefile(void *state) 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; @@ -441,9 +441,7 @@ fw3_write_statefile(void *state) 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", @@ -464,7 +462,7 @@ fw3_write_statefile(void *state) 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)