Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / net / netfilter / xt_pkttype.c

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index d2f5320..69da1d3 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -11,73 +11,55 @@
 #include <linux/if_packet.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/ipv6.h>
 
 #include <linux/netfilter/xt_pkttype.h>
 #include <linux/netfilter/x_tables.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michal Ludvig <michal@logix.cz>");
-MODULE_DESCRIPTION("IP tables match to match on linklayer packet type");
+MODULE_DESCRIPTION("Xtables: link layer packet type match");
 MODULE_ALIAS("ipt_pkttype");
 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)
+static bool
+pkttype_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
+       const struct xt_pkttype_info *info = par->matchinfo;
        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
+       if (skb->pkt_type != PACKET_LOOPBACK)
                type = skb->pkt_type;
+       else if (par->family == NFPROTO_IPV4 &&
+           ipv4_is_multicast(ip_hdr(skb)->daddr))
+               type = PACKET_MULTICAST;
+       else if (par->family == NFPROTO_IPV6 &&
+           ipv6_hdr(skb)->daddr.s6_addr[0] == 0xFF)
+               type = PACKET_MULTICAST;
+       else
+               type = PACKET_BROADCAST;
 
        return (type == info->pkttype) ^ info->invert;
 }
 
-static struct xt_match pkttype_match = {
-       .name           = "pkttype",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_pkttype_info),
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match pkttype6_match = {
-       .name           = "pkttype",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_pkttype_info),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match pkttype_mt_reg __read_mostly = {
+       .name      = "pkttype",
+       .revision  = 0,
+       .family    = NFPROTO_UNSPEC,
+       .match     = pkttype_mt,
+       .matchsize = sizeof(struct xt_pkttype_info),
+       .me        = THIS_MODULE,
 };
 
-static int __init xt_pkttype_init(void)
+static int __init pkttype_mt_init(void)
 {
-       int ret;
-       ret = xt_register_match(&pkttype_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&pkttype6_match);
-       if (ret)
-               xt_unregister_match(&pkttype_match);
-
-       return ret;
+       return xt_register_match(&pkttype_mt_reg);
 }
 
-static void __exit xt_pkttype_fini(void)
+static void __exit pkttype_mt_exit(void)
 {
-       xt_unregister_match(&pkttype_match);
-       xt_unregister_match(&pkttype6_match);
+       xt_unregister_match(&pkttype_mt_reg);
 }
 
-module_init(xt_pkttype_init);
-module_exit(xt_pkttype_fini);
+module_init(pkttype_mt_init);
+module_exit(pkttype_mt_exit);