From nobody Tue May 7 11:52:38 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp1544770jai; Sat, 22 Jan 2022 01:32:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0eZZhcIRfK66stMXDTJ8bkns9DFDVaEAUJqHcoHzvNY5OUxIH9tkGx1RJwNFCiH3N+WY6 X-Received: by 2002:a62:1ec3:0:b0:4bb:ea7d:6c4f with SMTP id e186-20020a621ec3000000b004bbea7d6c4fmr6850712pfe.4.1642843927330; Sat, 22 Jan 2022 01:32:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642843927; cv=none; d=google.com; s=arc-20160816; b=wtK/CAFpclQE9yRSOJxiwusTRqSsa7whW96QOH5fkx1V9scIOlRyztRy8JtQ4hc2YB At/YkmDta3dUBy7bEKi/4NW1C0e7RaBmkpBxBG2eAjwRDGWS0krTjpUC7kJ07BjE4/bv obczYEC/VV83aJr+q1LBbu9RvYrcf5sFCJOpyeh8yOndQ6HLUS8UzqRRftFPC3g8GOTt Od453+CCbWBaGllhlXifQhexCtpM0/UgRzJglPmJv7CkazmzRMBu9mTaFKTYDLvwyhdK PIPX90G1takP2RdfeRMaXU9N+qMisJ78MoAZf4qT05HW/+aUaSbT6rde1nVa76D7FPgI Oe1g== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tlDv4gZbdVacz06p8V3Lhy23EGWDxyl64uR68uWlQWo=; b=g2YKpaBpjU9bCKM/XfqcqKs9x102SZWccmrqZyLadTdzCnOmZeq0zulvu925jJcCew yU+ClxI+Iu9a1PqerWULM/xYdNOjnkYLdZJbQVMFx2VSOCjFmfNdjj5+4rB2uBlgmykD 5JvqmWD5w2b5oXaxL3LHcqxT62csDmzUyCvk/FJ8hHTA9AwXroijEUtiuL5zR4ml4cKv rjzGfTyqWgEuLTmszUmrg1f8a7PVV/ouSMx8cGvWZCPtjRT6x03PxRKXsuB/1BER3Cv1 6SPtsJlEJnSIfjOUjlhhG1pywF3X3CQupXiLHigg8NMdUFzn/CvZMdknIPkVU2FZgfJo oG0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=RyMKsmJG; spf=pass (google.com: domain of mptcp+bounces-3285-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3285-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 y21si8097517pll.485.2022.01.22.01.32.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jan 2022 01:32:07 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3285-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; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=RyMKsmJG; spf=pass (google.com: domain of mptcp+bounces-3285-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3285-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 099763E0E66 for ; Sat, 22 Jan 2022 09:32:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BCB332CAB; Sat, 22 Jan 2022 09:32:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57D162C9C for ; Sat, 22 Jan 2022 09:32:03 +0000 (UTC) Received: by mail-ej1-f51.google.com with SMTP id d10so6768193eje.10 for ; Sat, 22 Jan 2022 01:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tlDv4gZbdVacz06p8V3Lhy23EGWDxyl64uR68uWlQWo=; b=RyMKsmJG3bI/EYmjyFQT2E9wZdBzPAiEJ6FrlYesHgskqHJUxuEWwatuodgojZyvw3 UUhHCqRiTLiU5b5igoPYCvdvlZR4gjI0aBccP1DLh+DT8/yUkRWsv4/rVBzbpQm1++Zq pgBQnHt0CwNlN9hVjap+DKGqM8ujXJ8DC6ecohRMwRRI4lzo7pMaBcYxSbG9Ixw94QdJ ABSGDCpF0P35hbbwiaRvmwtDz0WLXdVTTp1HxDPnFIU/EL+cnRIQO0xEMmons+OYIDP4 0R/i/WkFZwzXp0F06TpF14ILjjbr4afgSFAO46MfBM8FE3Rx0bRYKmweIo0SozGMG98P nrVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tlDv4gZbdVacz06p8V3Lhy23EGWDxyl64uR68uWlQWo=; b=SApoAcqT136lnGgZmZzr8zQK5iA+Nw9EgWEfe574j3O25tSrEp8GaR+bYIv9aacmV4 W2byV4yE9Tkg32XbS3rnaZysWvPS5BA4LxaXSII8nO1rNKxB5uMnVc3v5sOebx46S5Y0 QHQw1iEMkKL+OB9bQuUf1NRBnuq2njGLyXT0BG1vO9RJ5NkTXXILA8hAwm4nxNQ3bWZK 9Ar69onscwA0N2JEfi4rizGKjuNpvqHrIaxWliSkemg1hoXWZCE1a6DpPFbqY4itmh+x 16gXMOK+hcLs+LQHP8j3AYlWNWCbKQeJ0yzjW0t/SqD61MjkozgSADA90saX2VYws+I4 thYQ== X-Gm-Message-State: AOAM530F6kozgmtZA1ktDr0QfXYKIi1Z9K9LjAT0cV5e0T+eoBzmts7S p6tcjWTwuWLvUJe9zmd93rengX0tcvtUW8+M X-Received: by 2002:a17:906:58c7:: with SMTP id e7mr1019666ejs.42.1642843921147; Sat, 22 Jan 2022 01:32:01 -0800 (PST) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id e28sm2776994ejm.94.2022.01.22.01.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 01:32:00 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-net 1/2] mptcp: mptcp_parse_option is no longer exported Date: Sat, 22 Jan 2022 10:31:34 +0100 Message-Id: <20220122093135.4023846-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220122093135.4023846-1-matthieu.baerts@tessares.net> References: <20220122093135.4023846-1-matthieu.baerts@tessares.net> 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" Options parsing in now done from mptcp_incoming_options(). mptcp_parse_option() has been removed from mptcp.h when CONFIG_MPTCP is defined but not when it is not. Fixes: cfde141ea3fa ("mptcp: move option parsing into mptcp_incoming_option= s()") Signed-off-by: Matthieu Baerts Acked-by: Paolo Abeni Reviewed-by: Mat Martineau --- include/net/mptcp.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 04f53352a1c9..8b1afd6f5cc4 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -218,12 +218,6 @@ static inline bool rsk_drop_req(const struct request_s= ock *req) return false; } =20 -static inline void mptcp_parse_option(const struct sk_buff *skb, - const unsigned char *ptr, int opsize, - struct tcp_options_received *opt_rx) -{ -} - static inline bool mptcp_syn_options(struct sock *sk, const struct sk_buff= *skb, unsigned int *size, struct mptcp_out_options *opts) --=20 2.33.1 From nobody Tue May 7 11:52:38 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp1544781jai; Sat, 22 Jan 2022 01:32:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwRJ0di2oOBSTaLC57hgBZbIb3O7DuWNngJdYJe55hyXNqPRA9OMS7OUuUP1LyaGf9ksWe X-Received: by 2002:a05:6214:4118:: with SMTP id kc24mr3596437qvb.41.1642843928856; Sat, 22 Jan 2022 01:32:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642843928; cv=none; d=google.com; s=arc-20160816; b=mtY6e01FPXOfWQOcoRBxu8YZtPJp5hFFHY0vMmAakU9u0R6ngraLfzx/rncNIdNoDp SWm7jXsHJsofVGZvOhgGR06dkdY1P9JgCD1Bfhk08ohBHQgWEkhBuaEjPlJ+V1/7gkOg yW8CQWlrbODcuKFtP8TT4on6oNFLqyrQBNW+UviteJBHp7A5Zd/NQgUcI+FiNNf2tyqF EY3OlXEF4B64xufS6W8fWr+eA5ax97WgeILYZKkGgilAXbAX2h3sONIJr8649XHx+GJS ybqQFOwXKenPKYUEKespO6PFAeWv7Xw8j3sdXdvnAruX482WV5wuie4hJX+M1a4Em5zA TlyQ== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=wiKxGhVxsNISAMRH82PbmIbZTtNQt0gphY/DFBwNz2M=; b=BwqSh8YPGxr1NME8smvPJBidUOyKCxdnjsNCuVE4BgcN+ceG5fWJVBJcsfi9zRuEQZ JzxHTS/67EaywGPHvy5i0AmtxoRxELR3JsOpmUZntKODI4Y+/vFjdT0ir1UEt2923mxQ LYWtbX0htNQB2+dEuC+BLGxtFG/nIOfZMCbZQXRbbJ9eC51V44NU3qdAOWLUxLamCAC+ +f9LulcOvLfpgWwEF5Js8eo+SH464nPkPnuxefOTWah0c8JfZT8Jc2WgvQ4qWnNkgpxi blkaza++drdw7E2vuDb+x0F02GlrBBXwc4LJEiZlidb2Gjvuo3RSponaiyeJJeBPqtgb 55KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=l6Lgnfcq; spf=pass (google.com: domain of mptcp+bounces-3286-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3286-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id w22si3978604qtj.398.2022.01.22.01.32.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jan 2022 01:32:08 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3286-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=l6Lgnfcq; spf=pass (google.com: domain of mptcp+bounces-3286-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3286-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 966221C09A7 for ; Sat, 22 Jan 2022 09:32:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C715E2CAC; Sat, 22 Jan 2022 09:32:05 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 923382CA8 for ; Sat, 22 Jan 2022 09:32:03 +0000 (UTC) Received: by mail-ej1-f42.google.com with SMTP id s5so6756888ejx.2 for ; Sat, 22 Jan 2022 01:32:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wiKxGhVxsNISAMRH82PbmIbZTtNQt0gphY/DFBwNz2M=; b=l6LgnfcqWCeR0riv3Rw2Vi3dXfkI+I3ILjEKqhXZiVZq7AyQS3OEmpOGmyEouosIhY QVkKrR0vLXi45kb3uchn7JRk0WQmdtalzd8QI9JBYwofYrFIQCT9Sy3egSSccKiAmb9E kWqaSC4QFP/P/kWQWh9b1L4ySiGXeRE6lp3kmYlQrqRz/2dPGJCDUcIvONvBgUM3Spzb ZeVQY7ocq8f7f0Nsl2ShNTNv8U9fBpcFR3NIMN16hxnMzwwaQHrWstXpErvgBk6HLeaO KI17RE2QcDD0imVbqejGT45By4lNmYMoM+rKwNhuznrKEtHrr18+bR/lOyslC3AxHbhe Io9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wiKxGhVxsNISAMRH82PbmIbZTtNQt0gphY/DFBwNz2M=; b=Rcn1x44UEXbeh2C6d7AgA1rgXBn1F0H6L/EtxhPSay2l68zIq/ueZHFrfMbbwweA27 GcL7dUfyng/R9omwMUwyURNBPoWwVqxwZpp7DLEmfix6p0ixrpxgRjJwG1DmpIDriUwh edRcTEATVDPuPgOnEiu8vqyoWEICJSoa/A2h+j3MAdvVefzzugxB3GT5yfApXQC4/1oN 4x6JsqZdmUkXXx28v9+UTtZJmabFq7y6XpjXZaQvFoxjEeK60naNBOMn/yP4XQr+BWMj MFeQtEGGrRzlu2UqFhnQiTQE9VW5tAqTLelQ5ID5bY0qoJdc1VroED/uncd0Kzp+zkMX hP8w== X-Gm-Message-State: AOAM5322KfguMJj2Z4XoJePUk5t51HS4gOjSkrQ5Cgx59bC/u3E8ERcu xAQpQZMu6CmuqvJ5nVNOL+a30Gjk6BPDZWWi X-Received: by 2002:a17:907:60d0:: with SMTP id hv16mr808347ejc.500.1642843921715; Sat, 22 Jan 2022 01:32:01 -0800 (PST) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id e28sm2776994ejm.94.2022.01.22.01.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 01:32:01 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Paolo Abeni Subject: [PATCH mptcp-net 2/2] selftests: mptcp: add missing join check Date: Sat, 22 Jan 2022 10:31:35 +0100 Message-Id: <20220122093135.4023846-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220122093135.4023846-1-matthieu.baerts@tessares.net> References: <20220122093135.4023846-1-matthieu.baerts@tessares.net> 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" This function also writes the name of the test with its ID, making clear a new test has been executed. Without that, the ADD_ADDR results from this test was appended at the end of the previous test causing confusions. Especially when the second test was failing, we had: 17 signal invalid addresses syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] add[fail] got 2 ADD_ADDR[s] expected 3 In fact, this 17th test was OK but not the 18th one. Now we have: 17 signal invalid addresses syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] 18 signal addresses race test syn[ ok ] - synack[ ok ] - ack[ ok ] add[fail] got 2 ADD_ADDR[s] expected 3 Fixes: 33c563ad28e3 ("selftests: mptcp: add_addr and echo race test") Reported-by: Paolo Abeni Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 76c45c845d3b..67be3e1215d7 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1342,6 +1342,7 @@ signal_address_tests() pm_nl_add_endpoint $ns2 10.0.3.2 flags signal pm_nl_add_endpoint $ns2 10.0.4.2 flags signal run_tests $ns1 $ns2 10.0.1.1 + chk_join_nr "signal addresses race test" 3 3 3 =20 # the server will not signal the address terminating # the MPC subflow --=20 2.33.1