From nobody Sun May 5 04:23:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp95245jad; Fri, 25 Feb 2022 01:01:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+PpD2NGqJzvPA9tKxgDBL5PhxdU1HTrl3FPmBQnE9xyBx9kFZ0lsXdh6Zq51nz9ku+Cdx X-Received: by 2002:a63:e01:0:b0:374:2525:7690 with SMTP id d1-20020a630e01000000b0037425257690mr5417683pgl.37.1645779698181; Fri, 25 Feb 2022 01:01:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645779698; cv=none; d=google.com; s=arc-20160816; b=By+U1eFz184WKU0TyKzfcDdMfaCAYhHbFdPtccU2Nak05+mwHt8nH0uMBK6+r41haN Cj2NMfNBOhkcc87zhhGj1ey8A88QnSmKqFmTCcGvtJHHW+05b3zGHXaHNF5nIb0x/oU/ D+mfxdy3ChK1RpSR41dMNQB8OfsMIobPiTRc2eCdHF2JBSnnhQt9KXgYx+VaIiLNiODM zsMB+QtOdl5W1roBI+ib8g4HzcxhwvIkde1+RJ2e4+6J1qg7OEpl0Q6RqtQlv6u5h76g b85CvEXb1OgSzvC5ZOQEzjLzWAj7E7ie5zmjP04osi49qQbIDTWqMeVCdQ2AlG8E1SA5 swtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:sender:hmm_source_type:hmm_attache_num:hmm_source_ip; bh=RaHlOsrJxa5BgIvur6V6CYwcWNCxUbwPrGFbQjvJOu8=; b=HcX3Fqks4Ila+M5mckalDJcqMVFu4TWRt3U5Vmy/mUMzfPYroYdqSIY5Osc8tyXnnP nf+zC4/sZbgv4ccF0cRmfq66F7QXmguWxFXqBnV61X4ypibjQp7Asxslf7MUmngROuJw 0B34TkoJmYcKk7mKdDbM4ODeg5CHOuKMwanHrLezBpEN+bpZP6tp5Y35a1llNaTOlWzd JtMoE6rR98GcW2C7IJAoax/m4fESotgbbDL8BsamJ+iwpOpD1k/DexFcs7nQIwbPhEEm CGLwgDYAEDVwQcs9RMOoTh/xalwEgYWwf5LwsfGQcSR5oM6xxctEH+NkLmIyIMVG4Xqk gU0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4043-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4043-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id q3-20020a654943000000b0037379c69283si1400854pgs.719.2022.02.25.01.01.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Feb 2022 01:01:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4043-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4043-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4043-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 85E833E0F29 for ; Fri, 25 Feb 2022 09:01:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 92F551FAB; Fri, 25 Feb 2022 09:01:36 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.219]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8BF467A for ; Fri, 25 Feb 2022 09:01:34 +0000 (UTC) HMM_SOURCE_IP: 172.18.0.188:59116.1625256782 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-36.111.140.9 (unknown [172.18.0.188]) by chinatelecom.cn (HERMES) with SMTP id 049BB2800DF; Fri, 25 Feb 2022 16:53:59 +0800 (CST) X-189-SAVE-TO-SEND: +liyonglong@chinatelecom.cn Received: from ([172.18.0.188]) by app0023 with ESMTP id abdff6f5ae484c348652c149af82ca1f for mptcp@lists.linux.dev; Fri, 25 Feb 2022 16:53:59 CST X-Transaction-ID: abdff6f5ae484c348652c149af82ca1f X-Real-From: liyonglong@chinatelecom.cn X-Receive-IP: 172.18.0.188 X-MEDUSA-Status: 0 Sender: liyonglong@chinatelecom.cn From: Yonglong Li To: mptcp@lists.linux.dev Cc: mathew.j.martineau@linux.intel.com, matthieu.baerts@tessares.net, Yonglong Li Subject: [PATCH] mptcp: send ADD_ADDR echo before create subflows Date: Fri, 25 Feb 2022 16:53:53 +0800 Message-Id: <1645779233-19742-1-git-send-email-liyonglong@chinatelecom.cn> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In some corner case, It may receive ADD_ADDR retransmit package before created subflows done. It's more reasonable to send ADD_ADDR echo before creating subflows. Signed-off-by: Yonglong Li --- net/mptcp/pm_netlink.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e3b0384..c1f4bef 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -650,7 +650,6 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_= sock *msk) unsigned int add_addr_accept_max; struct mptcp_addr_info remote; unsigned int subflows_max; - bool reset_port =3D false; int i, nr; =20 add_addr_accept_max =3D mptcp_pm_get_add_addr_accept_max(msk); @@ -661,14 +660,15 @@ static void mptcp_pm_nl_add_addr_received(struct mptc= p_sock *msk) msk->pm.remote.family); =20 remote =3D msk->pm.remote; + mptcp_pm_announce_addr(msk, &remote, true); + mptcp_pm_nl_addr_send_ack(msk); + if (lookup_subflow_by_daddr(&msk->conn_list, &remote)) - goto add_addr_echo; + return; =20 /* pick id 0 port, if none is provided the remote address */ - if (!remote.port) { - reset_port =3D true; + if (!remote.port) remote.port =3D sk->sk_dport; - } =20 /* connect to the specified remote address, using whatever * local address the routing configuration will pick. @@ -684,14 +684,6 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp= _sock *msk) for (i =3D 0; i < nr; i++) __mptcp_subflow_connect(sk, &addrs[i], &remote); spin_lock_bh(&msk->pm.lock); - - /* be sure to echo exactly the received address */ - if (reset_port) - remote.port =3D 0; - -add_addr_echo: - mptcp_pm_announce_addr(msk, &remote, true); - mptcp_pm_nl_addr_send_ack(msk); } =20 void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) --=20 1.8.3.1