From: Kishen Maloor Date: Mon, 2 May 2022 20:52:33 +0000 (-0700) Subject: mptcp: store remote id from MP_JOIN SYN/ACK in local ctx X-Git-Tag: v5.19-rc1~159^2~196^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a348392209ffdd70926253f014eec0c04dbf3e7;p=thirdparty%2Flinux.git mptcp: store remote id from MP_JOIN SYN/ACK in local ctx This change reads the addr id assigned to the remote endpoint of a subflow from the MP_JOIN SYN/ACK message and stores it in the related subflow context. The remote id was not being captured prior to this change, and will now provide a consistent view of remote endpoints and their ids as seen through netlink events. Acked-by: Paolo Abeni Signed-off-by: Kishen Maloor Signed-off-by: Mat Martineau Signed-off-by: Jakub Kicinski --- diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 9567231a4bfa6..a0e7af33fb268 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -443,6 +443,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->backup = mp_opt.backup; subflow->thmac = mp_opt.thmac; subflow->remote_nonce = mp_opt.nonce; + subflow->remote_id = mp_opt.join_id; pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u backup=%d", subflow, subflow->thmac, subflow->remote_nonce, subflow->backup);