]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
libxt_recent: restore reap functionality to recent module
authorRussell Senior <russell@personaltelco.net>
Sat, 13 Jul 2013 10:08:07 +0000 (10:08 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 15 Jul 2013 00:47:15 +0000 (02:47 +0200)
The reap functionality appears to have been accidentally disabled
by (74ded72 libxt_recent: add --mask netmask) since iptables 1.4.15
and later.  This adds a patch to restore reap functionality for
recent_opts_v1.

Patch obtained via: http://patchwork.openwrt.org/patch/3812/

Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
extensions/libxt_recent.c

index f4ebe6a3cf12b2b31a53e17095b20ef7e97b7606..42c866cd088540cc090a8abacfc4e1a62a1801dd 100644 (file)
@@ -63,6 +63,8 @@ static const struct xt_option_entry recent_opts_v1[] = {
         .excl = F_ANY_OP, .flags = XTOPT_INVERT},
        {.name = "seconds", .id = O_SECONDS, .type = XTTYPE_UINT32,
         .flags = XTOPT_PUT, XTOPT_POINTER(s, seconds)},
+       {.name = "reap", .id = O_REAP, .type = XTTYPE_NONE,
+        .also = F_SECONDS },
        {.name = "hitcount", .id = O_HITCOUNT, .type = XTTYPE_UINT32,
         .flags = XTOPT_PUT, XTOPT_POINTER(s, hit_count)},
        {.name = "rttl", .id = O_RTTL, .type = XTTYPE_NONE,