Author: zbyniu Date: Wed May 7 23:32:52 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- http://www.ssi.bg/~ja/nfct/ipvs-nfct-2.6.25-1.diff
---- Files affected:
SOURCES:
kernel-ipvs-nfct.patch (1.1.4.2 -> 1.1.4.3)
---- Diffs:
================================================================
Index: SOURCES/kernel-ipvs-nfct.patch
diff -u SOURCES/kernel-ipvs-nfct.patch:1.1.4.2
SOURCES/kernel-ipvs-nfct.patch:1.1.4.3
--- SOURCES/kernel-ipvs-nfct.patch:1.1.4.2 Mon Jan 28 00:16:27 2008
+++ SOURCES/kernel-ipvs-nfct.patch Thu May 8 01:32:47 2008
@@ -1,9 +1,9 @@
-diff -urNp v2.6.24/linux/include/net/ip_vs.h linux/include/net/ip_vs.h
---- v2.6.24/linux/include/net/ip_vs.h 2008-01-25 10:45:05.000000000 +0200
-+++ linux/include/net/ip_vs.h 2008-01-27 17:46:03.000000000 +0200
-@@ -9,6 +9,16 @@
- #include <asm/types.h> /* For __uXX types */
- #include <linux/types.h> /* For __beXX types in userland */
+diff -urNp v2.6.25/linux/include/net/ip_vs.h linux/include/net/ip_vs.h
+--- v2.6.25/linux/include/net/ip_vs.h 2008-04-17 09:58:08.000000000 +0300
++++ linux/include/net/ip_vs.h 2008-04-19 19:59:24.000000000 +0300
+@@ -11,6 +11,16 @@
+
+ #include <linux/sysctl.h> /* For ctl_path */
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
@@ -18,7 +18,7 @@
#define IP_VS_VERSION_CODE 0x010201
#define NVERSION(version) \
(version >> 16) & 0xFF, \
-@@ -685,6 +695,16 @@ extern void ip_vs_init_hash_table(struct
+@@ -686,6 +696,16 @@ extern void ip_vs_init_hash_table(struct
*/
/*
@@ -35,12 +35,13 @@
* IPVS connection entry hash table
*/
#ifndef CONFIG_IP_VS_TAB_BITS
-@@ -855,8 +875,41 @@ extern int sysctl_ip_vs_expire_nodest_co
+@@ -855,9 +875,42 @@ extern int sysctl_ip_vs_expire_nodest_co
extern int sysctl_ip_vs_expire_quiescent_template;
extern int sysctl_ip_vs_sync_threshold[2];
extern int sysctl_ip_vs_nat_icmp_send;
+extern int sysctl_ip_vs_snat_reroute;
extern struct ip_vs_stats ip_vs_stats;
+ extern struct ctl_path net_vs_ctl_path[];
+#ifdef CONFIG_IP_VS_NFCT
+
@@ -77,9 +78,9 @@
extern struct ip_vs_service *
ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport);
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/Kconfig linux/net/ipv4/ipvs/Kconfig
---- v2.6.24/linux/net/ipv4/ipvs/Kconfig 2007-07-10 09:18:43.000000000
+0300
-+++ linux/net/ipv4/ipvs/Kconfig 2008-01-27 17:46:03.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/Kconfig linux/net/ipv4/ipvs/Kconfig
+--- v2.6.25/linux/net/ipv4/ipvs/Kconfig 2007-07-10 09:18:43.000000000
+0300
++++ linux/net/ipv4/ipvs/Kconfig 2008-04-19 19:55:40.000000000 +0300
@@ -221,4 +221,12 @@ config IP_VS_FTP
If you want to compile it in kernel, say Y. To compile it as a
module, choose M here. If unsure, say N.
@@ -93,9 +94,9 @@
+ for filtering purposes.
+
endif # IP_VS
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/Makefile linux/net/ipv4/ipvs/Makefile
---- v2.6.24/linux/net/ipv4/ipvs/Makefile 2005-06-18 08:50:52.000000000
+0300
-+++ linux/net/ipv4/ipvs/Makefile 2008-01-27 17:46:03.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/Makefile linux/net/ipv4/ipvs/Makefile
+--- v2.6.25/linux/net/ipv4/ipvs/Makefile 2005-06-18 08:50:52.000000000
+0300
++++ linux/net/ipv4/ipvs/Makefile 2008-04-19 19:55:40.000000000 +0300
@@ -9,10 +9,13 @@ ip_vs_proto-objs-$(CONFIG_IP_VS_PROTO_UD
ip_vs_proto-objs-$(CONFIG_IP_VS_PROTO_ESP) += ip_vs_proto_esp.o
ip_vs_proto-objs-$(CONFIG_IP_VS_PROTO_AH) += ip_vs_proto_ah.o
@@ -111,10 +112,10 @@
# IPVS core
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_conn.c
linux/net/ipv4/ipvs/ip_vs_conn.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_conn.c 2008-01-25 10:45:06.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_conn.c 2008-01-27 17:46:03.000000000 +0200
-@@ -581,6 +581,11 @@ static void ip_vs_conn_expire(unsigned l
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_conn.c
linux/net/ipv4/ipvs/ip_vs_conn.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_conn.c 2008-04-17 09:58:09.000000000
+0300
++++ linux/net/ipv4/ipvs/ip_vs_conn.c 2008-04-19 19:55:40.000000000 +0300
+@@ -593,6 +593,11 @@ static void ip_vs_conn_expire(unsigned l
if (cp->control)
ip_vs_control_del(cp);
@@ -126,9 +127,9 @@
if (unlikely(cp->app != NULL))
ip_vs_unbind_app(cp);
ip_vs_unbind_dest(cp);
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_core.c
linux/net/ipv4/ipvs/ip_vs_core.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_core.c 2008-01-25 10:45:06.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_core.c 2008-01-27 17:56:11.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_core.c
linux/net/ipv4/ipvs/ip_vs_core.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_core.c 2008-04-17 09:58:09.000000000
+0300
++++ linux/net/ipv4/ipvs/ip_vs_core.c 2008-04-19 19:55:40.000000000 +0300
@@ -661,6 +661,8 @@ static int ip_vs_out_icmp(struct sk_buff
skb->ipvs_property = 1;
@@ -184,9 +185,9 @@
return NF_STOLEN;
}
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_ctl.c
linux/net/ipv4/ipvs/ip_vs_ctl.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_ctl.c 2008-01-25 10:45:06.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_ctl.c 2008-01-27 17:53:38.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_ctl.c
linux/net/ipv4/ipvs/ip_vs_ctl.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_ctl.c 2008-04-17 09:58:09.000000000
+0300
++++ linux/net/ipv4/ipvs/ip_vs_ctl.c 2008-04-19 19:55:40.000000000 +0300
@@ -81,6 +81,10 @@ int sysctl_ip_vs_expire_nodest_conn = 0;
int sysctl_ip_vs_expire_quiescent_template = 0;
int sysctl_ip_vs_sync_threshold[2] = { 3, 50 };
@@ -228,9 +229,9 @@
#if 0
{
.procname = "timeout_established",
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_ftp.c
linux/net/ipv4/ipvs/ip_vs_ftp.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_ftp.c 2008-01-25 10:45:06.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_ftp.c 2008-01-27 17:55:29.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_ftp.c
linux/net/ipv4/ipvs/ip_vs_ftp.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_ftp.c 2008-01-25 10:45:06.000000000
+0200
++++ linux/net/ipv4/ipvs/ip_vs_ftp.c 2008-04-19 19:55:40.000000000 +0300
@@ -195,6 +195,11 @@ static int ip_vs_ftp_out(struct ip_vs_ap
ip_vs_control_add(n_cp, cp);
}
@@ -255,9 +256,9 @@
/*
* Move tunnel to listen state
*/
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_nfct.c
linux/net/ipv4/ipvs/ip_vs_nfct.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_nfct.c 1970-01-01 02:00:00.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_nfct.c 2008-01-27 18:24:09.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_nfct.c
linux/net/ipv4/ipvs/ip_vs_nfct.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_nfct.c 1970-01-01 02:00:00.000000000
+0200
++++ linux/net/ipv4/ipvs/ip_vs_nfct.c 2008-04-19 20:06:46.000000000 +0300
@@ -0,0 +1,385 @@
+/*
+ * ip_vs_nfct.c: Netfilter connection tracking support for IPVS
@@ -374,7 +375,7 @@
+ }
+#endif
+
-+ if (IP_VS_FWD_METHOD(cp) != IP_VS_CONN_F_MASQ || NF_IP_FORWARD ==
hooknum)
++ if (IP_VS_FWD_METHOD(cp) != IP_VS_CONN_F_MASQ || NF_INET_FORWARD ==
hooknum)
+ goto confirm;
+
+ /*
@@ -644,9 +645,9 @@
+ }
+}
+
-diff -urNp v2.6.24/linux/net/ipv4/ipvs/ip_vs_xmit.c
linux/net/ipv4/ipvs/ip_vs_xmit.c
---- v2.6.24/linux/net/ipv4/ipvs/ip_vs_xmit.c 2008-01-25 10:45:06.000000000
+0200
-+++ linux/net/ipv4/ipvs/ip_vs_xmit.c 2008-01-27 17:56:32.000000000 +0200
+diff -urNp v2.6.25/linux/net/ipv4/ipvs/ip_vs_xmit.c
linux/net/ipv4/ipvs/ip_vs_xmit.c
+--- v2.6.25/linux/net/ipv4/ipvs/ip_vs_xmit.c 2008-04-17 09:58:09.000000000
+0300
++++ linux/net/ipv4/ipvs/ip_vs_xmit.c 2008-04-19 20:04:42.000000000 +0300
@@ -141,7 +141,6 @@ int
ip_vs_null_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
struct ip_vs_protocol *pp)
@@ -659,7 +660,7 @@
dst_release(skb->dst);
skb->dst = &rt->u.dst;
-+ if (!ip_vs_confirm_conntrack(skb, cp, NF_IP_LOCAL_IN))
++ if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
+ goto tx_error_out;
+
/* Another hack: avoid icmp_send in ip_fragment */
@@ -677,7 +678,7 @@
dst_release(skb->dst);
skb->dst = &rt->u.dst;
-+ if (!ip_vs_confirm_conntrack(skb, cp, NF_IP_LOCAL_IN))
++ if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
+ goto tx_error_out;
+
/* mangle the packet */
@@ -706,7 +707,7 @@
dst_release(skb->dst);
skb->dst = &rt->u.dst;
-+ if (!ip_vs_confirm_conntrack(skb, cp, NF_IP_LOCAL_IN))
++ if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
+ goto tx_error_out;
+
+ skb_push(skb, sizeof(struct iphdr));
@@ -716,7 +717,7 @@
/*
* Push down and install the IPIP header.
*/
-@@ -423,6 +433,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, s
+@@ -421,6 +431,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, s
dst_link_failure(skb);
tx_error:
kfree_skb(skb);
@@ -724,17 +725,17 @@
LeaveFunction(10);
return NF_STOLEN;
}
-@@ -468,6 +479,9 @@ ip_vs_dr_xmit(struct sk_buff *skb, struc
+@@ -466,6 +477,9 @@ ip_vs_dr_xmit(struct sk_buff *skb, struc
dst_release(skb->dst);
skb->dst = &rt->u.dst;
-+ if (!ip_vs_confirm_conntrack(skb, cp, NF_IP_LOCAL_IN))
++ if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
+ goto tx_error_out;
+
/* Another hack: avoid icmp_send in ip_fragment */
skb->local_df = 1;
-@@ -480,6 +494,7 @@ ip_vs_dr_xmit(struct sk_buff *skb, struc
+@@ -478,6 +492,7 @@ ip_vs_dr_xmit(struct sk_buff *skb, struc
dst_link_failure(skb);
tx_error:
kfree_skb(skb);
@@ -742,7 +743,7 @@
LeaveFunction(10);
return NF_STOLEN;
}
-@@ -539,6 +554,8 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
+@@ -537,6 +552,8 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
dst_release(skb->dst);
skb->dst = &rt->u.dst;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ipvs-nfct.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
