[netfilter-cvslog] r6311 - trunk/patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2005-12-12 08:23:57 +0100 (Mon, 12 Dec 2005)
New Revision: 6311

Modified:
   trunk/patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c
Log:
[1/1] OSF: netlink related changes.

Due to new interface and changed API in netlink area
several patch-o-matic modules can not be compiled.
Passive OS fingerprinting OSF modules is one of them. 
Consider for inclusion.

Signed-off-by: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>


Modified: trunk/patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c	2005-12-09 13:33:53 UTC (rev 6310)
+++ trunk/patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c	2005-12-12 07:23:57 UTC (rev 6311)
@@ -30,6 +30,7 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
+#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/smp.h>
@@ -155,7 +156,11 @@
 	memcpy(&data->ip, sk->nh.iph, sizeof(struct iphdr));
 	memcpy(&data->tcp, (struct tcphdr *)((u_int32_t *)sk->nh.iph + sk->nh.iph->ihl), sizeof(struct tcphdr));
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 	NETLINK_CB(skb).dst_groups = ipt_osf_groups;
+#else
+	NETLINK_CB(skb).dst_group = ipt_osf_groups;
+#endif
 	netlink_broadcast(nts, skb, 0, ipt_osf_groups, GFP_ATOMIC);
 
 nlmsg_failure:
@@ -820,8 +825,11 @@
 
 	p->write_proc = osf_proc_write;
 	p->read_proc  = osf_proc_read;
-	
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 	nts = netlink_kernel_create(NETLINK_NFLOG, NULL);
+#else
+	nts = netlink_kernel_create(NETLINK_NFLOG, 1, NULL, THIS_MODULE);
+#endif
 	if (!nts) {
 		log("netlink_kernel_create() failed\n");
 	}