[ << | Thread Index | >> ]    [ << | Date Index | >> ]

Subject: [Patch] Linux 2.4.4 compatibility
From: Olaf Titz <olaf,AT,bigred,DOT,inka,DOT,de>
Date: Tue, 1 May 2001 23:50:17 +0200

Oops. I've missed that (a) 2.4.4 was released and (b) it contains the
Windows interoperability fix which changes the ip_select_ident() API.
Just releasing CIPE 1.5.2 which fixes this. The patch is extremely
simple, so I'm appending it here.

Olaf

Index: cipe/output.c
===================================================================
RCS file: /home/olaf/common-home/CVSrepos/security/cipe-linux/cipe/output.c,v
retrieving revision 1.42
diff -u -r1.42 output.c
--- cipe/output.c       2001/02/14 20:21:33     1.42
+++ cipe/output.c       2001/05/01 13:02:30
@@ -45,7 +45,13 @@
 /* An adapted version of Linux 2.1 net/ipv4/ipip.c output routine. */

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,37)
-#define ip_select_ident(h,d) (h)->id=htons(ip_id_count++)
+#define ip_ident(h,d) (h)->id=htons(ip_id_count++)
+#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,4)
+#define ip_ident(h,d) ip_select_ident(h,d)
+#else
+#define ip_ident(h,d) ip_select_ident(h,d,NULL)
+#endif
 #endif

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,36)
@@ -268,7 +274,7 @@
        iph->ihl        =       sizeof(struct iphdr)>>2;
        iph->tos        =       tos;
        iph->tot_len    =       htons(skb->len);
-       ip_select_ident(iph, &rt->u.dst);
+       ip_ident(iph, &rt->u.dst);
         iph->frag_off   =      df;
         iph->ttl        =      ttl;
        iph->protocol   =       IPPROTO_UDP;

=== end of patch ===





[ << | Thread Index | >> ]    [ << | Date Index | >> ]