Commit 787eb1e4 authored by Matthieu Baerts's avatar Matthieu Baerts Committed by Jakub Kicinski

selftests: mptcp: uniform 'rndh' variable

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.
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b71dd705
#!/bin/bash #!/bin/bash
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX) rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns="ns1-$rndh" ns="ns1-$rndh"
ksft_skip=4 ksft_skip=4
......
...@@ -274,8 +274,7 @@ check_transfer() ...@@ -274,8 +274,7 @@ check_transfer()
check_mptcp_disabled() check_mptcp_disabled()
{ {
local disabled_ns local disabled_ns="ns_disabled-$rndh"
disabled_ns="ns_disabled-$sech-$(mktemp -u XXXXXX)"
ip netns add ${disabled_ns} || exit $ksft_skip ip netns add ${disabled_ns} || exit $ksft_skip
# net.mptcp.enabled should be enabled by default # net.mptcp.enabled should be enabled by default
......
...@@ -59,8 +59,9 @@ init_partial() ...@@ -59,8 +59,9 @@ init_partial()
{ {
capout=$(mktemp) capout=$(mktemp)
local rndh local sec rndh
rndh=$(mktemp -u XXXXXX) sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns1="ns1-$rndh" ns1="ns1-$rndh"
ns2="ns2-$rndh" ns2="ns2-$rndh"
......
...@@ -30,6 +30,8 @@ add_mark_rules() ...@@ -30,6 +30,8 @@ add_mark_rules()
init() init()
{ {
local sec rndh
sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX) rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns1="ns1-$rndh" ns1="ns1-$rndh"
......
#!/bin/bash #!/bin/bash
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX) rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns1="ns1-$rndh" ns1="ns1-$rndh"
ns2="ns2-$rndh" ns2="ns2-$rndh"
......
...@@ -33,7 +33,7 @@ client_addr_id=${RANDOM:0:2} ...@@ -33,7 +33,7 @@ client_addr_id=${RANDOM:0:2}
server_addr_id=${RANDOM:0:2} server_addr_id=${RANDOM:0:2}
sec=$(date +%s) sec=$(date +%s)
rndh=$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XXXXXX) rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh" ns1="ns1-$rndh"
ns2="ns2-$rndh" ns2="ns2-$rndh"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment