Missed any patches?

Missed any patches?

[Patrick McHardy]

I've applied everything on the list I could find, if I missed
anything please resend now. Thanks.

Re: Missed any patches? [PATCH] expectation timeouts

[Phil Oester]

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

On Sat, Jun 11, 2005 at 06:46:47PM +0200, Patrick McHardy wrote:
> I've applied everything on the list I could find, if I missed
> anything please resend now. Thanks.

Here's one

Since expectation timeouts were made compulsory [1], there is no need to
check for them in ip_conntrack_expect_insert.

Phil

[1] https://lists.netfilter.org/pipermail/netfilter-devel/2005-January/018143.html


Signed-off-by: Phil Oester <kernel@linuxace.com>



[-- Attachment #2: patch-exptimeout --]
[-- Type: text/plain, Size: 958 bytes --]

diff -ruN linux-orig/net/ipv4/netfilter/ip_conntrack_core.c linux-new/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-orig/net/ipv4/netfilter/ip_conntrack_core.c	2005-03-02 02:37:30.000000000 -0500
+++ linux-new/net/ipv4/netfilter/ip_conntrack_core.c	2005-05-19 10:18:04.041146160 -0400
@@ -760,15 +760,11 @@
 	exp->master->expecting++;
 	list_add(&exp->list, &ip_conntrack_expect_list);
 
-	if (exp->master->helper->timeout) {
-		init_timer(&exp->timeout);
-		exp->timeout.data = (unsigned long)exp;
-		exp->timeout.function = expectation_timed_out;
-		exp->timeout.expires
-			= jiffies + exp->master->helper->timeout * HZ;
-		add_timer(&exp->timeout);
-	} else
-		exp->timeout.function = NULL;
+	init_timer(&exp->timeout);
+	exp->timeout.data = (unsigned long)exp;
+	exp->timeout.function = expectation_timed_out;
+	exp->timeout.expires = jiffies + exp->master->helper->timeout * HZ;
+	add_timer(&exp->timeout);
 
 	CONNTRACK_STAT_INC(expect_create);
 }

Re: Missed any patches? [PATCH] expectation timeouts

[Patrick McHardy]

Phil Oester wrote:
> Since expectation timeouts were made compulsory [1], there is no need to
> check for them in ip_conntrack_expect_insert.

Thanks, I just found it and am about to apply it to my 2.6.13 tree.

Regards
Patrick

Re: Missed any patches? [PATCH] expectation timeouts

[Jan Engelhardt]

>> Since expectation timeouts were made compulsory [1], there is no need to
>> check for them in ip_conntrack_expect_insert.
>
>Thanks, I just found it and am about to apply it to my 2.6.13 tree.

Is there any chance that all of POMng will get updated? Most of the patches 
still address a 2.6.<10 kernel. I have not tested if they apply correctly (I 
don't need them ... yet), but if they don't, rediff could be wise.


CHS,
Jan Engelhardt                                                               
--                                                                            
| Gesellschaft fuer Wissenschaftliche Datenverarbeitung Goettingen,
| Am Fassberg, 37077 Goettingen, www.gwdg.de

Re: Missed any patches? [PATCH] expectation timeouts

[Patrick McHardy]

Jan Engelhardt wrote:
> Is there any chance that all of POMng will get updated? Most of the patches 
> still address a 2.6.<10 kernel. I have not tested if they apply correctly (I 
> don't need them ... yet), but if they don't, rediff could be wise.

Updated how? Which patches are you talking about?

Regards
Patrick

Re: Missed any patches? [PATCH] expectation timeouts

[Jan Engelhardt]

>> Is there any chance that all of POMng will get updated? Most of the patches 
>> still address a 2.6.<10 kernel. I have not tested if they apply correctly (I 
>> don't need them ... yet), but if they don't, rediff could be wise.
>
>Updated how? Which patches are you talking about?

Heh, you got me.

NAT reservations, for example, cannot be applied to a 2.6.11, because the 
expect code changed.

The ACCOUNT directory in today's (well, yesterday 20050610) POMng tree has a 
linux.patch with this header:
--- kernel-2.4.25/include/linux/netfilter_ipv4/ip_tables.h      Mon Apr 12 
Not exactly 2.6.x at all :)



Jan Engelhardt                                                               
--                                                                            
| Gesellschaft fuer Wissenschaftliche Datenverarbeitung Goettingen,
| Am Fassberg, 37077 Goettingen, www.gwdg.de

Re: Missed any patches? [PATCH] expectation timeouts

[Patrick McHardy]

Jan Engelhardt wrote:
> NAT reservations, for example, cannot be applied to a 2.6.11, because the 
> expect code changed.
> 
> The ACCOUNT directory in today's (well, yesterday 20050610) POMng tree has a 
> linux.patch with this header:
> --- kernel-2.4.25/include/linux/netfilter_ipv4/ip_tables.h      Mon Apr 12 
> Not exactly 2.6.x at all :)

Harald was working on porting connection tracking and NAT helpers to
2.6.11. For the other patches you have to talk to their authors
or hope for someone else to do it.

Regards
Patrick

Re: Missed any patches? [PATCH] expectation timeouts

[Carl-Daniel Hailfinger]

Jan Engelhardt schrieb:
>>>Is there any chance that all of POMng will get updated? Most of the patches 
>>>still address a 2.6.<10 kernel. I have not tested if they apply correctly (I 
>>>don't need them ... yet), but if they don't, rediff could be wise.
>>
>>Updated how? Which patches are you talking about?
> 
> The ACCOUNT directory in today's (well, yesterday 20050610) POMng tree has a 
> linux.patch with this header:
> --- kernel-2.4.25/include/linux/netfilter_ipv4/ip_tables.h      Mon Apr 12 
> Not exactly 2.6.x at all :)

I have a 2.6 version, but it has to be cleaned up a bit. Will send it
upstream at the end of this week.

Regards,
Carl-Daniel
-- 
http://www.hailfinger.org/