|
Subject: |
Re: Unsupported kernel version error [FIXED] |
|
From: |
"Trever L. Adams" <vichu,AT,digitalme,DOT,com> |
|
Date: |
Mon, 28 May 2001 03:23:13 +0200 |
|
In-reply-to: |
<3B10ABCA.5050802@digitalme.com> |
Part of the problem is a change in the networking in 2.4.4. NULL is a
workable fix in addition to what I did. It just isn't "correct."
Please find my attached patch. It will work for 1.4.6 cipe and will if
applied by hand for 1.5.2 cipe.
Trever Adams
diff -ur cipe-1.4.6/conf/aclocal.m4 /usr/src/cipe-1.4.6/conf/aclocal.m4
--- cipe-1.4.6/conf/aclocal.m4 Tue May 30 09:47:03 2000
+++ /usr/src/cipe-1.4.6/conf/aclocal.m4 Sat May 26 04:15:32 2001
@@ -29,7 +29,7 @@
[$1]
EOF
(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |\
- sed -n -e 's/^"\(.*\)".*$/\1/p' >conftest
+ sed -n -e 's/^ *"\(.*\)".*$/\1/p' >conftest
changequote(, )dnl
set "X" "`cat conftest`"
changequote([, ])dnl
diff -ur cipe-1.4.6/output.c /usr/src/cipe-1.4.6/output.c
--- cipe-1.4.6/output.c Wed Aug 2 10:33:45 2000
+++ /usr/src/cipe-1.4.6/output.c Sun May 27 20:02:01 2001
@@ -277,7 +277,11 @@
iph->ihl = sizeof(struct iphdr)>>2;
iph->tos = tos;
iph->tot_len = htons(skb->len);
- ip_select_ident(iph, &rt->u.dst);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,4)
+ ip_select_ident(iph, &rt->u.dst, skb->sk);
+#else
+ ip_select_ident(iph, &rt->u.dst);
+#endif
iph->frag_off = df;
iph->ttl = ttl;
iph->protocol = IPPROTO_UDP;