[netfilter-cvslog] r3781 - trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2005-03-10 18:09:43 +0100 (Thu, 10 Mar 2005)
New Revision: 3781

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
Log:
fixed the bug overwrites destination address of expected connection.

Signed-off-by Yasuyuki KOZAKAI <yasuyuki.kozakai at toshiba.co.jp>



Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c	2005-03-10 16:20:41 UTC (rev 3780)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c	2005-03-10 17:09:43 UTC (rev 3781)
@@ -567,15 +567,12 @@
 
 	if (cmd.l3num == PF_INET) {
 		exp->tuple.src.u3.ip = ct->tuplehash[!dir].tuple.src.u3.ip;
-		exp->tuple.dst.u3.ip = cmd.u3.ip;
 		exp->mask.src.u3.ip = 0xFFFFFFFF;
 		exp->mask.dst.u3.ip = 0xFFFFFFFF;
 	} else {
 		memcpy(exp->tuple.src.u3.ip6,
 		       ct->tuplehash[!dir].tuple.src.u3.ip6,
 		       sizeof(exp->tuple.src.u3.ip6));
-		memcpy(exp->tuple.dst.u3.ip6, cmd.u3.ip6,
-		       sizeof(exp->tuple.dst.u3.ip6));
 		memset(exp->mask.src.u3.ip6, 0xFF,
 		       sizeof(exp->mask.src.u3.ip6));
 		memset(exp->mask.dst.u3.ip6, 0xFF,