| Message ID | 1333292683-31414-1-git-send-email-xiaosuo@gmail.com |
|---|---|
| State | Rejected |
| Headers | show |
On Sun, Apr 01, 2012 at 11:04:43PM +0800, Changli Gao wrote: > For a picked up connection, the window scaling option is also lost, because this > option is only valid in SYN or SYN/ACK segments. We should remove the useless > expression to save the CPU power. > > Signed-off-by: Changli Gao <xiaosuo@gmail.com> > --- > net/netfilter/nf_conntrack_proto_tcp.c | 1 - > 1 file changed, 1 deletion(-) > diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c > index 361eade..22f0500 100644 > --- a/net/netfilter/nf_conntrack_proto_tcp.c > +++ b/net/netfilter/nf_conntrack_proto_tcp.c > @@ -584,7 +584,6 @@ static bool tcp_in_window(const struct nf_conn *ct, > * Let's try to use the data from the packet. > */ > sender->td_end = end; > - win <<= sender->td_scale; This breaks conntrackd and its ability to recover flows by injecting the window scaling via ctnetlink. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 2, 2012 at 12:21 AM, Pablo Neira Ayuso <pablo@netfilter.org> wrote: > > This breaks conntrackd and its ability to recover flows by injecting > the window scaling via ctnetlink. Got it. Thanks. Just forget this patch. I'll post another patch to fix the duplicate window scaling: one is here, and the other is before the state updating code.
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 361eade..22f0500 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -584,7 +584,6 @@ static bool tcp_in_window(const struct nf_conn *ct, * Let's try to use the data from the packet. */ sender->td_end = end; - win <<= sender->td_scale; sender->td_maxwin = (win == 0 ? 1 : win); sender->td_maxend = end + sender->td_maxwin; /*
For a picked up connection, the window scaling option is also lost, because this option is only valid in SYN or SYN/ACK segments. We should remove the useless expression to save the CPU power. Signed-off-by: Changli Gao <xiaosuo@gmail.com> --- net/netfilter/nf_conntrack_proto_tcp.c | 1 - 1 file changed, 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html