From nobody Sun Apr 28 22:54:38 2024 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 F293B3C15 for ; Wed, 19 Oct 2022 16:20:06 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id bv10so29894767wrb.4 for ; Wed, 19 Oct 2022 09:20:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hn6RXOx3zKZieXK/u+qANY+FrRWHAGIuy9zpLICsc0c=; b=7zdtqwIFqVcYQHTJc7kBy/yXh0i/Uy47ROuQz9DSYwjncMbUYsy8pbDEkXBcMnlsFt YHw7ZJyeYYARVpAA/DajIKdZ3CsQ4QYH2bzozXENwx6RwfcmPu3MFXp6zsb1MPj7UtQL nrQEhaLRQF6oziDnuP4Ew8c58VIkL8CSVG6VG08RyoMqU3SWCko1VfwQtjLIwwP8HmLq sxHdbWIxGURO7VqrxrCNTzlE/+FaLz1qcOpAXKVI31+DkMdgUxk7T4mqnpvYgq0a/XUO 9e3AE0cIg9l+mDmvUfZ+QlXFOtI8fnFZUhrnA7ZmccN/TCw46uReKUOP++OsqNMvoBLS A3HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hn6RXOx3zKZieXK/u+qANY+FrRWHAGIuy9zpLICsc0c=; b=XA2Yr3OyDrHMird/4AKXr4PaUOJheJcpdRAZ/ghHtdTxDCcXw4qx8eRphYrC9p5q2W aHaNFSaA89OHWAe4qOanr+BWAbwyxBDdPHIxGgFMHuaampV8gTjLhPMVHQUWGIFU7GLh CKn8piJYBo9CTxw5/KMRc9Ik6NuQUdJ8TTVUYlsNiacONb/qUsQ0qbMKDzUG/BuNpZWA YyV2KRBt3JO9TrH29kl4lc9Jy4XIKIFhIRIsSvYmv4xh1k5a/j9jdecVOKrE8KikJ7+R i86auHAAgsOfP1jDqeCriLdBnTgRbdcVK1Vmc4CYWlk8LhDomZLYux3xBbm4DghW53tX 1kCw== X-Gm-Message-State: ACrzQf1asVIhzX5/trga0O08EJ8Urg/9pljjynH8Qv3T/GQU3xXpvlA7 ADCkRE03xpeCTLa5ML7xqNLpoX8YiRbSTIt8+O8= X-Google-Smtp-Source: AMsMyM7aP5ApxQXXXWbN6bT9DCNniddQI6sBWLMrrCZCNIjjCVOBfs855Atarvowzc+cryX7ZY1yZA== X-Received: by 2002:a05:6000:144f:b0:231:2053:ef7c with SMTP id v15-20020a056000144f00b002312053ef7cmr5745710wrx.179.1666196404860; Wed, 19 Oct 2022 09:20:04 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id m1-20020a1c2601000000b003c452678025sm433717wmm.4.2022.10.19.09.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 09:20:04 -0700 (PDT) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-net 1/4] selftests: mptcp: run mptcp_sockopt from a new netns Date: Wed, 19 Oct 2022 18:19:37 +0200 Message-Id: <20221019161940.3178393-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221019161940.3178393-1-matthieu.baerts@tessares.net> References: <20221019161940.3178393-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1861; i=matthieu.baerts@tessares.net; h=from:subject; bh=7AVrEOnpLyEuo1LY7GYGhqkJxKRaehmY/atjGfWxS8c=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjUCOD9A+2PKxTtn/iQxOltJYchqsPqJatCeCCdk8a jwVklkqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY1AjgwAKCRD2t4JPQmmgc/ypEA CNuG3tAwh1ezjpuhZfoN1xi4IESOHy7hTqQ2T61h26O6T+5BqMab55hV2Gc1rtatGURzwTwkQ2Pz9m O3HQ6JOZSlCbbwJ6Rmx2tpbtfmg6FDbxSGHK0yf/qtmukN7q19YwThJrLNF4/FlzILnx/u2DRV3SlQ NBaqHm/bVotVYfY0vHyw/blNUCycl8tc2X0jikIYqiJHcJ8PcIEqBj7aw8oQLShT8XOZFLDj3C9uJ7 wiMkp8JlXXM2mZBhPzUP0GdDHLkYx8OlLrufQF9HmpmdP1ikvLwH3pJB7SrR7GRSqUpJrjUUKvQHW5 Pqs/CfHf3RnWD0JyBMKexnqNeAVLbLmwAUwhAISKljNgERx8uciKkcMLvBT1BgwkegW7oiMcs/FdaG 5lgrIFDLkM81yRUFHEGLfdFbubmovszD+UgoC32R6+pCquGL+922ctctrkA7wQHMUyvCCIhaY/AhZ9 L/6QryoF4Hwv2Eiy5wTd87oD71ebomstIG8BY8k/PCE1Pwpev5RcWQv9WKIwNRG+iPHQuAvmY73lEY 28Iesba65kCXDgF7vpfDle/+lczXS5yPn0aAVAJfy0NDK7iZadyQ/zh+7k/8EzCPId5kh+Aof1IigF qUkb9T6qX/7DJRutjtoyhtLVdrXFBlQt6JJsB7Ypp36xVpcdvv3xobLnghEA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Not running it from a new netns causes issues if some MPTCP settings are modified, e.g. if MPTCP is disabled from the sysctl knob, if multiple addresses are available and added to the MPTCP path-manager, etc. In these cases, the created connection will not behave as expected, e.g. unable to create an MPTCP socket, more than one subflow is seen, etc. A new "sandbox" net namespace is now created and used to run mptcp_sockopt from this controlled environment. Fixes: ce9979129a0b ("selftests: mptcp: add mptcp getsockopt test cases") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 0879da915014..80d36f7cfee8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -35,8 +35,9 @@ init() =20 ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" + ns_sbox=3D"ns_sbox-$rndh" =20 - for netns in "$ns1" "$ns2";do + for netns in "$ns1" "$ns2" "$ns_sbox";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 @@ -73,7 +74,7 @@ init() =20 cleanup() { - for netns in "$ns1" "$ns2"; do + for netns in "$ns1" "$ns2" "$ns_sbox"; do ip netns del $netns done rm -f "$cin" "$cout" @@ -243,7 +244,7 @@ do_mptcp_sockopt_tests() { local lret=3D0 =20 - ./mptcp_sockopt + ip netns exec "$ns_sbox" ./mptcp_sockopt lret=3D$? =20 if [ $lret -ne 0 ]; then @@ -252,7 +253,7 @@ do_mptcp_sockopt_tests() return fi =20 - ./mptcp_sockopt -6 + ip netns exec "$ns_sbox" ./mptcp_sockopt -6 lret=3D$? =20 if [ $lret -ne 0 ]; then --=20 2.37.2 From nobody Sun Apr 28 22:54:38 2024 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 C3EB73C23 for ; Wed, 19 Oct 2022 16:20:07 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id u10so29990579wrq.2 for ; Wed, 19 Oct 2022 09:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y45IN1p7jDcdLTEG5d1ZFNaCtf8FNGYpqLZgaQguMb4=; b=lvIiY9xRkUGiqtrGOhgcGarkesxxZaXWKc7aYgFWKp49FWY7o+qHfR5jY5TykF8vzV +SmFbLuZ4J0929yOORGoqHilN578sYzo8ABSiF47CT3e8uO2qZVg5Tr87dgwhOoVyrif 1X/qpstNJnTlZoGwShToqhugv7lY23jDEmj4d26jGrppg/FvqWOdXC5uS/xTcymlU5fz F7ikXUUVGr/53uu+GQtFwLTvlVYPmb9R0lyHJtJTO99DiIpDtOQ0shqHzsBOw21SM/dT koc+G5wfm6+b2G+GODwcanFVjG/DxhX27QGe//frk2yx61n7gwGYf+N0nf9cO2RLoGHW ubuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y45IN1p7jDcdLTEG5d1ZFNaCtf8FNGYpqLZgaQguMb4=; b=yhtHVax6ftXVWKxLU9f4VtQon5K6RbRWtes/ph2gjnCD7oLLl3sB+Qx4lf2eGulPLM poppoxtya6yg0b29z1aJNf+Y3n1EgSFpO536MVYg3fss2//I9r108UMz4fQGrSJHKhde WueAj2cKvlDQMDFAmfddFhEANnONUBILlzw9yBxuq8TY9edDmAASw5VycJMILAIIm+dD ncsvZK4rCbg9kxaj9q+05nYuwmcFADETUXdqpzxRPpSqWafPfJAKVQTv+x2EoOrjpkUF CMElnVObfVTVTYYG0cl5BSl1LU65MjxDZsIfoQQE8OrdoMdwAL+4FkwuQ33WA+Rzde7O /lng== X-Gm-Message-State: ACrzQf1VXVNSRXZjda6Bd+tbf1Xt0IznseZ7PiObNmTvgnfkjIbWhx3o Q0hKveSAUQqMAkGPjUbvJKY9iwlxmsFtGYXAy+0= X-Google-Smtp-Source: AMsMyM7uSaYVyevVViFOextGhxofVZi3Myn+QXEEdajIgCWw1/3dK60S+955klkBV+wA0dsPWPD1Ig== X-Received: by 2002:a05:6000:18a:b0:22e:c396:6c3d with SMTP id p10-20020a056000018a00b0022ec3966c3dmr5794107wrx.499.1666196405595; Wed, 19 Oct 2022 09:20:05 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id m1-20020a1c2601000000b003c452678025sm433717wmm.4.2022.10.19.09.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 09:20:05 -0700 (PDT) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 2/4] selftests: mptcp: run mptcp_inq from a clean netns Date: Wed, 19 Oct 2022 18:19:38 +0200 Message-Id: <20221019161940.3178393-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221019161940.3178393-1-matthieu.baerts@tessares.net> References: <20221019161940.3178393-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1036; i=matthieu.baerts@tessares.net; h=from:subject; bh=koKMylcJ9U7MGM1RP5VLKQdJI5kuJ8sQYdC80COXmqY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjUCODzhfY2mHmlII9vJa53FXuZ7EqL7f3IrTFJYt+ PA5kWzmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY1AjgwAKCRD2t4JPQmmgcyG0D/ 0Zqll1PqWsp3vAclZgunkdazvnl4ITKaqMmkjn6kAAsNI44uPE6IBef4/rcLlWaP7coBcTJE4giN6/ WBaVOfiIQLXdyKr7Srb8tIA9SF9l74DMk4TEyvoZGaQuVlpK4dLWdz8tqk72bZhGhAijuK65es9YU+ q1iT38Tyskapv1I0hHBWk4SY5x8sAraYDU+33n+CP1dgyMPnrLgYAguogmXdEQZbeLgNu6OJxq/t8O GAfGp2DP2WZ5AD9/gC493oLDz9EyFxNkPaVjjBBZCakVZj0JNEG6beAYL5eRbNaJ7JCiF6xQtcdglU le+YbGhe+xbcFtPbSS1eVm8pBXa+w8AxXuwajc7XSSCprNDkaDxiOfOWdUd1sUl+5hcBKoKuflqoXr zcQtfsm0ZKpXYRhDHLMsreFTupTCkh+wT4O9KKuPLmzh1HMfaIcx7LbQEFV2UKPqL5rYHwCWpPGk01 levQKbrz2z9pp2QzDFwVLqk7S8Mh1F+Pq5o6gRSJ8uzBUdIwpcuJtAi/ipOp0GmQL8WxVYUd/SiOrN emJkhTLLzlbaR92OAAzvGCyqCkcmFLNynzRgEmIaZnu2LK9I1ekNDkpwApY8meS+nLsPsmm9Miic2W VWZqDJrVTlw8OHQdt7CBhQR5/jadp2pukrzf/F2XrVkm7khpPsz/mh43e+FQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A new "sandbox" net namespace is available where no other netfilter rules have been added. Use this new netns instead of re-using "ns1" and clean it. Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 80d36f7cfee8..8a83100b212e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -282,7 +282,7 @@ run_tests() =20 do_tcpinq_test() { - ip netns exec "$ns1" ./mptcp_inq "$@" + ip netns exec "$ns_sbox" ./mptcp_inq "$@" lret=3D$? if [ $lret -ne 0 ];then ret=3D$lret @@ -298,9 +298,6 @@ do_tcpinq_tests() { local lret=3D0 =20 - ip netns exec "$ns1" iptables -F - ip netns exec "$ns1" ip6tables -F - for args in "-t tcp" "-r tcp"; do do_tcpinq_test $args lret=3D$? --=20 2.37.2 From nobody Sun Apr 28 22:54:38 2024 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 81DD53C26 for ; Wed, 19 Oct 2022 16:20:08 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id v1so713917wrt.11 for ; Wed, 19 Oct 2022 09:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xO7akXqZ9OyM18k2G1NCNjje846oBCwU3NC4tbIuUyA=; b=4wMJ+aB66kQm2sa5C0L4jJR2e17lRrYgwKw3oPTKXOlvdyIx0h7nilrfVxZkqFf1T3 2Ae8ODX2Cytd6F/HXBfKb1KDnCm4Y3PE9TkU3kKYiFIwRiN8LgPmbi4VcPaFtSSy0Rl3 xHJKG0SJI9NYswoVedK/7Ts/bPZ3Bw+8B/ehaD5EL5E49ctHUWMwRILjnI7FnAD6TIui pgJpU7/CvdlhgbT/yYd30y1Y/CppuBnryqXDCZaUBmYwIU8G1SjpidMx3Z0gR2rOf2o4 t2ivNWzXbrD+6wzMGBGOCDmkgv771QSETbPxw6SFeX3wOYJi8nwE2EtrhC6v0LahhRhX zo7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xO7akXqZ9OyM18k2G1NCNjje846oBCwU3NC4tbIuUyA=; b=J9uN1rEms+jqvBJwJnivL0SVBE7LY9qlXq5oWb86+dNYoRkL7/T+jb30WAc+Yqk42A iDTF6/Jx4kvNVzIAX1+5vKB3Zd2rQOpF+s5feD0gZK055Qu3DQGa/ojd+XsV4oTggFui yIrGHpvHG+7l8tc+7csxA+nBH7xxmcqHZJx7Ff5+U9h0xXQqHWrOCvieDuzAbBwk+uBR GNLDjn8OxPWRQnPzeDKlknIAzbqrIeRTAt67K2Ru4aNSkQzGyHjtiqw7mt+hPEXmXE+N Uk3dTAqp68xT7MPygG9173s00pgp/fNap1TYlJ7Czb04khAzik34OwjX1sCAh65SCmVJ kytQ== X-Gm-Message-State: ACrzQf0NxMSMDoHuRYqU91o8dBdyF1Sj6Y3FnXgAPYiec+KBIBNRpx15 UTrtjkVQqWLldrfXNUGGm7ddKJ4G9zdBvPVJg48= X-Google-Smtp-Source: AMsMyM7uYnLYNIMI527ylfd/6NjzX7cqieaBSvjBenGRBM1Dtb0O8z8tD5GdpW0kU9g071pogdaU8w== X-Received: by 2002:adf:f710:0:b0:22c:d668:504e with SMTP id r16-20020adff710000000b0022cd668504emr5763367wrp.98.1666196406508; Wed, 19 Oct 2022 09:20:06 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id m1-20020a1c2601000000b003c452678025sm433717wmm.4.2022.10.19.09.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 09:20:06 -0700 (PDT) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 3/4] selftests: mptcp: removed defined but unused vars Date: Wed, 19 Oct 2022 18:19:39 +0200 Message-Id: <20221019161940.3178393-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221019161940.3178393-1-matthieu.baerts@tessares.net> References: <20221019161940.3178393-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2233; i=matthieu.baerts@tessares.net; h=from:subject; bh=/aQVed8FVDQJkOFH15QgHf6ZsRUS3VhRUsfnudzsslM=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjUCODSQmHr5j/VeaDCmefMo1HjXF+UuVMyzz+QzTd jE/TvVeJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY1AjgwAKCRD2t4JPQmmgc/SPD/ 9x3EpU1xAm1XhTQi7l191WDIkLcrUMnU+ZJJP+17AdE89iBCZ+v8j4mfD4XSY+wAd01XIq3ktG/d3V KaTVoRu3nXpHe5L0yJ+q7QAFMr6pEYevBhF5X+8mroUYCUMR1m+pe/vUnHh8FoNLBExMQOmtlVrVXO jPm+OVX3NQ4de72ifZdGsXDbVTQC8l4zhM5U/A5G/a06/7rsgWpXtKA6Jiuhn+vqmu6/EbbWDR6u6h Z/3rUVDch0MJ2J+nJR9TO6NREM94ahH6uC4klNTMguSHKoP0bfVFdBlJTX6bPpTVNx4mpv36uc8MPR 8bUqj2973AJNuzOAxRnP4krj5BgM7Z31G7d6eGrXjmGF2VdB1k+6ZBLvyNo02NNrmUxFM8IJlEsFoK Lek0ZS7QP+FR6fGCduFMeW3IW+Adz6IBPxUGy16M+d6djY99zXbGtQHmcx7sjUEOOjUlufSgWD17A+ Fhh8SMYhSYLxdgRjiw3dPnHr0az2pnRlIB8LHm/sz74i5GQi4XPE5v7OGu19LC+47MYVY1FcyVzELy 0ZRuVAz30gI3U8VK9YP7Lbg+XqqPIGuI3e4muYd8tAjL8yBmJFuPavRFatr0JBFQXGHrecy80a6v49 u25ey/PGs/64Ux0lsRt4tRcZ6YhotrPQzwxNVfUmRI6NEpgpsf6x3fQYdoGA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some variables were set but never used. This was not causing any issues except adding some confusion and having shellcheck complaining about them. Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 3 --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 - tools/testing/selftests/net/mptcp/simult_flows.sh | 3 --- 3 files changed, 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 621af6895f4d..5942a16736a9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -764,7 +764,6 @@ run_tests_peekmode() =20 run_tests_disconnect() { - local peekmode=3D"$1" local old_cin=3D$cin local old_sin=3D$sin =20 @@ -772,7 +771,6 @@ run_tests_disconnect() =20 # force do_transfer to cope with the multiple tranmissions sin=3D"$cin.disconnect" - sin_disconnect=3D$old_sin cin=3D"$cin.disconnect" cin_disconnect=3D"$old_cin" connect_per_transfer=3D3 @@ -783,7 +781,6 @@ run_tests_disconnect() =20 # restore previous status sin=3D$old_sin - sin_disconnect=3D"$cout".disconnect cin=3D$old_cin cin_disconnect=3D"$cin".disconnect connect_per_transfer=3D1 diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 8a83100b212e..6e8f4599cc44 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -10,7 +10,6 @@ ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) mptcp_connect=3D"" -do_all_tests=3D1 =20 add_mark_rules() { diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ffa13a957a36..8ae7e0c004fa 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -148,9 +148,6 @@ do_transfer() :> "$sout" :> "$capout" =20 - local addr_port - addr_port=3D$(printf "%s:%d" ${connect_addr} ${port}) - if $capture; then local capuser if [ -z $SUDO_USER ] ; then --=20 2.37.2 From nobody Sun Apr 28 22:54:38 2024 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.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 AF8FB3C15 for ; Wed, 19 Oct 2022 16:20:09 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id b4so29923214wrs.1 for ; Wed, 19 Oct 2022 09:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GlLW1J6KihN8PYm63k/YXvl52ryJ0bQpxJCDZTZEo3A=; b=DAbNmpB8iP6TkUWgpeZToMD9UWfbUgCOuro4Bcn0Q7zBceMJsMpgOJlsi1RjX/GCLQ Du4VALghmu70wL8jIQOWiWCg1qPXauMbRPMRSKJs3o2V5Mb9xkhUewL7QxrPktMszqS/ cCnvwvcGGIU7m4Bck+uobY8O7Ia7S0F0dxI3Oz5bYNuV8oShmodmN3O5QTc+tX3ttExc iG5ByI0YVNV83NPTvxySYrdRG4zzg8wTJHj5Ye6GonWBRoW+hJY4j+i46aEStNrgbRgP bCysg28+749vD1KUlK+IiXK5uH3XqFpb8fjbJyz4kZobr453p4QJz8hDkVVoD14RrzZw wXpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GlLW1J6KihN8PYm63k/YXvl52ryJ0bQpxJCDZTZEo3A=; b=1eemOeoVkgyyijhmEWD2Xm1DLGIw+oYxs75WE5hRQBA+bwOSyVCNEE7Eis8XAUoJyQ V7kLT8wDFDUmeKR5+KyA5bG/5f1lsBxfDGBlbeH6rG/wFBGfBUb9cmh+3eguUgbKOpS1 s3M6LrfXfj4RZBU8IAaR7cWAmvTs/EbViiInvbyCVJb+STbGP/ScBGAB7y18Deumc1fW TDM1R5XHiAL7x7UqXGYBaVGOmyzTeDMyUDpiA7BmUXEy6ISPo1PNCQcGeVceo6br0jpm yis5+52nBxEoKNAdKo2aJksymMSXU7LkNepXBLsyjuq8hfYSdLu6z7NPPtl9LMjfOC2h ZajQ== X-Gm-Message-State: ACrzQf1LrwPnbDrIzKvAcwCjp7sQrTen4f/oLxGQDi6t4JGl8gM+8P3X DAzLLZlrHsPqDUBhD3CPjYkt0lpGgyAxMG4Ig5k= X-Google-Smtp-Source: AMsMyM7irnfdnA/Wp5VjfEdonEk52L7FjEOSyDxuedXr/GoWItmjtzpx0jmJ0Fg+gnpZZEl7PXFlmQ== X-Received: by 2002:a5d:64e8:0:b0:231:a71:1eec with SMTP id g8-20020a5d64e8000000b002310a711eecmr5769901wri.59.1666196407395; Wed, 19 Oct 2022 09:20:07 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id m1-20020a1c2601000000b003c452678025sm433717wmm.4.2022.10.19.09.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 09:20:06 -0700 (PDT) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 4/4] selftests: mptcp: uniform 'rndh' variable Date: Wed, 19 Oct 2022 18:19:40 +0200 Message-Id: <20221019161940.3178393-5-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221019161940.3178393-1-matthieu.baerts@tessares.net> References: <20221019161940.3178393-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3556; i=matthieu.baerts@tessares.net; h=from:subject; bh=5MOPslV8E5h86a4qDeXeU1c402U1r4M15OsyxIUwJ3M=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjUCOEjZvnx77HRvQL7OpWZVthz3FA9mqOsK+sZq5k SJOwuLqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY1AjhAAKCRD2t4JPQmmgc/kUD/ 9faS5HiotzbVH/so5YOWeVf5KD136mWAu/geG3l1j3AGrwBS49CMrOzAZhg/juKt2ufSURpT/n7/lf d0op35tRI3DlTtbbRSQt3hIGaDCf4N4PxRU/CsW5qRFuz9nPVbaYWw2sdFA8odfdSswW5tFfw8KOsP ZoaAuouOV7889G1aVP8m4Niji+CdN3v3fWa3ZxqaGz8+xnNJOJie29ilJhZa0hNfi19ml80ncFlUvq a5BWLEKQoJJ20Yh1MHOpnVeFm+irRLZvscbyVNoFg/5nZ9dXiuFELobRCUPzKkI2Ke81Q5vuD/anRN T+pY/Yp0dpUuj9b2Qmz0FswI3yW4VqFW7dPeh+5ghl9Qhj8SGET2wWnkQK5Iwvhi8PWouGhn0KFZYq IZ/88UY0J58Mqc5b+hHMft9+2x9y4Jv7jTUUN9FB/PV8kqGBDoi/rYc3P7ZmFSYlYJb3w/BNX4u6S1 e7dgwPPYlIhAlh7ao8fuYVLf2EBPtlz/rN7mLJiJcvxwIOVL4lDCpc7Zr0Tz8OXuYVBPhvRIAiscAl BmSTSm9o00fbKmSG5WYTw707kxwEl530fxD9BNn4jJvqo45rD6LrbJq1KVtyJXlvGDBq60YOTanHOE k379RRbz/OxCvLYFaKwysW9a3vAgzkC4SaOGFF39gG1z3EpBR5ExYDCcY24A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The definition of 'rndh' was probably copied from one script to another but some times, 'sec' was not defined, not used and/or not spelled properly. Here all the 'rndh' are now defined the same way. Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/diag.sh | 1 + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 3 +-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 ++ tools/testing/selftests/net/mptcp/simult_flows.sh | 1 + tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 515859a5168b..24bcd7b9bdb2 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -1,6 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns=3D"ns1-$rndh" ksft_skip=3D4 diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 5942a16736a9..800adb4467f2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -274,8 +274,7 @@ check_transfer() =20 check_mptcp_disabled() { - local disabled_ns - disabled_ns=3D"ns_disabled-$sech-$(mktemp -u XXXXXX)" + local disabled_ns=3D"ns_disabled-$rndh" ip netns add ${disabled_ns} || exit $ksft_skip =20 # net.mptcp.enabled should be enabled by default diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f3dd5f2a0272..53ecc8d4dc8a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -59,8 +59,9 @@ init_partial() { capout=3D$(mktemp) =20 - local rndh - rndh=3D$(mktemp -u XXXXXX) + local sec rndh + sec=3D$(date +%s) + rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) =20 ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 6e8f4599cc44..dbee386450f3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -30,6 +30,8 @@ add_mark_rules() =20 init() { + local sec rndh + sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) =20 ns1=3D"ns1-$rndh" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 8ae7e0c004fa..0915fb39afc3 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -1,6 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 3229725b64b0..5dfc3ee74b98 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -33,7 +33,7 @@ client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 sec=3D$(date +%s) -rndh=3D$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XXXXXX) +rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" =20 --=20 2.37.2