SOURCES (LINUX_2_6): kernel-pom-ng-rsh.patch, kernel-pom-ng-rpc.patch - upd...

[zbyniu]

Author: zbyniu                       Date: Tue Sep 23 10:11:24 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for .26

---- Files affected:
SOURCES:
   kernel-pom-ng-rsh.patch (1.1.2.3 -> 1.1.2.4) , kernel-pom-ng-rpc.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-rsh.patch
diff -u SOURCES/kernel-pom-ng-rsh.patch:1.1.2.3 SOURCES/kernel-pom-ng-rsh.patch:1.1.2.4
--- SOURCES/kernel-pom-ng-rsh.patch:1.1.2.3	Tue Jan 22 02:37:12 2008
+++ SOURCES/kernel-pom-ng-rsh.patch	Tue Sep 23 12:11:18 2008
@@ -367,6 +367,10 @@
 +
 +static struct nf_conntrack_helper rsh_helpers[MAX_PORTS];
 +static char rsh_names[MAX_PORTS][10];
++static const struct nf_conntrack_expect_policy rsh_exp_policy = {
++	.max_expected      = 1,
++	.timeout      = 5, /* stes bug timeout=0 */
++};
 +
 +static void fini(void);
 +
@@ -400,8 +404,7 @@
 +		rsh_helpers[port].name = tmpname;
 +
 +		rsh_helpers[port].me = THIS_MODULE;
-+		rsh_helpers[port].max_expected = 1;
-+		rsh_helpers[port].timeout = 5; /* stes bug timeout=0 */
++		rpc_helpers[port].expect_policy = &rsh_exp_policy;
 +
 +		rsh_helpers[port].tuple.dst.protonum = IPPROTO_TCP;
 +

================================================================
Index: SOURCES/kernel-pom-ng-rpc.patch
diff -u SOURCES/kernel-pom-ng-rpc.patch:1.1.2.5 SOURCES/kernel-pom-ng-rpc.patch:1.1.2.6
--- SOURCES/kernel-pom-ng-rpc.patch:1.1.2.5	Thu May  8 03:11:22 2008
+++ SOURCES/kernel-pom-ng-rpc.patch	Tue Sep 23 12:11:18 2008
@@ -161,7 +161,7 @@
 diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c
 --- linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c	2007-08-15 03:04:53.000000000 +0200
-@@ -0,0 +1,554 @@
+@@ -0,0 +1,557 @@
 +/* RPC extension for IP (TCP) connection tracking, Version 2.2
 + * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
 + *	- original rpc tracking module
@@ -635,6 +635,10 @@
 +
 +static struct nf_conntrack_helper rpc_helpers[MAX_PORTS];
 +static char rpc_names[MAX_PORTS][10];
++static const struct nf_conntrack_expect_policy rpc_exp_policy = {
++	.max_expected      = 1,
++	.timeout      = 5 * 60, /* stes */
++};
 +
 +static void fini(void);
 +
@@ -658,8 +662,7 @@
 +		rpc_helpers[port].name = tmpname;
 +
 +		rpc_helpers[port].me = THIS_MODULE;
-+		rpc_helpers[port].max_expected = 1;
-+		rpc_helpers[port].timeout = 5 * 60; /* stes */
++		rpc_helpers[port].expect_policy = &rpc_exp_policy;
 +
 +		rpc_helpers[port].tuple.dst.protonum = IPPROTO_TCP;
 +
@@ -719,7 +722,7 @@
 diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c
 --- linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c	2007-08-15 01:44:02.000000000 +0200
-@@ -0,0 +1,527 @@
+@@ -0,0 +1,530 @@
 +/* RPC extension for IP (UDP) connection tracking, Version 2.2
 + * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
 + *	- original rpc tracking module
@@ -1169,6 +1172,10 @@
 +
 +static struct nf_conntrack_helper rpc_helpers[MAX_PORTS];
 +static char rpc_names[MAX_PORTS][10];
++static const struct nf_conntrack_expect_policy rpc_exp_policy = {
++	.max_expected      = 1,
++	.timeout      = 5 * 60, /* stes */
++};
 +
 +static void fini(void);
 +
@@ -1192,8 +1199,7 @@
 +		rpc_helpers[port].name = tmpname;
 +
 +		rpc_helpers[port].me = THIS_MODULE;
-+		rpc_helpers[port].max_expected = 1;
-+		rpc_helpers[port].timeout = 5 * 60; /* stes */
++		rpc_helpers[port].expect_policy = &rpc_exp_policy;
 +
 +		rpc_helpers[port].tuple.dst.protonum = IPPROTO_UDP;
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-rsh.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-rpc.patch?r1=1.1.2.5&r2=1.1.2.6&f=u