Skip to contentSkip to conversation

OSF: netlink related changes.

PATCH RESEND In review Evgeniy Polyakov 2 participants 2 messages Dec 6, 2005 – Dec 7, 2005 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 2/2 OSF: netlink related changes.

Hello, developers.
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.
Thank you.

patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c 2005-11-05 12:43:54.000000000 -0500 renamed from patch-o-matic-ng/patchlets/osf/linux-2.6/net/ipv4/netfilter/ipt_osf.c 2005-11-05 12:35:02.000000000 -0500 +9 -0
@@ -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:
@@ -821,7 +826,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");
 	}
Signature · 1 line
	Evgeniy Polyakov
#1 lore raw
Quoted 4 lines · Evgeniy Polyakov

Hello, developers.
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.

This patch doesn't apply to SVN, please rediff it against a current checkout and resend.