netfilter: xt_recent: add an entry reaper

[pandora-kernel.git] / net / netfilter / xt_recent.c

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 2ff8aae..b65eca9 100644 (file)
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -143,6 +143,25 @@ static void recent_entry_remove(struct recent_table *t, struct recent_entry *e)
        t->entries--;
 }
 
        t->entries--;
 }
 

+/*
+ * Drop entries with timestamps older then 'time'.
+ */
+static void recent_entry_reap(struct recent_table *t, unsigned long time)
+{
+       struct recent_entry *e;
+
+       /*
+        * The head of the LRU list is always the oldest entry.
+        */
+       e = list_entry(t->lru_list.next, struct recent_entry, lru_list);
+
+       /*
+        * The last time stamp is the most recent.
+        */
+       if (time_after(time, e->stamps[e->index-1]))
+               recent_entry_remove(t, e);
+}
+

 static struct recent_entry *
 recent_entry_init(struct recent_table *t, const union nf_inet_addr *addr,
                  u_int16_t family, u_int8_t ttl)
 static struct recent_entry *
 recent_entry_init(struct recent_table *t, const union nf_inet_addr *addr,
                  u_int16_t family, u_int8_t ttl)


@@ -269,6 +288,10 @@ recent_mt(const struct sk_buff *skb, const struct xt_match_param *par)
                                break;
                        }
                }
                                break;
                        }
                }

+
+               /* info->seconds must be non-zero */
+               if (info->check_set & XT_RECENT_REAP)
+                       recent_entry_reap(t, time);

        }
 
        if (info->check_set & XT_RECENT_SET ||
        }
 
        if (info->check_set & XT_RECENT_SET ||


@@ -301,7 +324,10 @@ static bool recent_mt_check(const struct xt_mtchk_param *par)
                      XT_RECENT_CHECK | XT_RECENT_UPDATE)) != 1)
                return false;
        if ((info->check_set & (XT_RECENT_SET | XT_RECENT_REMOVE)) &&
                      XT_RECENT_CHECK | XT_RECENT_UPDATE)) != 1)
                return false;
        if ((info->check_set & (XT_RECENT_SET | XT_RECENT_REMOVE)) &&

-           (info->seconds || info->hit_count))
+           (info->seconds || info->hit_count ||
+           (info->check_set & XT_RECENT_MODIFIERS)))
+               return false;
+       if ((info->check_set & XT_RECENT_REAP) && !info->seconds)

                return false;
        if (info->hit_count > ip_pkt_list_tot) {
                pr_info(KBUILD_MODNAME ": hitcount (%u) is larger than "
                return false;
        if (info->hit_count > ip_pkt_list_tot) {
                pr_info(KBUILD_MODNAME ": hitcount (%u) is larger than "