Keep all basic chains on reload and only flush them, this allows user rules to jump...
[project/firewall3.git] / iptables.c
index f39ed1e..ab3b302 100644 (file)
@@ -39,7 +39,7 @@ static struct xtables_globals xtg6 = {
 };
 
 /* Required by certain extensions like SNAT and DNAT */
-int kernel_version;
+int kernel_version = 0;
 
 void
 get_kernel_version(void)
@@ -51,11 +51,16 @@ get_kernel_version(void)
                sprintf(uts.release, "3.0.0");
 
        sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
-       kernel_version = LINUX_VERSION(x, y, z);
+       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 +83,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
        {
@@ -101,12 +108,7 @@ fw3_ipt_open(enum fw3_family family, enum fw3_table table)
                return NULL;
        }
 
-       xtables_pending_matches = NULL;
-       xtables_pending_targets = NULL;
-
-       xtables_matches = NULL;
-       xtables_targets = NULL;
-
+       fw3_xt_reset();
        fw3_init_extensions();
 
        return h;
@@ -132,43 +134,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);
@@ -178,6 +175,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))
@@ -198,6 +196,7 @@ fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
                }
        }
        else
+#endif
        {
                for (chain = iptc_first_chain(h->handle);
                     chain != NULL;
@@ -228,6 +227,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];
@@ -248,6 +263,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);
@@ -265,6 +281,7 @@ fw3_ipt_flush(struct fw3_ipt_handle *h)
                }
        }
        else
+#endif
        {
                for (chain = iptc_first_chain(h->handle);
                     chain != NULL;
@@ -287,17 +304,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);
@@ -321,9 +355,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);
 }
 
@@ -340,10 +376,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
@@ -358,16 +429,14 @@ init_match(struct fw3_ipt_rule *r, struct xtables_match *m, bool no_clone)
        s = XT_ALIGN(sizeof(struct xt_entry_match)) + m->size;
 
        m->m = fw3_alloc(s);
-       strcpy(m->m->u.user.name, m->real_name ? m->real_name : m->name);
+
+       fw3_xt_set_match_name(m);
+
        m->m->u.user.revision = m->revision;
        m->m->u.match_size = s;
 
        /* free previous userspace data */
-       if (m->udata_size)
-       {
-               free(m->udata);
-               m->udata = fw3_alloc(m->udata_size);
-       }
+       fw3_xt_free_match_udata(m);
 
        if (m->init)
                m->init(m->m);
@@ -378,14 +447,7 @@ init_match(struct fw3_ipt_rule *r, struct xtables_match *m, bool no_clone)
 
        /* merge option table */
        g = (r->h->family == FW3_FAMILY_V6) ? &xtg6 : &xtg;
-
-       if (m->x6_options)
-               g->opts = xtables_options_xfrm(g->orig_opts, g->opts,
-                                                                          m->x6_options, &m->option_offset);
-
-       if (m->extra_opts)
-               g->opts = xtables_merge_options(g->orig_opts, g->opts,
-                                                                               m->extra_opts, &m->option_offset);
+       fw3_xt_merge_match_options(g, m);
 }
 
 static bool
@@ -412,18 +474,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;
@@ -431,32 +504,20 @@ get_target(struct fw3_ipt_rule *r, const char *name)
        s = XT_ALIGN(sizeof(struct xt_entry_target)) + t->size;
        t->t = fw3_alloc(s);
 
-       if (!t->real_name)
-               strcpy(t->t->u.user.name, name);
-       else
-               strcpy(t->t->u.user.name, t->real_name);
+       fw3_xt_set_target_name(t, name);
 
        t->t->u.user.revision = t->revision;
        t->t->u.target_size = s;
 
-       if (t->udata_size)
-       {
-               free(t->udata);
-               t->udata = fw3_alloc(t->udata_size);
-       }
+       /* free previous userspace data */
+       fw3_xt_free_target_udata(t);
 
        if (t->init)
                t->init(t->t);
 
        /* merge option table */
        g = (r->h->family == FW3_FAMILY_V6) ? &xtg6 : &xtg;
-
-       if (t->x6_options)
-               g->opts = xtables_options_xfrm(g->orig_opts, g->opts,
-                                              t->x6_options, &t->option_offset);
-       else
-               g->opts = xtables_merge_options(g->orig_opts, g->opts,
-                                               t->extra_opts, &t->option_offset);
+       fw3_xt_merge_target_options(g, t);
 
        r->target = t;
 
@@ -473,6 +534,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)
@@ -485,6 +547,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;
 
@@ -499,6 +562,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)
@@ -520,6 +584,7 @@ fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
                }
        }
        else
+#endif
        {
                if (in && !in->any)
                {
@@ -548,6 +613,7 @@ 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)
 {
@@ -564,13 +630,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");
@@ -583,17 +648,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;
@@ -613,17 +681,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;
@@ -688,6 +759,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)
@@ -698,6 +770,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);
@@ -729,29 +802,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);
 }
@@ -902,6 +981,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)
 {
@@ -955,6 +1035,7 @@ rule_print6(struct ip6t_entry *e)
                                    xtables_ip6mask_to_cidr(&e->ipv6.dmsk));
        }
 }
+#endif
 
 static void
 rule_print4(struct ipt_entry *e)
@@ -1012,36 +1093,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", m->alias ? m->alias(m->m) : m->m->u.user.name);
-
-               if (m->save)
-                       m->save(&r->e.ip, m->m);
-       }
-
-       if (r->target)
-       {
-               t = r->target;
-               printf(" -j %s", t->alias ? t->alias(t->t) : t->t->u.user.name);
-
-               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");
 }
@@ -1053,7 +1117,7 @@ parse_option(struct fw3_ipt_rule *r, int optc, bool inv)
        struct xtables_match *em;
 
        /* is a target option */
-       if (r->target && (r->target->parse || r->target->x6_parse) &&
+       if (r->target && fw3_xt_has_target_parse(r->target) &&
                optc >= r->target->option_offset &&
                optc < (r->target->option_offset + 256))
        {
@@ -1066,7 +1130,7 @@ parse_option(struct fw3_ipt_rule *r, int optc, bool inv)
        {
                em = m->match;
 
-               if (m->completed || (!em->parse && !em->x6_parse))
+               if (m->completed || !fw3_xt_has_match_parse(em))
                        continue;
 
                if (optc < em->option_offset ||
@@ -1089,12 +1153,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;
 }
@@ -1126,16 +1188,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;
@@ -1161,8 +1346,8 @@ 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);
-                               return;
+                               warn("fw3_ipt_rule_append(): Can't find match '%s'", optarg);
+                               goto free;
                        }
 
                        init_match(r, em, true);
@@ -1173,8 +1358,8 @@ 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);
-                               return;
+                               warn("fw3_ipt_rule_append(): Can't find target '%s'", optarg);
+                               goto free;
                        }
 
                        break;
@@ -1186,8 +1371,8 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
                                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))
@@ -1204,65 +1389,52 @@ 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));
+               if (repl)
+               {
+                       mask = rule_mask(r);
 
-               e->target_offset = s;
-               e->next_offset = s + r->target->t->u.target_size;
+                       while (iptc_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(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]);
 
@@ -1270,7 +1442,9 @@ fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
 
        xtables_rule_matches_free(&r->matches);
 
-       free(r->target->t);
+       if (r->target)
+               free(r->target->t);
+
        free(r);
 
        /* reset all targets and matches */