[MPTCP] Re: [PATCH mptcp] options: copy entire extension area to option struct

* [MPTCP] Re: [PATCH mptcp] options: copy entire extension area to option struct
@ 2019-10-04 22:46 Mat Martineau
  0 siblings, 0 replies; 2+ messages in thread
From: Mat Martineau @ 2019-10-04 22:46 UTC (permalink / raw)
  To: mptcp

[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]

On Fri, 4 Oct 2019, Florian Westphal wrote:

> No reason to copy each member individually, just copy everything.
> This means we will also copy ext->data_fin which was not done before.

Looks good to me. I think the missing data_fin copy was a bug.

Mat

>
> squashto: "mptcp: Write MPTCP DSS headers to outgoing data packets"
>
> Signed-off-by: Florian Westphal <fw(a)strlen.de>
> ---
> net/mptcp/options.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index a33c202db009..d00e86550d8b 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -402,13 +402,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
> 		if (map_size <= remaining) {
> 			remaining -= map_size;
> 			dss_size = map_size;
> -			if (mpext) {
> -				opts->ext_copy.data_seq = mpext->data_seq;
> -				opts->ext_copy.subflow_seq = mpext->subflow_seq;
> -				opts->ext_copy.data_len = mpext->data_len;
> -				opts->ext_copy.use_map = 1;
> -				opts->ext_copy.dsn64 = mpext->dsn64;
> -			}
> +			if (mpext)
> +				opts->ext_copy = *mpext;
> 		} else {
> 			opts->ext_copy.use_map = 0;
> 			WARN_ONCE(1, "MPTCP: Map dropped");
> -- 
> 2.21.0
> _______________________________________________
> mptcp mailing list -- mptcp(a)lists.01.org
> To unsubscribe send an email to mptcp-leave(a)lists.01.org
>

--
Mat Martineau
Intel

^ permalink raw reply	[flat|nested] 2+ messages in thread