Commit 8c0bb787 authored by Fernando Fernandez Mancera's avatar Fernando Fernandez Mancera Committed by Pablo Neira Ayuso
Browse files

netfilter: synproxy: rename mss synproxy_options field 



After introduce "mss_encode" field in the synproxy_options struct the field
"mss" is a little confusing. It has been renamed to "mss_option".

Signed-off-by: default avatarFernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4de97b0c

include/net/netfilter/nf_conntrack_synproxy.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static inline struct synproxy_net *synproxy_pernet(struct net *net) 
struct synproxy_options {

	u8				options;

	u8				wscale;

	u16				mss;

	u16				mss_option;

	u16				mss_encode;

	u32				tsval;

	u32				tsecr;

net/ipv4/netfilter/ipt_SYNPROXY.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par) 
			opts.options |= XT_SYNPROXY_OPT_ECN;



		opts.options &= info->options;

		opts.mss_encode = opts.mss;

		opts.mss = info->mss;

		opts.mss_encode = opts.mss_option;

		opts.mss_option = info->mss;

		if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP)

			synproxy_init_timestamp_cookie(info, &opts);

		else

net/ipv6/netfilter/ip6t_SYNPROXY.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par) 
			opts.options |= XT_SYNPROXY_OPT_ECN;



		opts.options &= info->options;

		opts.mss_encode = opts.mss;

		opts.mss = info->mss;

		opts.mss_encode = opts.mss_option;

		opts.mss_option = info->mss;

		if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP)

			synproxy_init_timestamp_cookie(info, &opts);

		else

net/netfilter/nf_synproxy_core.c

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, 
			switch (opcode) {

			case TCPOPT_MSS:

				if (opsize == TCPOLEN_MSS) {

					opts->mss = get_unaligned_be16(ptr);

					opts->mss_option = get_unaligned_be16(ptr);

					opts->options |= NF_SYNPROXY_OPT_MSS;

				}

				break;
@@ -115,7 +115,7 @@ synproxy_build_options(struct tcphdr *th, const struct synproxy_options *opts) 
	if (options & NF_SYNPROXY_OPT_MSS)

		*ptr++ = htonl((TCPOPT_MSS << 24) |

			       (TCPOLEN_MSS << 16) |

			       opts->mss);

			       opts->mss_option);



	if (options & NF_SYNPROXY_OPT_TIMESTAMP) {

		if (options & NF_SYNPROXY_OPT_SACK_PERM)
@@ -642,7 +642,7 @@ synproxy_recv_client_ack(struct net *net, 
	}



	this_cpu_inc(snet->stats->cookie_valid);

	opts->mss = mss;

	opts->mss_option = mss;

	opts->options |= NF_SYNPROXY_OPT_MSS;



	if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP)
@@ -1060,7 +1060,7 @@ synproxy_recv_client_ack_ipv6(struct net *net, 
	}



	this_cpu_inc(snet->stats->cookie_valid);

	opts->mss = mss;

	opts->mss_option = mss;

	opts->options |= NF_SYNPROXY_OPT_MSS;



	if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP)

net/netfilter/nft_synproxy.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ static void nft_synproxy_tcp_options(struct synproxy_options *opts, 
		opts->options |= NF_SYNPROXY_OPT_ECN;



	opts->options &= priv->info.options;

	opts->mss_encode = opts->mss;

	opts->mss = info->mss;

	opts->mss_encode = opts->mss_option;

	opts->mss_option = info->mss;

	if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP)

		synproxy_init_timestamp_cookie(info, opts);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE