X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fnetfilter%2Fxt_NFQUEUE.c;fp=net%2Fnetfilter%2Fxt_NFQUEUE.c;h=8b76b6f8d1e436fe4677fed76c6b1343eecd4542;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=86ccceb61fdde78b06d27d6c12dc4686849f7046;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 86ccceb61..8b76b6f8d 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -28,7 +28,6 @@ target(struct sk_buff **pskb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
-       const struct xt_target *target,
        const void *targinfo,
        void *userinfo)
 {
@@ -37,58 +36,72 @@ target(struct sk_buff **pskb,
 	return NF_QUEUE_NR(tinfo->queuenum);
 }
 
+static int
+checkentry(const char *tablename,
+	   const void *entry,
+           void *targinfo,
+           unsigned int targinfosize,
+           unsigned int hook_mask)
+{
+	if (targinfosize != XT_ALIGN(sizeof(struct xt_NFQ_info))) {
+		printk(KERN_WARNING "NFQUEUE: targinfosize %u != %Zu\n",
+		       targinfosize,
+		       XT_ALIGN(sizeof(struct xt_NFQ_info)));
+		return 0;
+	}
+
+	return 1;
+}
+
 static struct xt_target ipt_NFQ_reg = {
 	.name		= "NFQUEUE",
 	.target		= target,
-	.targetsize	= sizeof(struct xt_NFQ_info),
-	.family		= AF_INET,
+	.checkentry	= checkentry,
 	.me		= THIS_MODULE,
 };
 
 static struct xt_target ip6t_NFQ_reg = {
 	.name		= "NFQUEUE",
 	.target		= target,
-	.targetsize	= sizeof(struct xt_NFQ_info),
-	.family		= AF_INET6,
+	.checkentry	= checkentry,
 	.me		= THIS_MODULE,
 };
 
 static struct xt_target arpt_NFQ_reg = {
 	.name		= "NFQUEUE",
 	.target		= target,
-	.targetsize	= sizeof(struct xt_NFQ_info),
-	.family		= NF_ARP,
+	.checkentry	= checkentry,
 	.me		= THIS_MODULE,
 };
 
-static int __init xt_nfqueue_init(void)
+static int __init init(void)
 {
 	int ret;
-	ret = xt_register_target(&ipt_NFQ_reg);
+	ret = xt_register_target(AF_INET, &ipt_NFQ_reg);
 	if (ret)
 		return ret;
-	ret = xt_register_target(&ip6t_NFQ_reg);
+	ret = xt_register_target(AF_INET6, &ip6t_NFQ_reg);
 	if (ret)
 		goto out_ip;
-	ret = xt_register_target(&arpt_NFQ_reg);
+	ret = xt_register_target(NF_ARP, &arpt_NFQ_reg);
 	if (ret)
 		goto out_ip6;
 
 	return ret;
 out_ip6:
-	xt_unregister_target(&ip6t_NFQ_reg);
+	xt_unregister_target(AF_INET6, &ip6t_NFQ_reg);
 out_ip:
-	xt_unregister_target(&ipt_NFQ_reg);
+	xt_unregister_target(AF_INET, &ipt_NFQ_reg);
 
 	return ret;
 }
 
-static void __exit xt_nfqueue_fini(void)
+static void __exit fini(void)
 {
-	xt_unregister_target(&arpt_NFQ_reg);
-	xt_unregister_target(&ip6t_NFQ_reg);
-	xt_unregister_target(&ipt_NFQ_reg);
+	xt_unregister_target(NF_ARP, &arpt_NFQ_reg);
+	xt_unregister_target(AF_INET6, &ip6t_NFQ_reg);
+	xt_unregister_target(AF_INET, &ipt_NFQ_reg);
 }
 
-module_init(xt_nfqueue_init);
-module_exit(xt_nfqueue_fini);
+module_init(init);
+module_exit(fini);