Skip to contentSkip to conversation

nfsim for Linux 2.6.12-rc4?

PATCH New Max Kellermann 2 participants 5 messages May 11, 2005 netfilter

lore
Share & tools
lore
#0 lore raw

Hi,

is anyone already working on the Linux 2.6.12 port of nfsim? If not, I'll do it.

gcc -Wmissing-prototypes -Wstrict-prototypes -Wunused -Wall -g -Wa,-W -I. -I/tmp/nfsim-3/core -I/tmp/nfsim-3/kernelenv/include -I/tmp/nfsim-3/netfilter/include -c -DKBUILD_MODNAME=ip_nat_ftp -o ip_nat_ftp.o ip_nat_ftp.c
ip_nat_ftp.c:174: warning: "struct kernel_param" declared inside parameter list
ip_nat_ftp.c:174: warning: its scope is only this definition or declaration, which is probably not what you want ip_nat_ftp.c:180: error: parse error before '(' token ip_nat_ftp.c:175: warning: 'warn_set' defined but not used make[2]: *** [ip_nat_ftp.o] Error 1

Max

#1 lore raw
Quoted 2 lines · Max Kellermann

is anyone already working on the Linux 2.6.12 port of nfsim? If not, I'll do it.

I have this patch, but I can't recall if it worked correctly with it or not. It needs at least a couple #if KERNEL_VERSION > ... before it can be committed.

Regards
Patrick

core.h +8 -3
Index: core/core.h
===================================================================
@@ -196,7 +196,7 @@
 		   const struct net_device *out,
 		   const char *fmt, ...);
 
-int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
+int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **skb,
 		 struct net_device *indev,
 		 struct net_device *outdev,
 		 int (*okfn)(struct sk_buff *)
@@ -207,8 +207,13 @@
 
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
- nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
+#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)				\
+({ int _ret;									\
+  _ret = nf_hook_slow((pf), (hook), &(skb), (indev), (outdev), (okfn), INT_MIN); \
+  if (_ret == 1)								\
+	_ret = (okfn)(skb);							\
+  _ret;										\
+})
 #else
 #define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
  nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn))
include/kernelenv.h +14 -2
Index: kernelenv/include/kernelenv.h
===================================================================
@@ -183,6 +183,7 @@
 #define cpu_possible(cpu)	((cpu) == 0)
 #endif
 #define smp_processor_id()	0
+#define num_possible_cpus()	1
 #define PAGE_SHIFT      12
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -244,6 +245,17 @@
 
 extern unsigned long jiffies;
 
+static inline unsigned long msecs_to_jiffies(const unsigned int m)
+{
+#if HZ <= 1000 && !(1000 % HZ)
+        return (m + (1000 / HZ) - 1) / (1000 / HZ);
+#elif HZ > 1000 && !(HZ % 1000)
+        return m * (HZ / 1000);
+#else
+        return (m * HZ + 999) / 1000;
+#endif
+}
+
 #define typecheck(type,x) \
 ({	type __dummy; \
 	typeof(x) __dummy2; \
@@ -929,8 +941,8 @@
 
 };
 
-u32 dst_path_metric(struct dst_entry *dst, int metric);
-u32 dst_pmtu(struct dst_entry *dst);
+u32 dst_metric(struct dst_entry *dst, int metric);
+u32 dst_mtu(struct dst_entry *dst);
 
 #define dst_release(x)
 #define dst_hold(x)
kernelenv.c +3 -3
Index: kernelenv/kernelenv.c
===================================================================
@@ -583,16 +583,16 @@
 #endif
 }
 
-u32 dst_path_metric(struct dst_entry *dst, int metric)
+u32 dst_metric(struct dst_entry *dst, int metric)
 {
 	return 1500;
 /*	return dst->path->metrics[metric-1]; */
 }
 
 
