linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / netfilter / xt_pkttype.c

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index d2f5320..ab1b263 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -9,8 +9,6 @@
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
-#include <linux/in.h>
-#include <linux/ip.h>
 
 #include <linux/netfilter/xt_pkttype.h>
 #include <linux/netfilter/x_tables.h>
@@ -24,60 +22,61 @@ MODULE_ALIAS("ip6t_pkttype");
 static int match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
-      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
       int *hotdrop)
 {
-       u_int8_t type;
        const struct xt_pkttype_info *info = matchinfo;
 
-       if (skb->pkt_type == PACKET_LOOPBACK)
-               type = (MULTICAST(skb->nh.iph->daddr)
-                       ? PACKET_MULTICAST
-                       : PACKET_BROADCAST);
-       else
-               type = skb->pkt_type;
+       return (skb->pkt_type == info->pkttype) ^ info->invert;
+}
+
+static int checkentry(const char *tablename,
+                  const void *ip,
+                  void *matchinfo,
+                  unsigned int matchsize,
+                  unsigned int hook_mask)
+{
+       if (matchsize != XT_ALIGN(sizeof(struct xt_pkttype_info)))
+               return 0;
 
-       return (type == info->pkttype) ^ info->invert;
+       return 1;
 }
 
 static struct xt_match pkttype_match = {
        .name           = "pkttype",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_pkttype_info),
-       .family         = AF_INET,
+       .match          = &match,
+       .checkentry     = &checkentry,
        .me             = THIS_MODULE,
 };
-
 static struct xt_match pkttype6_match = {
        .name           = "pkttype",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_pkttype_info),
-       .family         = AF_INET6,
+       .match          = &match,
+       .checkentry     = &checkentry,
        .me             = THIS_MODULE,
 };
 
-static int __init xt_pkttype_init(void)
+
+static int __init init(void)
 {
        int ret;
-       ret = xt_register_match(&pkttype_match);
+       ret = xt_register_match(AF_INET, &pkttype_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(&pkttype6_match);
+       ret = xt_register_match(AF_INET6, &pkttype6_match);
        if (ret)
-               xt_unregister_match(&pkttype_match);
+               xt_unregister_match(AF_INET, &pkttype_match);
 
        return ret;
 }
 
-static void __exit xt_pkttype_fini(void)
+static void __exit fini(void)
 {
-       xt_unregister_match(&pkttype_match);
-       xt_unregister_match(&pkttype6_match);
+       xt_unregister_match(AF_INET, &pkttype_match);
+       xt_unregister_match(AF_INET6, &pkttype6_match);
 }
 
-module_init(xt_pkttype_init);
-module_exit(xt_pkttype_fini);
+module_init(init);
+module_exit(fini);