Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 122868b3 authored by Gao Feng's avatar Gao Feng Committed by Pablo Neira Ayuso
Browse files

netfilter: tcp: Use TCP_MAX_WSCALE instead of literal 14 

The window scale may be enlarged from 14 to 15 according to the itef
draft https://tools.ietf.org/html/draft-nishida-tcpm-maxwin-03

.

Use the macro TCP_MAX_WSCALE to support it easily with TCP stack in
the future.

Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent be7be6e1

net/netfilter/nf_conntrack_proto_tcp.c

+3 −4
Original line number Diff line number Diff line
@@ -419,10 +419,9 @@ static void tcp_options(const struct sk_buff *skb, 
				 && opsize == TCPOLEN_WINDOW) {

				state->td_scale = *(u_int8_t *)ptr;



				if (state->td_scale > 14) {

					/* See RFC1323 */

					state->td_scale = 14;

				}

				if (state->td_scale > TCP_MAX_WSCALE)

					state->td_scale = TCP_MAX_WSCALE;



				state->flags |=

					IP_CT_TCP_FLAG_WINDOW_SCALE;

			}

net/netfilter/nf_synproxy_core.c

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, 
			case TCPOPT_WINDOW:

				if (opsize == TCPOLEN_WINDOW) {

					opts->wscale = *ptr;

					if (opts->wscale > 14)

						opts->wscale = 14;

					if (opts->wscale > TCP_MAX_WSCALE)

						opts->wscale = TCP_MAX_WSCALE;

					opts->options |= XT_SYNPROXY_OPT_WSCALE;

				}

				break;