X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.c;h=7d91452ff6f455cd3551a08cbe38c1d1590109b3;hp=9565f8d1746dc2138600d8000ff4221bcccf7c74;hb=098b7d6add425aadb0cfe5af34c5d88d5320d33f;hpb=7b63363c22a62e14d05f41c418b98fe4b45db9c3

diff --git a/iptables.c b/iptables.c
index 9565f8d..7d91452 100644
--- a/iptables.c
+++ b/iptables.c
@@ -22,7 +22,6 @@
 static struct option base_opts[] = {
 	{ .name = "match",  .has_arg = 1, .val = 'm' },
 	{ .name = "jump",   .has_arg = 1, .val = 'j' },
-	{ .name = "append", .has_arg = 1, .val = 'A' },
 	{ NULL }
 };
 
@@ -54,8 +53,13 @@ get_kernel_version(void)
 	kernel_version = 0x10000 * x + 0x100 * y + z;
 }
 
+#ifdef DISABLE_IPV6
+#undef __ipt_module
+#define __ipt_module(x) libxt_##x##_init, libipt_##x##_init,
+#else
 #undef __ipt_module
 #define __ipt_module(x) libxt_##x##_init, libipt_##x##_init, libip6t_##x##_init,
+#endif
 
 static void fw3_init_extensions(void)
 {
@@ -78,12 +82,14 @@ fw3_ipt_open(enum fw3_family family, enum fw3_table table)
 
 	if (family == FW3_FAMILY_V6)
 	{
+#ifndef DISABLE_IPV6
 		h->family = FW3_FAMILY_V6;
 		h->table  = table;
 		h->handle = ip6tc_init(fw3_flag_names[table]);
 
 		xtables_set_params(&xtg6);
 		xtables_set_nfproto(NFPROTO_IPV6);
+#endif
 	}
 	else
 	{
@@ -127,43 +133,38 @@ fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
 	if (fw3_pr_debug)
 		debug(h, "-P %s %s\n", chain, fw3_flag_names[policy]);
 
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
 		ip6tc_set_policy(chain, fw3_flag_names[policy], NULL, h->handle);
 	else
+#endif
 		iptc_set_policy(chain, fw3_flag_names[policy], NULL, h->handle);
 }
 
 void
-fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain)
+fw3_ipt_flush_chain(struct fw3_ipt_handle *h, const char *chain)
 {
 	if (fw3_pr_debug)
-	{
 		debug(h, "-F %s\n", chain);
-		debug(h, "-X %s\n", chain);
-	}
 
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
-	{
-		if (ip6tc_flush_entries(chain, h->handle))
-			ip6tc_delete_chain(chain, h->handle);
-	}
+		ip6tc_flush_entries(chain, h->handle);
 	else
-	{
-		if (iptc_flush_entries(chain, h->handle))
-			iptc_delete_chain(chain, h->handle);
-	}
+#endif
+		iptc_flush_entries(chain, h->handle);
 }
 
