[RESEND][PATCH] string match compilation on 2.4.9

[RESEND][PATCH] string match compilation on 2.4.9

[Maciej Soltysiak]

Hi,

we all know that the string match does not work on 2.4.9 because
2.4.9 had a different definition of the min/max macros.

This patch did not receive any comment so far.

Please consider this patch for the patch-o-matic.

Regards,
Maciej

diff -Nru netfilter.orig/patch-o-matic/extra/string.patch netfilter/patch-o-matic/extra/string.patch
--- netfilter.orig/patch-o-matic/extra/string.patch	2003-05-03 14:31:54.000000000 +0200
+++ netfilter/patch-o-matic/extra/string.patch	2003-05-04 17:06:29.000000000 +0200
@@ -26,12 +26,14 @@
 diff -urN linux.orig/net/ipv4/netfilter/ipt_string.c linux/net/ipv4/netfilter/ipt_string.c
 --- linux.orig/net/ipv4/netfilter/ipt_string.c	Thu Jan  1 01:00:00 1970
 +++ linux/net/ipv4/netfilter/ipt_string.c	Thu Feb 21 20:26:09 2002
-@@ -0,0 +1,216 @@
+@@ -0,0 +1,222 @@
 +/* Kernel module to match a string into a packet.
 + *
 + * Copyright (C) 2000 Emmanuel Roger  <winfield@freegates.be>
 + *
 + * ChangeLog
++ *	04.05.2003: Maciej Soltysiak <solt@dns.toxicfilms.tv>
++ *		Fixed 2.4.9 broken max macro usage.
 + *	19.02.2002: Gianni Tedesco <gianni@ecsc.co.uk>
 + *		Fixed SMP re-entrancy problem using per-cpu data areas
 + *		for the skip/shift tables.
@@ -106,7 +108,11 @@
 +
 +		sk = skip[haystack[right_end - i]];
 +		sh = shift[i];
++#if LINUX_VERSION_CODE == KERNEL_VERSION(2,4,9)
++		right_end = max(int , right_end - i + sk, right_end + sh);
++#else
 +		right_end = max(right_end - i + sk, right_end + sh);
++#endif
 +	}
 +
 +	return NULL;
diff -Nru netfilter.orig/patch-o-matic/extra/string.patch.help netfilter/patch-o-matic/extra/string.patch.help
--- netfilter.orig/patch-o-matic/extra/string.patch.help	2003-05-03 14:31:54.000000000 +0200
+++ netfilter/patch-o-matic/extra/string.patch.help	2003-05-04 17:07:11.000000000 +0200
@@ -1,8 +1,6 @@
 Author: Emmanuel Roger <winfield@freegates.be>
-Status: Working, not with kernel 2.4.9
+Status: Working

 This patch adds CONFIG_IP_NF_MATCH_STRING which allows you to
 match a string in a whole packet.

-THIS PATCH DOES NOT WORK WITH KERNEL 2.4.9 !!!
-

Re: [RESEND][PATCH] string match compilation on 2.4.9

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 852 bytes --]

On Mon, Jun 16, 2003 at 01:41:50PM +0200, Maciej Soltysiak wrote:
> Hi,
> 
> we all know that the string match does not work on 2.4.9 because
> 2.4.9 had a different definition of the min/max macros.
> 
> This patch did not receive any comment so far.

I thought I had stated that before, but anyway:  I don't think it's
worth dealing with this very particular case of 2.4.9.  Recent
patch-o-matic releases only support kernels >= 2.4.18 anyway.

> Regards,
> Maciej
-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]