-u32 dst_pmtu(struct dst_entry *dst)
+u32 dst_mtu(struct dst_entry *dst)
 {
-	u32 mtu = dst_path_metric(dst, RTAX_MTU);
+	u32 mtu = dst_metric(dst, RTAX_MTU);
 	/* Yes, _exactly_. This is paranoia. */
 	barrier();
 	return mtu;
#2 lore raw
Quoted 2 lines · Patrick McHardy

I have this patch, but I can't recall if it worked correctly with it or not.

Unfortunately, it does not. Same compiler error as before.

Max

#3 lore raw

PATCH 1/1 2.6.12 compatibility

In reply to Patrick McHardy
Quoted 3 lines · Patrick McHardy

I have this patch, but I can't recall if it worked correctly with it or not. It needs at least a couple #if KERNEL_VERSION > ... before it can be committed.

The required changes in addition to your patch were trivial - there were 3 definitions missing. A patch is attached. My patch does not need #ifKERNEL_VERSIONs, I guess.

nfsim/2.6.12-rc4 seems to run well now - my h323-conntrack-nat test suite succeeds.

Max

Wed May 11 23:06:19 CEST 2005 [email protected]
* definitions for 2.6.12 compatibility

core/core.h +2 -1
diff -rN -u old-nfsim-0/core/core.h new-nfsim-0/core/core.h
@@ -76,7 +76,8 @@
 #define NF_STOLEN 2
 #define NF_QUEUE 3
 #define NF_REPEAT 4
-#define NF_MAX_VERDICT NF_REPEAT
+#define NF_STOP 5
+#define NF_MAX_VERDICT NF_STOP
 
 #define NF_MAX_HOOKS 8
 
kernelenv/include/kernelenv.h +3 -0
diff -rN -u old-nfsim-0/kernelenv/include/kernelenv.h new-nfsim-0/kernelenv/include/kernelenv.h
@@ -1130,6 +1130,9 @@
 #define MODULE_PARM_DESC(x,n) 
 #define module_param(name, type, perm)
 #define module_param_array(name, type, num, perm)
+#define module_param_call(name, set, get, arg, perm)
+
+struct kernel_param;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,28)
 #define EXPORT_NO_SYMBOLS
#4 lore raw
In reply to Patrick McHardy
Quoted 3 lines · Patrick McHardy

I have this patch, but I can't recall if it worked correctly with it or not. It needs at least a couple #if KERNEL_VERSION > ... before it can be committed.

Now here is a patch which replaces yours, with the correct #ifs. Tested on both 2.6.11 and 2.6.12. Note that the previous patch I posted this evening (nfsim-2.6.12-defs.patch) is still required.

Max

Wed May 11 23:48:01 CEST 2005 [email protected]
* 2.6.11 corrections for patrick's patch
Wed May 11 22:41:47 CEST 2005 [email protected]
* Patrick's 2.6.12 patch

core/core.h +14 -2
diff -rN -u old-nfsim-12/core/core.h new-nfsim-12/core/core.h
@@ -196,7 +196,11 @@
 		   const struct net_device *out,
 		   const char *fmt, ...);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **skb,
+#else
 int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
+#endif
 		 struct net_device *indev,
 		 struct net_device *outdev,
 		 int (*okfn)(struct sk_buff *)
@@ -206,8 +210,16 @@
 		 );
 
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)				\
+({ int _ret;									\
+  _ret = nf_hook_slow((pf), (hook), &(skb), (indev), (outdev), (okfn), INT_MIN); \
+  if (_ret == 1)								\
+	_ret = (okfn)(skb);							\
+  _ret;										\
+})
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)                    \
  nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
 #else
 #define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
kernelenv/include/kernelenv.h +17 -0
diff -rN -u old-nfsim-12/kernelenv/include/kernelenv.h new-nfsim-12/kernelenv/include/kernelenv.h
@@ -183,6 +183,7 @@
 #define cpu_possible(cpu)	((cpu) == 0)
 #endif
 #define smp_processor_id()	0
+#define num_possible_cpus()	1
 #define PAGE_SHIFT      12
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -244,6 +245,17 @@
 
 extern unsigned long jiffies;
 
+static inline unsigned long msecs_to_jiffies(const unsigned int m)
+{
+#if HZ <= 1000 && !(1000 % HZ)
+        return (m + (1000 / HZ) - 1) / (1000 / HZ);
+#elif HZ > 1000 && !(HZ % 1000)
+        return m * (HZ / 1000);
+#else
+        return (m * HZ + 999) / 1000;
+#endif
+}
+
 #define typecheck(type,x) \
 ({	type __dummy; \
 	typeof(x) __dummy2; \
@@ -929,8 +941,13 @@
 
 };
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+u32 dst_metric(struct dst_entry *dst, int metric);
+u32 dst_mtu(struct dst_entry *dst);
+#else
 u32 dst_path_metric(struct dst_entry *dst, int metric);
 u32 dst_pmtu(struct dst_entry *dst);
+#endif
 
 #define dst_release(x)
 #define dst_hold(x)
kernelenv/kernelenv.c +12 -0
diff -rN -u old-nfsim-12/kernelenv/kernelenv.c new-nfsim-12/kernelenv/kernelenv.c
@@ -583,16 +583,28 @@
 #endif
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+u32 dst_metric(struct dst_entry *dst, int metric)
+#else
 u32 dst_path_metric(struct dst_entry *dst, int metric)
+#endif
 {
 	return 1500;
 /*	return dst->path->metrics[metric-1]; */
 }
 
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+u32 dst_mtu(struct dst_entry *dst)
+#else
 u32 dst_pmtu(struct dst_entry *dst)
+#endif
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+	u32 mtu = dst_metric(dst, RTAX_MTU);
+#else
 	u32 mtu = dst_path_metric(dst, RTAX_MTU);
+#endif
 	/* Yes, _exactly_. This is paranoia. */
 	barrier();
 	return mtu;