-void
-fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
+static void
+delete_rules(struct fw3_ipt_handle *h, const char *target)
 {
 	unsigned int num;
 	const struct ipt_entry *e;
-	const struct ip6t_entry *e6;
 	const char *chain;
 	const char *t;
 	bool found;
 
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
 	{
 		for (chain = ip6tc_first_chain(h->handle);
@@ -173,6 +174,7 @@ fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
 			do {
 				found = false;
 
+				const struct ip6t_entry *e6;
 				for (num = 0, e6 = ip6tc_first_rule(chain, h->handle);
 					 e6 != NULL;
 					 num++, e6 = ip6tc_next_rule(e6, h->handle))
@@ -193,6 +195,7 @@ fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
 		}
 	}
 	else
+#endif
 	{
 		for (chain = iptc_first_chain(h->handle);
 		     chain != NULL;
@@ -223,6 +226,22 @@ fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
 }
 
 void
+fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain)
+{
+	delete_rules(h, chain);
+
+	if (fw3_pr_debug)
+		debug(h, "-X %s\n", chain);
+
+#ifndef DISABLE_IPV6
+	if (h->family == FW3_FAMILY_V6)
+		ip6tc_delete_chain(chain, h->handle);
+	else
+#endif
+		iptc_delete_chain(chain, h->handle);
+}
+
+void
 fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...)
 {
 	char buf[32];
@@ -243,6 +262,7 @@ fw3_ipt_flush(struct fw3_ipt_handle *h)
 {
 	const char *chain;
 
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
 	{
 		for (chain = ip6tc_first_chain(h->handle);
@@ -260,6 +280,7 @@ fw3_ipt_flush(struct fw3_ipt_handle *h)
 		}
 	}
 	else
+#endif
 	{
 		for (chain = iptc_first_chain(h->handle);
 		     chain != NULL;
@@ -282,17 +303,34 @@ fw3_ipt_commit(struct fw3_ipt_handle *h)
 {
 	int rv;
 
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
 	{
 		rv = ip6tc_commit(h->handle);
 		if (!rv)
-			fprintf(stderr, "ip6tc_commit(): %s\n", ip6tc_strerror(errno));
+			warn("ip6tc_commit(): %s", ip6tc_strerror(errno));
 	}
 	else
+#endif
 	{
 		rv = iptc_commit(h->handle);
 		if (!rv)
-			fprintf(stderr, "iptc_commit(): %s\n", iptc_strerror(errno));
+			warn("iptc_commit(): %s", iptc_strerror(errno));
+	}
+}
+
+void
+fw3_ipt_close(struct fw3_ipt_handle *h)
+{
+	if (h->libv)
+	{
+		while (h->libc > 0)
+		{
+			h->libc--;
+			dlclose(h->libv[h->libc]);
+		}
+
+		free(h->libv);
 	}
 
 	free(h);
@@ -316,9 +354,11 @@ fw3_ipt_rule_new(struct fw3_ipt_handle *h)
 static bool
 is_chain(struct fw3_ipt_handle *h, const char *name)
 {
+#ifndef DISABLE_IPV6
 	if (h->family == FW3_FAMILY_V6)
 		return ip6tc_is_chain(name, h->handle);
 	else
+#endif
 		return iptc_is_chain(name, h->handle);
 }
 
@@ -335,10 +375,45 @@ get_protoname(struct fw3_ipt_rule *r)
 	return NULL;
 }
 
+static bool
+load_extension(struct fw3_ipt_handle *h, const char *name)
+{
+	char path[256];
+	void *lib, **tmp;
+	const char *pfx = (h->family == FW3_FAMILY_V6) ? "libip6t" : "libipt";
+
+	snprintf(path, sizeof(path), "/usr/lib/iptables/libxt_%s.so", name);
+	if (!(lib = dlopen(path, RTLD_NOW)))
+	{
+		snprintf(path, sizeof(path), "/usr/lib/iptables/%s_%s.so", pfx, name);
+		lib = dlopen(path, RTLD_NOW);
+	}
+
+	if (!lib)
+		return false;
+
+	tmp = realloc(h->libv, sizeof(lib) * (h->libc + 1));
+
+	if (!tmp)
+		return false;
+
+	h->libv = tmp;
+	h->libv[h->libc++] = lib;
+
+	return true;
+}
+
 static struct xtables_match *
 find_match(struct fw3_ipt_rule *r, const char *name)
 {
-	return xtables_find_match(name, XTF_TRY_LOAD, &r->matches);
+	struct xtables_match *m;
+
+	m = xtables_find_match(name, XTF_DONT_LOAD, &r->matches);
+
+	if (!m && load_extension(r->h, name))
+		m = xtables_find_match(name, XTF_DONT_LOAD, &r->matches);
+
+	return m;
 }
 
 static void
@@ -398,18 +473,29 @@ load_protomatch(struct fw3_ipt_rule *r)
 }
 
 static struct xtables_target *
+find_target(struct fw3_ipt_rule *r, const char *name)
+{
+	struct xtables_target *t;
+
+	if (is_chain(r->h, name))
+		return xtables_find_target(XT_STANDARD_TARGET, XTF_LOAD_MUST_SUCCEED);
+
+	t = xtables_find_target(name, XTF_DONT_LOAD);
+
+	if (!t && load_extension(r->h, name))
+		t = xtables_find_target(name, XTF_DONT_LOAD);
+
+	return t;
+}
+
+static struct xtables_target *
 get_target(struct fw3_ipt_rule *r, const char *name)
 {
 	size_t s;
 	struct xtables_target *t;
 	struct xtables_globals *g;
 
-	bool chain = is_chain(r->h, name);
-
-	if (chain)
-		t = xtables_find_target(XT_STANDARD_TARGET, XTF_LOAD_MUST_SUCCEED);
-	else
-		t = xtables_find_target(name, XTF_TRY_LOAD);
+	t = find_target(r, name);
 
 	if (!t)
 		return NULL;
@@ -447,6 +533,7 @@ fw3_ipt_rule_proto(struct fw3_ipt_rule *r, struct fw3_protocol *proto)
 
 	pr = proto->protocol;
 
+#ifndef DISABLE_IPV6
 	if (r->h->family == FW3_FAMILY_V6)
 	{
 		if (pr == 1)
@@ -459,6 +546,7 @@ fw3_ipt_rule_proto(struct fw3_ipt_rule *r, struct fw3_protocol *proto)
 			r->e6.ipv6.invflags |= XT_INV_PROTO;
 	}
 	else
+#endif
 	{
 		r->e.ip.proto = pr;
 
@@ -473,6 +561,7 @@ void
 fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
                     struct fw3_device *in, struct fw3_device *out)
 {
+#ifndef DISABLE_IPV6
 	if (r->h->family == FW3_FAMILY_V6)
 	{
 		if (in && !in->any)
@@ -494,6 +583,7 @@ fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
 		}
 	}
 	else
+#endif
 	{
 		if (in && !in->any)
 		{
@@ -519,9 +609,13 @@ fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
 static void
 ip4prefix2mask(int prefix, struct in_addr *mask)
 {
-	mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+	if (prefix > 0)
+		mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+	else
+		mask->s_addr = 0;
 }
 
+#ifndef DISABLE_IPV6
 static void
 ip6prefix2mask(int prefix, struct in6_addr *mask)
 {
@@ -538,13 +632,12 @@ ip6prefix2mask(int prefix, struct in6_addr *mask)
 		memset(mask, 0, sizeof(*mask));
 	}
 }
+#endif
 
 void
 fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
                       struct fw3_address *src, struct fw3_address *dest)
 {
-	int i;
-
 	if ((src && src->range) || (dest && dest->range))
 	{
 		fw3_ipt_rule_addarg(r, false, "-m", "iprange");
@@ -557,17 +650,20 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 			fw3_ipt_rule_addarg(r, src->invert, "--src-range",
 			                    fw3_address_to_string(src, false));
 		}
+#ifndef DISABLE_IPV6
 		else if (r->h->family == FW3_FAMILY_V6)
 		{
 			r->e6.ipv6.src = src->address.v6;
 			ip6prefix2mask(src->mask, &r->e6.ipv6.smsk);
 
+			int i;
 			for (i = 0; i < 4; i++)
 				r->e6.ipv6.src.s6_addr32[i] &= r->e6.ipv6.smsk.s6_addr32[i];
 
 			if (src->invert)
 				r->e6.ipv6.invflags |= IP6T_INV_SRCIP;
 		}
+#endif
 		else
 		{
 			r->e.ip.src = src->address.v4;
@@ -587,17 +683,20 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 			fw3_ipt_rule_addarg(r, dest->invert, "--dst-range",
 			                    fw3_address_to_string(dest, false));
 		}
+#ifndef DISABLE_IPV6
 		else if (r->h->family == FW3_FAMILY_V6)
 		{
 			r->e6.ipv6.dst = dest->address.v6;
 			ip6prefix2mask(dest->mask, &r->e6.ipv6.dmsk);
 
+			int i;
 			for (i = 0; i < 4; i++)
 				r->e6.ipv6.dst.s6_addr32[i] &= r->e6.ipv6.dmsk.s6_addr32[i];
 
 			if (dest->invert)
 				r->e6.ipv6.invflags |= IP6T_INV_DSTIP;
 		}
+#endif
 		else
 		{
 			r->e.ip.dst = dest->address.v4;
@@ -662,6 +761,7 @@ fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp)
 	if (!icmp)
 		return;
 
+#ifndef DISABLE_IPV6
 	if (r->h->family == FW3_FAMILY_V6)
 	{
 		if (icmp->code6_min == 0 && icmp->code6_max == 0xFF)
@@ -672,6 +772,7 @@ fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp)
 		fw3_ipt_rule_addarg(r, icmp->invert, "--icmpv6-type", buf);
 	}
 	else
+#endif
 	{
 		if (icmp->code_min == 0 && icmp->code_max == 0xFF)
 			sprintf(buf, "%u", icmp->type);
@@ -703,29 +804,35 @@ fw3_ipt_rule_limit(struct fw3_ipt_rule *r, struct fw3_limit *limit)
 }
 
 void
-fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_ipset *ipset,
-                   bool invert)
+fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_setmatch *match)
 {
 	char buf[sizeof("dst,dst,dst\0")];
 	char *p = buf;
+	int i = 0;
 
+	struct fw3_ipset *set;
 	struct fw3_ipset_datatype *type;
 
-	if (!ipset)
+	if (!match || !match->set || !match->ptr)
 		return;
 
-	list_for_each_entry(type, &ipset->datatypes, list)
+	set = match->ptr;
+	list_for_each_entry(type, &set->datatypes, list)
 	{
+		if (i >= 3)
+			break;
+
 		if (p > buf)
 			*p++ = ',';
 
-		p += sprintf(p, "%s", type->dest ? "dst" : "src");
+		p += sprintf(p, "%s", match->dir[i] ? match->dir[i] : type->dir);
+		i++;
 	}
 
 	fw3_ipt_rule_addarg(r, false, "-m", "set");
 
-	fw3_ipt_rule_addarg(r, invert, "--match-set",
-	                    ipset->external ? ipset->external : ipset->name);
+	fw3_ipt_rule_addarg(r, match->invert, "--match-set",
+	                    set->external ? set->external : set->name);
 
 	fw3_ipt_rule_addarg(r, false, buf, NULL);
 }
@@ -876,6 +983,7 @@ fw3_ipt_rule_extra(struct fw3_ipt_rule *r, const char *extra)
 	free(s);
 }
 
+#ifndef DISABLE_IPV6
 static void
 rule_print6(struct ip6t_entry *e)
 {
@@ -929,6 +1037,7 @@ rule_print6(struct ip6t_entry *e)
 		                    xtables_ip6mask_to_cidr(&e->ipv6.dmsk));
 	}
 }
