diff options
| author |   Matthieu Baerts <matthieu.baerts@tessares.net> | 2022-11-30 15:06:26 +0100 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2022-12-01 20:06:06 -0800 |
| commit | de2392028a19e6841cd0ef14b9c832a7a2bc3a69 (patch) | |
| tree | 71f972c8482ce294e0a75f6ba29abe3d38e27e9a /tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | |
| parent | selftests: mptcp: uniform 'rndh' variable (diff) | |
| download | wireguard-linux-de2392028a19e6841cd0ef14b9c832a7a2bc3a69.tar.xz wireguard-linux-de2392028a19e6841cd0ef14b9c832a7a2bc3a69.zip | |
selftests: mptcp: clearly declare global ns vars
It is clearer to declare these global variables at the beginning of the
file as it is done in other MPTCP selftests rather than in functions in
the middle of the script.
So for uniformity reason, we can do the same here in mptcp_sockopt.sh.
Suggested-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing/selftests/net/mptcp/mptcp_sockopt.sh')
| -rwxr-xr-x | tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh index dbee386450f3..f74b237bcb32 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -11,6 +11,12 @@ timeout_poll=30 timeout_test=$((timeout_poll * 2 + 1)) mptcp_connect="" +sec=$(date +%s) +rndh=$(printf %x $sec)-$(mktemp -u XXXXXX) +ns1="ns1-$rndh" +ns2="ns2-$rndh" +ns_sbox="ns_sbox-$rndh" + add_mark_rules() { local ns=$1 @@ -30,14 +36,6 @@ add_mark_rules() init() { - local sec rndh - sec=$(date +%s) - rndh=$(printf %x $sec)-$(mktemp -u XXXXXX) - - ns1="ns1-$rndh" - ns2="ns2-$rndh" - ns_sbox="ns_sbox-$rndh" - for netns in "$ns1" "$ns2" "$ns_sbox";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up |