Jozsef Kadlecsik f9dd09c7f7 netfilter: nf_nat: fix NAT issue in 2.6.30.4+ ... Vitezslav Samel discovered that since 2.6.30.4+ active FTP can not work over NAT. The "cause" of the problem was a fix of unacknowledged data detection with NAT (commit a3a9f79e36). However, actually, that fix uncovered a long standing bug in TCP conntrack: when NAT was enabled, we simply updated the max of the right edge of the segments we have seen (td_end), by the offset NAT produced with changing IP/port in the data. However, we did not update the other parameter (td_maxend) which is affected by the NAT offset. Thus that could drift away from the correct value and thus resulted breaking active FTP. The patch below fixes the issue by *not* updating the conntrack parameters from NAT, but instead taking into account the NAT offsets in conntrack in a consistent way. (Updating from NAT would be more harder and expensive because it'd need to re-calculate parameters we already calculated in conntrack.) Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>		2009-11-06 00:43:42 -08:00
..
acpi	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-09-24 10:30:41 -07:00
asm-generic	Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6	2009-09-24 07:53:22 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
drm	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-09-24 10:30:41 -07:00
keys	RxRPC: Use uX/sX rather than uintX_t/intX_t types	2009-09-16 00:01:13 -07:00
linux	net: fix sk_forward_alloc corruption	2009-10-30 12:25:12 -07:00
math-emu	…
media	V4L/DVB (13019): video: initial support for ADV7180	2009-09-19 00:53:39 -03:00
mtd	…
net	netfilter: nf_nat: fix NAT issue in 2.6.30.4+	2009-11-06 00:43:42 -08:00
pcmcia	pcmcia: Use phys_addr_t for physical addresses	2009-09-15 10:17:15 -07:00
rdma	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
rxrpc	…
scsi	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
sound	Merge branch 'topic/ymfpci' into for-linus	2009-09-10 15:33:09 +02:00
trace	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-23 09:46:15 -07:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen	…
Kbuild	…