netfilter: ebtables: use generic table checking

[mv-sheeva.git] / net / bridge / netfilter / ebt_redirect.c

diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c
index bfdf2fb60b1f0cbd16050390e01aba0bdbb9886a..a50ffbe0e4fb823279e60f4e2991089d4304e580 100644 (file)
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
@@ -7,22 +7,23 @@
  *  April, 2002
  *
  */
-
-#include <linux/netfilter.h>
-#include <linux/netfilter_bridge/ebtables.h>
-#include <linux/netfilter_bridge/ebt_redirect.h>
 #include <linux/module.h>
 #include <net/sock.h>
 #include "../br_private.h"
+#include <linux/netfilter.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_bridge/ebtables.h>
+#include <linux/netfilter_bridge/ebt_redirect.h>
 
-static int ebt_target_redirect(struct sk_buff *skb, unsigned int hooknr,
-   const struct net_device *in, const struct net_device *out,
-   const void *data, unsigned int datalen)
+static unsigned int
+ebt_redirect_tg(struct sk_buff *skb, const struct net_device *in,
+               const struct net_device *out, unsigned int hooknr,
+               const struct xt_target *target, const void *data)
 {
        const struct ebt_redirect_info *info = data;
 
-       if (skb_make_writable(skb, 0))
-               return NF_DROP;
+       if (!skb_make_writable(skb, 0))
+               return EBT_DROP;
 
        if (hooknr != NF_BR_BROUTING)
                memcpy(eth_hdr(skb)->h_dest,
@@ -33,39 +34,44 @@ static int ebt_target_redirect(struct sk_buff *skb, unsigned int hooknr,
        return info->target;
 }
 
-static int ebt_target_redirect_check(const char *tablename, unsigned int hookmask,
-   const struct ebt_entry *e, void *data, unsigned int datalen)
+static bool
+ebt_redirect_tg_check(const char *tablename, const void *e,
+                     const struct xt_target *target, void *data,
+                     unsigned int hookmask)
 {
        const struct ebt_redirect_info *info = data;
 
-       if (datalen != EBT_ALIGN(sizeof(struct ebt_redirect_info)))
-               return -EINVAL;
        if (BASE_CHAIN && info->target == EBT_RETURN)
-               return -EINVAL;
+               return false;
        CLEAR_BASE_CHAIN_BIT;
        if ( (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING)) &&
             (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) )
-               return -EINVAL;
+               return false;
        if (INVALID_TARGET)
-               return -EINVAL;
-       return 0;
+               return false;
+       return true;
 }
 
-static struct ebt_target redirect_target __read_mostly = {
-       .name           = EBT_REDIRECT_TARGET,
-       .target         = ebt_target_redirect,
-       .check          = ebt_target_redirect_check,
+static struct xt_target ebt_redirect_tg_reg __read_mostly = {
+       .name           = "redirect",
+       .revision       = 0,
+       .family         = NFPROTO_BRIDGE,
+       .hooks          = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING) |
+                         (1 << NF_BR_BROUTING),
+       .target         = ebt_redirect_tg,
+       .checkentry     = ebt_redirect_tg_check,
+       .targetsize     = XT_ALIGN(sizeof(struct ebt_redirect_info)),
        .me             = THIS_MODULE,
 };
 
 static int __init ebt_redirect_init(void)
 {
-       return ebt_register_target(&redirect_target);
+       return xt_register_target(&ebt_redirect_tg_reg);
 }
 
 static void __exit ebt_redirect_fini(void)
 {
-       ebt_unregister_target(&redirect_target);
+       xt_unregister_target(&ebt_redirect_tg_reg);
 }
 
 module_init(ebt_redirect_init);