linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ipv6 / netfilter / ip6t_eui64.c

diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c
index 4f6b84c..27396ac 100644 (file)
--- a/net/ipv6/netfilter/ip6t_eui64.c
+++ b/net/ipv6/netfilter/ip6t_eui64.c
@@ -22,7 +22,6 @@ 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,
@@ -40,7 +39,7 @@ match(const struct sk_buff *skb,
 
        memset(eui64, 0, sizeof(eui64));
 
-       if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) {
+       if (eth_hdr(skb)->h_proto == ntohs(ETH_P_IPV6)) {
                if (skb->nh.ipv6h->version == 0x6) {
                        memcpy(eui64, eth_hdr(skb)->h_source, 3);
                        memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3);
@@ -61,24 +60,42 @@ match(const struct sk_buff *skb,
        return 0;
 }
 
+static int
+ip6t_eui64_checkentry(const char *tablename,
+                     const void *ip,
+                     void *matchinfo,
+                     unsigned int matchsize,
+                     unsigned int hook_mask)
+{
+       if (hook_mask
+           & ~((1 << NF_IP6_PRE_ROUTING) | (1 << NF_IP6_LOCAL_IN) |
+               (1 << NF_IP6_FORWARD))) {
+               printk("ip6t_eui64: only valid for PRE_ROUTING, LOCAL_IN or FORWARD.\n");
+               return 0;
+       }
+
+       if (matchsize != IP6T_ALIGN(sizeof(int)))
+               return 0;
+
+       return 1;
+}
+
 static struct ip6t_match eui64_match = {
        .name           = "eui64",
-       .match          = match,
-       .matchsize      = sizeof(int),
-       .hooks          = (1 << NF_IP6_PRE_ROUTING) | (1 << NF_IP6_LOCAL_IN) |
-                         (1 << NF_IP6_FORWARD),
+       .match          = &match,
+       .checkentry     = &ip6t_eui64_checkentry,
        .me             = THIS_MODULE,
 };
 
-static int __init ip6t_eui64_init(void)
+static int __init init(void)
 {
        return ip6t_register_match(&eui64_match);
 }
 
-static void __exit ip6t_eui64_fini(void)
+static void __exit fini(void)
 {
        ip6t_unregister_match(&eui64_match);
 }
 
-module_init(ip6t_eui64_init);
-module_exit(ip6t_eui64_fini);
+module_init(init);
+module_exit(fini);