Commit 6eb3d1e3 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: unify ADD_ADDR and echo suboptions writing 



There are two differences between ADD_ADDR suboption and ADD_ADDR echo
suboption: The length of the former is 8 octets longer than the length
of the latter. The former's echo-flag is 0, and latter's echo-flag is 1.

This patch added two local variables, len and echo, to unify ADD_ADDR
and ADD_ADDR echo suboptions writing.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc528d5b

net/mptcp/options.c

+19 −18
Original line number Diff line number Diff line
@@ -1071,15 +1071,16 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, 


mp_capable_done:

	if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {

		if (opts->ahmac)

			*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,

					      TCPOLEN_MPTCP_ADD_ADDR, 0,

					      opts->addr_id);

		else

		u8 len = TCPOLEN_MPTCP_ADD_ADDR_BASE;

		u8 echo = MPTCP_ADDR_ECHO;



		if (opts->ahmac) {

			len += sizeof(opts->ahmac);

			echo = 0;

		}



		*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,

					      TCPOLEN_MPTCP_ADD_ADDR_BASE,

					      MPTCP_ADDR_ECHO,

					      opts->addr_id);

				      len, echo, opts->addr_id);

		memcpy((u8 *)ptr, (u8 *)&opts->addr.s_addr, 4);

		ptr += 1;

		if (opts->ahmac) {
@@ -1090,15 +1091,15 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, 


#if IS_ENABLED(CONFIG_MPTCP_IPV6)

	if (OPTION_MPTCP_ADD_ADDR6 & opts->suboptions) {

		if (opts->ahmac)

			*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,

					      TCPOLEN_MPTCP_ADD_ADDR6, 0,

					      opts->addr_id);

		else

		u8 len = TCPOLEN_MPTCP_ADD_ADDR6_BASE;

		u8 echo = MPTCP_ADDR_ECHO;



		if (opts->ahmac) {

			len += sizeof(opts->ahmac);

			echo = 0;

		}

		*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,

					      TCPOLEN_MPTCP_ADD_ADDR6_BASE,

					      MPTCP_ADDR_ECHO,

					      opts->addr_id);

				      len, echo, opts->addr_id);

		memcpy((u8 *)ptr, opts->addr6.s6_addr, 16);

		ptr += 4;

		if (opts->ahmac) {