iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mptcp: add port support for ADD_ADDR suboption writing

Browse Source 
In rfc8684, the length of ADD_ADDR suboption with IPv4 address and port
is 18 octets, but mptcp_write_options is 32-bit aligned, so we need to
pad it to 20 octets. All the other port related option lengths need to
be added up 2 octets similarly.

This patch added a new field 'port' in mptcp_out_options. When this
field is set with a port number, we need to add up 4 octets for the
ADD_ADDR suboption, and put the port number into the suboption.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geliang Tang
2020-12-09 15:51:20 -08:00
committed by David S. Miller
parent e1ef683222
commit 22fb85ffae
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net/mptcp/options.c
View File

@ -1083,6 +1083,9 @@ mp_capable_done:
len = TCPOLEN_MPTCP_ADD_ADDR6_BASE;
#endif
if (opts->port)
len += TCPOLEN_MPTCP_PORT_LEN;
if (opts->ahmac) {
len += sizeof(opts->ahmac);
echo = 0;
@ -1100,9 +1103,30 @@ mp_capable_done:
ptr += 4;
}
#endif
if (opts->ahmac) {
put_unaligned_be64(opts->ahmac, ptr);
ptr += 2;
if (!opts->port) {
if (opts->ahmac) {
put_unaligned_be64(opts->ahmac, ptr);
ptr += 2;
}
} else {
if (opts->ahmac) {
u8 *bptr = (u8 *)ptr;
put_unaligned_be16(opts->port, bptr);
bptr += 2;
put_unaligned_be64(opts->ahmac, bptr);
bptr += 8;
put_unaligned_be16(TCPOPT_NOP << 8 |
TCPOPT_NOP, bptr);
ptr += 3;
} else {
put_unaligned_be32(opts->port << 16 |
TCPOPT_NOP << 8 |
TCPOPT_NOP, ptr);
ptr += 1;
}
}
}