+#endif
 
 static void
 rule_print4(struct ipt_entry *e)
@@ -986,36 +1095,19 @@ rule_print4(struct ipt_entry *e)
 }
 
 static void
-rule_print(struct fw3_ipt_rule *r, const char *chain)
+rule_print(struct fw3_ipt_rule *r, const char *prefix, const char *chain)
 {
-	struct xtables_rule_match *rm;
-	struct xtables_match *m;
-	struct xtables_target *t;
-
-	debug(r->h, "-A %s", chain);
+	debug(r->h, "%s %s", prefix, chain);
 
+#ifndef DISABLE_IPV6
 	if (r->h->family == FW3_FAMILY_V6)
 		rule_print6(&r->e6);
 	else
+#endif
 		rule_print4(&r->e);
 
-	for (rm = r->matches; rm; rm = rm->next)
-	{
-		m = rm->match;
-		printf(" -m %s", fw3_xt_get_match_name(m));
-
-		if (m->save)
-			m->save(&r->e.ip, m->m);
-	}
-
-	if (r->target)
-	{
-		t = r->target;
-		printf(" -j %s", fw3_xt_get_target_name(t));
-
-		if (t->save)
-			t->save(&r->e.ip, t->t);
-	}
+	fw3_xt_print_matches(&r->e.ip, r->matches);
+	fw3_xt_print_target(&r->e.ip, r->target);
 
 	printf("\n");
 }
