OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Fernando Fernandez Mancera 2019-07-10 12:05:59 +02:00 committed by Pablo Neira Ayuso
parent 4de97b0c86
commit 8c0bb78738
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netfilter/nf_conntrack_synproxy.h
View File

@ -67,7 +67,7 @@ static inline struct synproxy_net *synproxy_pernet(struct net *net)
struct synproxy_options { struct synproxy_options {
u8 options; u8 options;
u8 wscale; u8 wscale;
u16 mss; u16 mss_option;
u16 mss_encode; u16 mss_encode;
u32 tsval; u32 tsval;
u32 tsecr; u32 tsecr;

4
net/ipv4/netfilter/ipt_SYNPROXY.c
View File

@ -36,8 +36,8 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)
opts.options |= XT_SYNPROXY_OPT_ECN; opts.options |= XT_SYNPROXY_OPT_ECN;
opts.options &= info->options; opts.options &= info->options;
opts.mss_encode = opts.mss; opts.mss_encode = opts.mss_option;
opts.mss = info->mss; opts.mss_option = info->mss;
if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP) if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP)
synproxy_init_timestamp_cookie(info, &opts); synproxy_init_timestamp_cookie(info, &opts);
else else

4
net/ipv6/netfilter/ip6t_SYNPROXY.c
View File

@ -36,8 +36,8 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par)
opts.options |= XT_SYNPROXY_OPT_ECN; opts.options |= XT_SYNPROXY_OPT_ECN;
opts.options &= info->options; opts.options &= info->options;
opts.mss_encode = opts.mss; opts.mss_encode = opts.mss_option;
opts.mss = info->mss; opts.mss_option = info->mss;
if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP) if (opts.options & XT_SYNPROXY_OPT_TIMESTAMP)
synproxy_init_timestamp_cookie(info, &opts); synproxy_init_timestamp_cookie(info, &opts);
else else

8
net/netfilter/nf_synproxy_core.c
View File

@ -56,7 +56,7 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
switch (opcode) { switch (opcode) {
case TCPOPT_MSS: case TCPOPT_MSS:
if (opsize == TCPOLEN_MSS) { if (opsize == TCPOLEN_MSS) {
opts->mss = get_unaligned_be16(ptr); opts->mss_option = get_unaligned_be16(ptr);
opts->options |= NF_SYNPROXY_OPT_MSS; opts->options |= NF_SYNPROXY_OPT_MSS;
} }
break; break;
@ -115,7 +115,7 @@ synproxy_build_options(struct tcphdr *th, const struct synproxy_options *opts)
if (options & NF_SYNPROXY_OPT_MSS) if (options & NF_SYNPROXY_OPT_MSS)
*ptr++ = htonl((TCPOPT_MSS << 24) | *ptr++ = htonl((TCPOPT_MSS << 24) |
(TCPOLEN_MSS << 16) | (TCPOLEN_MSS << 16) |
opts->mss); opts->mss_option);
if (options & NF_SYNPROXY_OPT_TIMESTAMP) { if (options & NF_SYNPROXY_OPT_TIMESTAMP) {
if (options & NF_SYNPROXY_OPT_SACK_PERM) 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); this_cpu_inc(snet->stats->cookie_valid);
opts->mss = mss; opts->mss_option = mss;
opts->options |= NF_SYNPROXY_OPT_MSS; opts->options |= NF_SYNPROXY_OPT_MSS;
if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP) 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); this_cpu_inc(snet->stats->cookie_valid);
opts->mss = mss; opts->mss_option = mss;
opts->options |= NF_SYNPROXY_OPT_MSS; opts->options |= NF_SYNPROXY_OPT_MSS;
if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP) if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP)

4
net/netfilter/nft_synproxy.c
View File

@ -31,8 +31,8 @@ static void nft_synproxy_tcp_options(struct synproxy_options *opts,
opts->options |= NF_SYNPROXY_OPT_ECN; opts->options |= NF_SYNPROXY_OPT_ECN;
opts->options &= priv->info.options; opts->options &= priv->info.options;
opts->mss_encode = opts->mss; opts->mss_encode = opts->mss_option;
opts->mss = info->mss; opts->mss_option = info->mss;
if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP) if (opts->options & NF_SYNPROXY_OPT_TIMESTAMP)
synproxy_init_timestamp_cookie(info, opts); synproxy_init_timestamp_cookie(info, opts);
else else