X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.c;h=96fba12f0e90fb45baadae7fc597226cafd006ea;hp=2fc8d36fec329b08ad8c9887237ea82d55ef30a7;hb=47b23946cb2d51c486cd01596744955f850e2060;hpb=2dbfd733c34311df6217da809c0045c195ba8b9e

diff --git a/iptables.c b/iptables.c
index 2fc8d36..96fba12 100644
--- a/iptables.c
+++ b/iptables.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -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,22 +53,14 @@ 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)
 {
-	int i;
-	void (*initfuncs[])(void) = { FW3_IPT_MODULES };
+	init_extensions();
+	init_extensions4();
 
-	for (i = 0; i < sizeof(initfuncs)/sizeof(initfuncs[0]); i++)
-		if (initfuncs[i])
-			initfuncs[i]();
+#ifndef DISABLE_IPV6
+	init_extensions6();
+#endif
 }
 
 struct fw3_ipt_handle *
@@ -143,30 +134,21 @@ fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
 }
 
 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
 #endif
-	{
-		if (iptc_flush_entries(chain, h->handle))
-			iptc_delete_chain(chain, h->handle);
-	}
+		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;
@@ -236,6 +218,112 @@ 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);
+}
+
+static int
+get_rule_id(const void *base, unsigned int start, unsigned int end)
+{
+	uint32_t id;
+	unsigned int i;
+	const struct xt_entry_match *em;
+
+	for (i = start; i < end; i += em->u.match_size)
+	{
+		em = base + i;
+
+		if (strcmp(em->u.user.name, "id"))
+			continue;
+
+		memcpy(&id, em->data, sizeof(id));
+
+		if ((id & FW3_ID_MASK) != FW3_ID_MAGIC)
+			continue;
+
+		return (id & ~FW3_ID_MASK);
+	}
+
+	return -1;
+}
+
+void
+fw3_ipt_delete_id_rules(struct fw3_ipt_handle *h, const char *chain)
+{
+	unsigned int num;
+	const struct ipt_entry *e;
+	bool found;
+	int id;
+
+#ifndef DISABLE_IPV6
+	if (h->family == FW3_FAMILY_V6)
+	{
+		if (!ip6tc_is_chain(chain, h->handle))
+			return;
+
+		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))
+			{
+				id = get_rule_id(e6, sizeof(*e6), e6->target_offset);
+
+				if (id >= 0)
+				{
+					if (fw3_pr_debug)
+						debug(h, "-D %s %u\n", chain, num + 1);
+
+					ip6tc_delete_num_entry(chain, num, h->handle);
+					found = true;
+					break;
+				}
+			}
+		} while (found);
+	}
+	else
+#endif
+	{
+		if (!iptc_is_chain(chain, h->handle))
+			return;
+
+		do {
+			found = false;
+
+			for (num = 0, e = iptc_first_rule(chain, h->handle);
+				 e != NULL;
+				 num++, e = iptc_next_rule(e, h->handle))
+			{
+				id = get_rule_id(e, sizeof(*e), e->target_offset);
+
+				if (id >= 0)
+				{
+					if (fw3_pr_debug)
+						debug(h, "-D %s %u\n", chain, num + 1);
+
+					iptc_delete_num_entry(chain, num, h->handle);
+					found = true;
+					break;
+				}
+			}
+		} while (found);
+	}
+}
+
+void
 fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...)
 {
 	char buf[32];
@@ -292,6 +380,69 @@ fw3_ipt_flush(struct fw3_ipt_handle *h)
 	}
 }
 
+static bool
+chain_is_empty(struct fw3_ipt_handle *h, const char *chain)
+{
+#ifndef DISABLE_IPV6
+	if (h->family == FW3_FAMILY_V6)
+		return (!ip6tc_builtin(chain, h->handle) &&
+		        !ip6tc_first_rule(chain, h->handle));
+#endif
+
+	return (!iptc_builtin(chain, h->handle) &&
+	        !iptc_first_rule(chain, h->handle));
+}
+
+void
+fw3_ipt_gc(struct fw3_ipt_handle *h)
+{
+	const char *chain;
+	bool found;
+
+#ifndef DISABLE_IPV6
+	if (h->family == FW3_FAMILY_V6)
+	{
+		do {
+			found = false;
+
+			for (chain = ip6tc_first_chain(h->handle);
+				 chain != NULL;
+				 chain = ip6tc_next_chain(h->handle))
+			{
+				if (!chain_is_empty(h, chain))
+					continue;
+
+				fw3_ipt_delete_chain(h, chain);
+				found = true;
+				break;
+			}
+		} while(found);
+	}
+	else
+#endif
+	{
+		do {
+			found = false;
+
+			for (chain = iptc_first_chain(h->handle);
+				 chain != NULL;
+				 chain = iptc_next_chain(h->handle))
+			{
+				warn("C=%s\n", chain);
+
+				if (!chain_is_empty(h, chain))
+					continue;
+
+				warn("D=%s\n", chain);
+
+				fw3_ipt_delete_chain(h, chain);
+				found = true;
+				break;
+			}
+		} while (found);
+	}
+}
+
 void
 fw3_ipt_commit(struct fw3_ipt_handle *h)
 {
@@ -302,16 +453,20 @@ fw3_ipt_commit(struct fw3_ipt_handle *h)
 	{
 		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)
@@ -334,6 +489,7 @@ fw3_ipt_rule_new(struct fw3_ipt_handle *h)
 	r = fw3_alloc(sizeof(*r));
 
 	r->h = h;
+	r->id = 0;
 	r->argv = fw3_alloc(sizeof(char *));
 	r->argv[r->argc++] = "fw3";
 
@@ -596,31 +752,6 @@ 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));
-}
-
-#ifndef DISABLE_IPV6
-static void
-ip6prefix2mask(int prefix, struct in6_addr *mask)
-{
-	char *p = (char *)mask;
-
-	if (prefix > 0)
-	{
-		memset(p, 0xff, prefix / 8);
-		memset(p + (prefix / 8) + 1, 0, (128 - prefix) / 8);
-		p[prefix / 8] = 0xff << (8 - (prefix & 7));
-	}
-	else
-	{
-		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)
@@ -635,13 +766,13 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 		if (src->range)
 		{
 			fw3_ipt_rule_addarg(r, src->invert, "--src-range",
-			                    fw3_address_to_string(src, false));
+			                    fw3_address_to_string(src, false, 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);
+			r->e6.ipv6.smsk = src->mask.v6;
 
 			int i;
 			for (i = 0; i < 4; i++)
@@ -654,7 +785,7 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 		else
 		{
 			r->e.ip.src = src->address.v4;
-			ip4prefix2mask(src->mask, &r->e.ip.smsk);
+			r->e.ip.smsk = src->mask.v4;
 
 			r->e.ip.src.s_addr &= r->e.ip.smsk.s_addr;
 
@@ -668,13 +799,13 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 		if (dest->range)
 		{
 			fw3_ipt_rule_addarg(r, dest->invert, "--dst-range",
-			                    fw3_address_to_string(dest, false));
+			                    fw3_address_to_string(dest, false, 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);
+			r->e6.ipv6.dmsk = dest->mask.v6;
 
 			int i;
 			for (i = 0; i < 4; i++)
@@ -687,7 +818,7 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 		else
 		{
 			r->e.ip.dst = dest->address.v4;
-			ip4prefix2mask(dest->mask, &r->e.ip.dmsk);
+			r->e.ip.dmsk = dest->mask.v4;
 
 			r->e.ip.dst.s_addr &= r->e.ip.dmsk.s_addr;
 
@@ -731,13 +862,29 @@ fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
 }
 
 void
+fw3_ipt_rule_device(struct fw3_ipt_rule *r, const char *device, bool out)
+{
+	if (device) {
+		struct fw3_device dev = { .any = false };
+		strncpy(dev.name, device, sizeof(dev.name) - 1);
+		fw3_ipt_rule_in_out(r, (out) ? NULL : &dev, (out) ? &dev : NULL);
+	}
+}
+
+void
 fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac)
 {
+	char buf[sizeof("ff:ff:ff:ff:ff:ff\0")];
+	uint8_t *addr = mac->mac.ether_addr_octet;
+
 	if (!mac)
 		return;
 
+	sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
+	        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
 	fw3_ipt_rule_addarg(r, false, "-m", "mac");
-	fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", ether_ntoa(&mac->mac));
+	fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", buf);
 }
 
 void
@@ -791,29 +938,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);
 }
@@ -968,12 +1121,12 @@ fw3_ipt_rule_extra(struct fw3_ipt_rule *r, const char *extra)
 static void
 rule_print6(struct ip6t_entry *e)
 {
-	char buf[INET6_ADDRSTRLEN];
+	char buf1[INET6_ADDRSTRLEN], buf2[INET6_ADDRSTRLEN];
 	char *pname;
 
 	if (e->ipv6.flags & IP6T_F_PROTO)
 	{
-		if (e->ipv6.flags & XT_INV_PROTO)
+		if (e->ipv6.invflags & XT_INV_PROTO)
 			printf(" !");
 
 		pname = get_protoname(container_of(e, struct fw3_ipt_rule, e6));
@@ -986,7 +1139,7 @@ rule_print6(struct ip6t_entry *e)
 
 	if (e->ipv6.iniface[0])
 	{
-		if (e->ipv6.flags & IP6T_INV_VIA_IN)
+		if (e->ipv6.invflags & IP6T_INV_VIA_IN)
 			printf(" !");
 
 		printf(" -i %s", e->ipv6.iniface);
@@ -994,7 +1147,7 @@ rule_print6(struct ip6t_entry *e)
 
 	if (e->ipv6.outiface[0])
 	{
-		if (e->ipv6.flags & IP6T_INV_VIA_OUT)
+		if (e->ipv6.invflags & IP6T_INV_VIA_OUT)
 			printf(" !");
 
 		printf(" -o %s", e->ipv6.outiface);
@@ -1002,20 +1155,22 @@ rule_print6(struct ip6t_entry *e)
 
 	if (memcmp(&e->ipv6.src, &in6addr_any, sizeof(struct in6_addr)))
 	{
-		if (e->ipv6.flags & IP6T_INV_SRCIP)
+		if (e->ipv6.invflags & IP6T_INV_SRCIP)
 			printf(" !");
 
-		printf(" -s %s/%u", inet_ntop(AF_INET6, &e->ipv6.src, buf, sizeof(buf)),
-		                    xtables_ip6mask_to_cidr(&e->ipv6.smsk));
+		printf(" -s %s/%s",
+		       inet_ntop(AF_INET6, &e->ipv6.src, buf1, sizeof(buf1)),
+		       inet_ntop(AF_INET6, &e->ipv6.smsk, buf2, sizeof(buf2)));
 	}
 
 	if (memcmp(&e->ipv6.dst, &in6addr_any, sizeof(struct in6_addr)))
 	{
-		if (e->ipv6.flags & IP6T_INV_DSTIP)
+		if (e->ipv6.invflags & IP6T_INV_DSTIP)
 			printf(" !");
 
-		printf(" -d %s/%u", inet_ntop(AF_INET6, &e->ipv6.dst, buf, sizeof(buf)),
-		                    xtables_ip6mask_to_cidr(&e->ipv6.dmsk));
+		printf(" -d %s/%s",
+		       inet_ntop(AF_INET6, &e->ipv6.dst, buf1, sizeof(buf1)),
+		       inet_ntop(AF_INET6, &e->ipv6.dmsk, buf2, sizeof(buf2)));
 	}
 }
 #endif
@@ -1024,12 +1179,12 @@ static void
 rule_print4(struct ipt_entry *e)
 {
 	struct in_addr in_zero = { 0 };
-	char buf[sizeof("255.255.255.255\0")];
+	char buf1[sizeof("255.255.255.255\0")], buf2[sizeof("255.255.255.255\0")];
 	char *pname;
 
 	if (e->ip.proto)
 	{
-		if (e->ip.flags & XT_INV_PROTO)
+		if (e->ip.invflags & XT_INV_PROTO)
 			printf(" !");
 
 		pname = get_protoname(container_of(e, struct fw3_ipt_rule, e));
@@ -1042,7 +1197,7 @@ rule_print4(struct ipt_entry *e)
 
 	if (e->ip.iniface[0])
 	{
-		if (e->ip.flags & IPT_INV_VIA_IN)
+		if (e->ip.invflags & IPT_INV_VIA_IN)
 			printf(" !");
 
 		printf(" -i %s", e->ip.iniface);
@@ -1050,7 +1205,7 @@ rule_print4(struct ipt_entry *e)
 
 	if (e->ip.outiface[0])
 	{
-		if (e->ip.flags & IPT_INV_VIA_OUT)
+		if (e->ip.invflags & IPT_INV_VIA_OUT)
 			printf(" !");
 
 		printf(" -o %s", e->ip.outiface);
@@ -1058,31 +1213,29 @@ rule_print4(struct ipt_entry *e)
 
 	if (memcmp(&e->ip.src, &in_zero, sizeof(struct in_addr)))
 	{
-		if (e->ip.flags & IPT_INV_SRCIP)
+		if (e->ip.invflags & IPT_INV_SRCIP)
 			printf(" !");
 
-		printf(" -s %s/%u", inet_ntop(AF_INET, &e->ip.src, buf, sizeof(buf)),
-		                    xtables_ipmask_to_cidr(&e->ip.smsk));
+		printf(" -s %s/%s",
+		       inet_ntop(AF_INET, &e->ip.src, buf1, sizeof(buf1)),
+		       inet_ntop(AF_INET, &e->ip.smsk, buf2, sizeof(buf2)));
 	}
 
 	if (memcmp(&e->ip.dst, &in_zero, sizeof(struct in_addr)))
 	{
-		if (e->ip.flags & IPT_INV_DSTIP)
+		if (e->ip.invflags & IPT_INV_DSTIP)
 			printf(" !");
 
-		printf(" -d %s/%u", inet_ntop(AF_INET, &e->ip.dst, buf, sizeof(buf)),
-		                    xtables_ipmask_to_cidr(&e->ip.dmsk));
+		printf(" -d %s/%s",
+		       inet_ntop(AF_INET, &e->ip.dst, buf1, sizeof(buf1)),
+		       inet_ntop(AF_INET, &e->ip.dmsk, buf2, sizeof(buf2)));
 	}
 }
 
 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)
@@ -1091,23 +1244,8 @@ rule_print(struct fw3_ipt_rule *r, const char *chain)
 #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");
 }
@@ -1155,12 +1293,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;
 }
@@ -1192,17 +1328,148 @@ 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);
+		if (r->target)
+			s += 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) ? r->target->userspacesize : 0);
+	}
+	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);
+		if (r->target)
+			s += 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) ? r->target->userspacesize : 0);
+	}
+
+	return mask;
+}
+
+static void *
+rule_build(struct fw3_ipt_rule *r)
+{
+	size_t s, target_size = (r->target) ? r->target->t->u.target_size : 0;
+	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 + target_size);
+
+		memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
+
+		e6->target_offset = s;
+		e6->next_offset = s + 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;
+		}
+
+		if (target_size)
+			memcpy(e6->elems + s, r->target->t, 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 + target_size);
+
+		memcpy(e, &r->e, sizeof(struct ipt_entry));
+
+		e->target_offset = s;
+		e->next_offset = s + 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;
+		}
+
+		if (target_size)
+			memcpy(e->elems + s, r->target->t, 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;
 
 	int i, optc;
+	uint32_t id;
 	bool inv = false;
 	char buf[32];
 	va_list ap;
@@ -1217,7 +1484,26 @@ 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)
+	if (r->id >= 0)
+	{
+		em = find_match(r, "id");
+
+		if (!em)
+		{
+			warn("fw3_ipt_rule_append(): Can't find match '%s'", "id");
+			goto free;
+		}
+
+		init_match(r, em, true);
+
+		id = FW3_ID_MAGIC | (r->id & ~FW3_ID_MASK);
+		memcpy(em->m->data, &id, sizeof(id));
+
+		em->mflags = 1;
+	}
+
+	while ((optc = getopt_long(r->argc, r->argv, "-:m:j:", g->opts,
+	                           NULL)) != -1)
 	{
 		switch (optc)
 		{
@@ -1226,7 +1512,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;
 			}
 
@@ -1238,7 +1524,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;
 			}
 
@@ -1247,12 +1533,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))
@@ -1269,69 +1556,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)
 	{
-		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));
+		if (repl)
+		{
+			mask = rule_mask(r);
 
-		e6->target_offset = s;
-		e6->next_offset = s + r->target->t->u.target_size;
+			while (ip6tc_delete_entry(buf, rule, mask, r->h->handle))
+				if (fw3_pr_debug)
+					rule_print(r, "-D", buf);
 
-		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;
+			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 (fw3_pr_debug)
+			rule_print(r, "-A", buf);
 
-		if (!iptc_append_entry(buf, e, r->h->handle))
-			fprintf(stderr, "iptc_append_entry(): %s\n", iptc_strerror(errno));
-
-		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]);