@@ -1063,12 +1155,10 @@ parse_option(struct fw3_ipt_rule *r, int optc, bool inv)
 	}
 
 	if (optc == ':')
-		fprintf(stderr, "parse_option(): option '%s' needs argument\n",
-		        r->argv[optind-1]);
+		warn("parse_option(): option '%s' needs argument", r->argv[optind-1]);
 
 	if (optc == '?')
-		fprintf(stderr, "parse_option(): unknown option '%s'\n",
-		        r->argv[optind-1]);
+		warn("parse_option(): unknown option '%s'", r->argv[optind-1]);
 
 	return false;
 }
@@ -1100,16 +1190,139 @@ fw3_ipt_rule_addarg(struct fw3_ipt_rule *r, bool inv,
 		r->argv[r->argc++] = fw3_strdup(v);
 }
 
-void
-fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
+static unsigned char *
+rule_mask(struct fw3_ipt_rule *r)
 {
 	size_t s;
+	unsigned char *p, *mask = NULL;
+	struct xtables_rule_match *m;
+
+#define SZ(x) XT_ALIGN(sizeof(struct x))
+
+#ifndef DISABLE_IPV6
+	if (r->h->family == FW3_FAMILY_V6)
+	{
+		s = SZ(ip6t_entry);
+
+		for (m = r->matches; m; m = m->next)
+			s += SZ(ip6t_entry_match) + m->match->size;
+
+		s += SZ(ip6t_entry_target) + r->target->size;
+
+		mask = fw3_alloc(s);
+		memset(mask, 0xFF, SZ(ip6t_entry));
+		p = mask + SZ(ip6t_entry);
+
+		for (m = r->matches; m; m = m->next)
+		{
+			memset(p, 0xFF, SZ(ip6t_entry_match) + m->match->userspacesize);
+			p += SZ(ip6t_entry_match) + m->match->size;
+		}
+
+		memset(p, 0xFF, SZ(ip6t_entry_target) + r->target->userspacesize);
+	}
+	else
+#endif
+	{
+		s = SZ(ipt_entry);
+
+		for (m = r->matches; m; m = m->next)
+			s += SZ(ipt_entry_match) + m->match->size;
+
+		s += SZ(ipt_entry_target) + r->target->size;
+
+		mask = fw3_alloc(s);
+		memset(mask, 0xFF, SZ(ipt_entry));
+		p = mask + SZ(ipt_entry);
+
+		for (m = r->matches; m; m = m->next)
+		{
+			memset(p, 0xFF, SZ(ipt_entry_match) + m->match->userspacesize);
+			p += SZ(ipt_entry_match) + m->match->size;
+		}
+
+		memset(p, 0xFF, SZ(ipt_entry_target) + r->target->userspacesize);
+	}
+
+	return mask;
+}
+
+static void *
+rule_build(struct fw3_ipt_rule *r)
+{
+	size_t s;
+	struct xtables_rule_match *m;
+
+#ifndef DISABLE_IPV6
+	if (r->h->family == FW3_FAMILY_V6)
+	{
+		struct ip6t_entry *e6;
+
+		s = XT_ALIGN(sizeof(struct ip6t_entry));
+
+		for (m = r->matches; m; m = m->next)
+			s += m->match->m->u.match_size;
+
+		e6 = fw3_alloc(s + r->target->t->u.target_size);
+
+		memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
+
+		e6->target_offset = s;
+		e6->next_offset = s + r->target->t->u.target_size;
+
+		s = 0;
+
+		for (m = r->matches; m; m = m->next)
+		{
+			memcpy(e6->elems + s, m->match->m, m->match->m->u.match_size);
+			s += m->match->m->u.match_size;
+		}
+
+		memcpy(e6->elems + s, r->target->t, r->target->t->u.target_size);
+
+		return e6;
+	}
+	else
+#endif
+	{
+		struct ipt_entry *e;
+
+		s = XT_ALIGN(sizeof(struct ipt_entry));
+
+		for (m = r->matches; m; m = m->next)
+			s += m->match->m->u.match_size;
+
+		e = fw3_alloc(s + r->target->t->u.target_size);
+
+		memcpy(e, &r->e, sizeof(struct ipt_entry));
+
+		e->target_offset = s;
+		e->next_offset = s + r->target->t->u.target_size;
+
+		s = 0;
+
+		for (m = r->matches; m; m = m->next)
+		{
+			memcpy(e->elems + s, m->match->m, m->match->m->u.match_size);
+			s += m->match->m->u.match_size;
+		}
+
+		memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
+
+		return e;
+	}
+}
+
+void
+__fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl, const char *fmt, ...)
+{
+	void *rule;
+	unsigned char *mask;
+
 	struct xtables_rule_match *m;
 	struct xtables_match *em;
 	struct xtables_target *et;
 	struct xtables_globals *g;
-	struct ipt_entry *e;
-	struct ip6t_entry *e6;
 
 	int i, optc;
 	bool inv = false;
@@ -1126,7 +1339,8 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 	optind = 0;
 	opterr = 0;
 
-	while ((optc = getopt_long(r->argc, r->argv, "m:j:", g->opts, NULL)) != -1)
+	while ((optc = getopt_long(r->argc, r->argv, "-:m:j:", g->opts,
+	                           NULL)) != -1)
 	{
 		switch (optc)
 		{
@@ -1135,7 +1349,7 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 
 			if (!em)
 			{
-				fprintf(stderr, "fw3_ipt_rule_append(): Can't find match '%s'\n", optarg);
+				warn("fw3_ipt_rule_append(): Can't find match '%s'", optarg);
 				goto free;
 			}
 
@@ -1147,7 +1361,7 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 
 			if (!et)
 			{
-				fprintf(stderr, "fw3_ipt_rule_append(): Can't find target '%s'\n", optarg);
+				warn("fw3_ipt_rule_append(): Can't find target '%s'", optarg);
 				goto free;
 			}
 
@@ -1156,12 +1370,13 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 		case 1:
 			if ((optarg[0] == '!') && (optarg[1] == '\0'))
 			{
+				optarg[0] = '\0';
 				inv = true;
 				continue;
 			}
 
-			fprintf(stderr, "fw3_ipt_rule_append(): Bad argument '%s'\n", optarg);
-			return;
+			warn("fw3_ipt_rule_append(): Bad argument '%s'", optarg);
+			goto free;
 
 		default:
 			if (parse_option(r, optc, inv))
@@ -1178,65 +1393,51 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 	if (r->target)
 		xtables_option_tfcall(r->target);
 
-	if (fw3_pr_debug)
-		rule_print(r, buf);
+	rule = rule_build(r);
 
+#ifndef DISABLE_IPV6
 	if (r->h->family == FW3_FAMILY_V6)
 	{
-		s = XT_ALIGN(sizeof(struct ip6t_entry));
-
-		for (m = r->matches; m; m = m->next)
-			s += m->match->m->u.match_size;
-
-		e6 = fw3_alloc(s + r->target->t->u.target_size);
-
-		memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
-
-		e6->target_offset = s;
-		e6->next_offset = s + r->target->t->u.target_size;
+		if (repl)
+		{
+			mask = rule_mask(r);
 
-		s = 0;
+			while (ip6tc_delete_entry(buf, rule, mask, r->h->handle))
+				if (fw3_pr_debug)
+					rule_print(r, "-D", buf);
 
-		for (m = r->matches; m; m = m->next)
-		{
-			memcpy(e6->elems + s, m->match->m, m->match->m->u.match_size);
-			s += m->match->m->u.match_size;
+			free(mask);
 		}
 
-		memcpy(e6->elems + s, r->target->t, r->target->t->u.target_size);
-		ip6tc_append_entry(buf, e6, r->h->handle);
-		free(e6);
+		if (fw3_pr_debug)
+			rule_print(r, "-A", buf);
+
+		if (!ip6tc_append_entry(buf, rule, r->h->handle))
+			warn("ip6tc_append_entry(): %s", ip6tc_strerror(errno));
 	}
 	else
+#endif
 	{
-		s = XT_ALIGN(sizeof(struct ipt_entry));
-
-		for (m = r->matches; m; m = m->next)
-			s += m->match->m->u.match_size;
-
-		e = fw3_alloc(s + r->target->t->u.target_size);
-
-		memcpy(e, &r->e, sizeof(struct ipt_entry));
-
-		e->target_offset = s;
-		e->next_offset = s + r->target->t->u.target_size;
+		if (repl)
+		{
+			mask = rule_mask(r);
 
-		s = 0;
+			while (iptc_delete_entry(buf, rule, mask, r->h->handle))
+				if (fw3_pr_debug)
+					rule_print(r, "-D", buf);
 
-		for (m = r->matches; m; m = m->next)
-		{
-			memcpy(e->elems + s, m->match->m, m->match->m->u.match_size);
-			s += m->match->m->u.match_size;
+			free(mask);
 		}
 
-		memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
-
-		if (!iptc_append_entry(buf, e, r->h->handle))
-			fprintf(stderr, "iptc_append_entry(): %s\n", iptc_strerror(errno));
+		if (fw3_pr_debug)
+			rule_print(r, "-A", buf);
 
-		free(e);
+		if (!iptc_append_entry(buf, rule, r->h->handle))
+			warn("iptc_append_entry(): %s\n", iptc_strerror(errno));
 	}
 
+	free(rule);
+
 free:
 	for (i = 1; i < r->argc; i++)
 		free(r->argv[i]);