From 964b303f7784fac1ab453c96117bb7485daccc9b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 30 Apr 2013 20:59:35 +0200 Subject: Don't track family of ipsets --- utils.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'utils.c') diff --git a/utils.c b/utils.c index 3558450..aef1cc6 100644 --- a/utils.c +++ b/utils.c @@ -490,8 +490,6 @@ static void write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s, struct uci_package *dest) { - enum fw3_family fam = FW3_FAMILY_ANY; - char buf[sizeof("0xffffffff\0")]; struct uci_ptr ptr = { .p = dest }; @@ -499,13 +497,6 @@ write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s, if (!s->enabled || (s->external && *s->external)) return; - if (fw3_no_family(s->flags[0]) && !fw3_no_family(s->flags[1])) - fam = FW3_FAMILY_V6; - else if (!fw3_no_family(s->flags[0]) && fw3_no_family(s->flags[1])) - fam = FW3_FAMILY_V4; - else if (fw3_no_family(s->flags[0]) && fw3_no_family(s->flags[1])) - return; - uci_add_section(ctx, dest, "ipset", &ptr.s); ptr.o = NULL; @@ -513,14 +504,6 @@ write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s, ptr.value = s->name; uci_set(ctx, &ptr); - if (fam != FW3_FAMILY_ANY) - { - ptr.o = NULL; - ptr.option = "family"; - ptr.value = fw3_flag_names[fam]; - uci_set(ctx, &ptr); - } - sprintf(buf, "0x%x", s->flags[0]); ptr.o = NULL; ptr.option = "__flags_v4"; -- cgit v1.2.1