# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/09 22:51:34+01:00 yasuyuki.kozakai@toshiba.co.jp # [NETFILTER]: Fix truncated sequence numbers in FTP helper # # Signed-off-by: Yasuyuki KOZAKAI # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/ip_conntrack_ftp.c # 2005/03/09 22:51:26+01:00 yasuyuki.kozakai@toshiba.co.jp +2 -2 # [NETFILTER]: Fix truncated sequence numbers in FTP helper # # Signed-off-by: Yasuyuki KOZAKAI # Signed-off-by: Patrick McHardy # diff -Nru a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c --- a/net/ipv4/netfilter/ip_conntrack_ftp.c 2005-04-18 03:59:47 +02:00 +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c 2005-04-18 03:59:47 +02:00 @@ -252,7 +252,7 @@ } /* Look up to see if we're just after a \n. */ -static int find_nl_seq(u16 seq, const struct ip_ct_ftp_master *info, int dir) +static int find_nl_seq(u32 seq, const struct ip_ct_ftp_master *info, int dir) { unsigned int i; @@ -263,7 +263,7 @@ } /* We don't update if it's older than what we have. */ -static void update_nl_seq(u16 nl_seq, struct ip_ct_ftp_master *info, int dir) +static void update_nl_seq(u32 nl_seq, struct ip_ct_ftp_master *info, int dir) { unsigned int i, oldest = NUM_SEQ_TO_REMEMBER;