Skip to content

L
linux
Commit 6f13b49b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Options

Merge branch 'selftests-mptcp-join-pass-args-in-new-env-vars' 

Matthieu Baerts says:

====================
selftests: mptcp: join: pass args in new env vars

In this series, Geliang did some refactoring in the mptcp_join.sh file.

Patch 1 reduces the scope of some global env vars, only used by some
tests: easier to deal with.

Patch 2 uses a dedicated env var for fastclose case instead of re-using
addr_nr_ns2 with embedded info, clearer.

Patch 3 is similar but for the fullmesh case.

Patch 4 moves a positional but optional argument of run_tests() to an
env var like it has already been done with the other args, cleaner.
====================

Link: https://lore.kernel.org/r/20230712-upstream-net-next-20230712-selftests-mptcp-use-local-env-v1-0-f1c8b62fbf95@tessares.netSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d2afa89f e571fb09
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 120 deletions
tools/testing/selftests/net/mptcp/mptcp_join.sh
View file @ 6f13b49b
...@@ -49,11 +49,15 @@ TEST_COUNT=0 ...@@ -49,11 +49,15 @@ TEST_COUNT=0
TEST_NAME="" TEST_NAME=""
nr_blank=40 nr_blank=40
export FAILING_LINKS="" # These var are used only in some tests, make sure they are not already set
export test_linkfail=0 unset FAILING_LINKS
export addr_nr_ns1=0 unset test_linkfail
export addr_nr_ns2=0 unset addr_nr_ns1
export sflags="" unset addr_nr_ns2
unset sflags
unset fastclose
unset fullmesh
unset speed
# generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) == 0x30) || # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) == 0x30) ||
# (ip6 && (ip6[74] & 0xf0) == 0x30)'" # (ip6 && (ip6[74] & 0xf0) == 0x30)'"
...@@ -100,7 +104,6 @@ init_partial() ...@@ -100,7 +104,6 @@ init_partial()
stats_dumped=0 stats_dumped=0
check_invert=0 check_invert=0
validate_checksum=$checksum validate_checksum=$checksum
FAILING_LINKS=""
# ns1 ns2 # ns1 ns2
# ns1eth1 ns2eth1 # ns1eth1 ns2eth1
...@@ -828,6 +831,17 @@ pm_nl_set_endpoint() ...@@ -828,6 +831,17 @@ pm_nl_set_endpoint()
local connector_ns="$2" local connector_ns="$2"
local connect_addr="$3" local connect_addr="$3"
local addr_nr_ns1=${addr_nr_ns1:-0}
local addr_nr_ns2=${addr_nr_ns2:-0}
local sflags=${sflags:-""}
local fullmesh=${fullmesh:-""}
local flags="subflow"
if [ -n "${fullmesh}" ]; then
flags="${flags},fullmesh"
addr_nr_ns2=${fullmesh}
fi
# let the mptcp subflow be established in background before # let the mptcp subflow be established in background before
# do endpoint manipulation # do endpoint manipulation
if [ $addr_nr_ns1 != "0" ] || [ $addr_nr_ns2 != "0" ]; then if [ $addr_nr_ns1 != "0" ] || [ $addr_nr_ns2 != "0" ]; then
...@@ -975,10 +989,12 @@ do_transfer() ...@@ -975,10 +989,12 @@ do_transfer()
local cl_proto="$3" local cl_proto="$3"
local srv_proto="$4" local srv_proto="$4"
local connect_addr="$5" local connect_addr="$5"
local speed="$6"
local port=$((10000 + TEST_COUNT - 1)) local port=$((10000 + TEST_COUNT - 1))
local cappid local cappid
local FAILING_LINKS=${FAILING_LINKS:-""}
local fastclose=${fastclose:-""}
local speed=${speed:-"fast"}
:> "$cout" :> "$cout"
:> "$sout" :> "$sout"
...@@ -1011,15 +1027,14 @@ do_transfer() ...@@ -1011,15 +1027,14 @@ do_transfer()
extra_args="-j" extra_args="-j"
elif [ $speed = "slow" ]; then elif [ $speed = "slow" ]; then
extra_args="-r 50" extra_args="-r 50"
elif [[ $speed = "speed_"* ]]; then elif [ $speed -gt 0 ]; then
extra_args="-r ${speed:6}" extra_args="-r ${speed}"
fi fi
local flags="subflow"
local extra_cl_args="" local extra_cl_args=""
local extra_srv_args="" local extra_srv_args=""
local trunc_size="" local trunc_size=""
if [[ "${addr_nr_ns2}" = "fastclose_"* ]]; then if [ -n "${fastclose}" ]; then
if [ ${test_linkfail} -le 1 ]; then if [ ${test_linkfail} -le 1 ]; then
echo "fastclose tests need test_linkfail argument" echo "fastclose tests need test_linkfail argument"
fail_test fail_test
...@@ -1028,7 +1043,7 @@ do_transfer() ...@@ -1028,7 +1043,7 @@ do_transfer()
# disconnect # disconnect
trunc_size=${test_linkfail} trunc_size=${test_linkfail}
local side=${addr_nr_ns2:10} local side=${fastclose}
if [ ${side} = "client" ]; then if [ ${side} = "client" ]; then
extra_cl_args="-f ${test_linkfail}" extra_cl_args="-f ${test_linkfail}"
...@@ -1041,10 +1056,6 @@ do_transfer() ...@@ -1041,10 +1056,6 @@ do_transfer()
fail_test fail_test
return 1 return 1
fi fi
addr_nr_ns2=0
elif [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
flags="${flags},fullmesh"
addr_nr_ns2=${addr_nr_ns2:9}
fi fi
extra_srv_args="$extra_args $extra_srv_args" extra_srv_args="$extra_args $extra_srv_args"
...@@ -1155,9 +1166,9 @@ run_tests() ...@@ -1155,9 +1166,9 @@ run_tests()
local listener_ns="$1" local listener_ns="$1"
local connector_ns="$2" local connector_ns="$2"
local connect_addr="$3" local connect_addr="$3"
local speed="${4:-fast}"
local size local size
local test_linkfail=${test_linkfail:-0}
# The values above 2 are reused to make test files # The values above 2 are reused to make test files
# with the given sizes (KB) # with the given sizes (KB)
...@@ -1199,7 +1210,7 @@ run_tests() ...@@ -1199,7 +1210,7 @@ run_tests()
make_file "$sinfail" "server" $size make_file "$sinfail" "server" $size
fi fi
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${speed} do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr}
} }
dump_stats() dump_stats()
...@@ -1988,7 +1999,8 @@ subflows_error_tests() ...@@ -1988,7 +1999,8 @@ subflows_error_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
fi fi
...@@ -1999,7 +2011,8 @@ subflows_error_tests() ...@@ -1999,7 +2011,8 @@ subflows_error_tests()
pm_nl_set_limits $ns2 0 2 pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
...@@ -2010,7 +2023,8 @@ subflows_error_tests() ...@@ -2010,7 +2023,8 @@ subflows_error_tests()
pm_nl_set_limits $ns2 0 2 pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
...@@ -2022,7 +2036,8 @@ subflows_error_tests() ...@@ -2022,7 +2036,8 @@ subflows_error_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 slow & speed=slow \
run_tests $ns1 $ns2 10.0.1.1 &
# mpj subflow will be in TW after the reset # mpj subflow will be in TW after the reset
wait_attempt_fail $ns2 wait_attempt_fail $ns2
...@@ -2121,7 +2136,8 @@ signal_address_tests() ...@@ -2121,7 +2136,8 @@ signal_address_tests()
# the peer could possibly miss some addr notification, allow retransmission # the peer could possibly miss some addr notification, allow retransmission
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1 ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
# It is not directly linked to the commit introducing this # It is not directly linked to the commit introducing this
# symbol but for the parent one which is linked anyway. # symbol but for the parent one which is linked anyway.
...@@ -2231,7 +2247,8 @@ add_addr_timeout_tests() ...@@ -2231,7 +2247,8 @@ add_addr_timeout_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_tx_nr 4 4 chk_add_tx_nr 4 4
chk_add_nr 4 0 chk_add_nr 4 0
...@@ -2242,7 +2259,8 @@ add_addr_timeout_tests() ...@@ -2242,7 +2259,8 @@ add_addr_timeout_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
run_tests $ns1 $ns2 dead:beef:1::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 4 0 chk_add_nr 4 0
fi fi
...@@ -2253,7 +2271,8 @@ add_addr_timeout_tests() ...@@ -2253,7 +2271,8 @@ add_addr_timeout_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2 pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1 speed_10 speed=10 \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 8 0 chk_add_nr 8 0
fi fi
...@@ -2264,7 +2283,8 @@ add_addr_timeout_tests() ...@@ -2264,7 +2283,8 @@ add_addr_timeout_tests()
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2 pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1 speed_10 speed=10 \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 8 0 chk_add_nr 8 0
fi fi
...@@ -2277,8 +2297,8 @@ remove_tests() ...@@ -2277,8 +2297,8 @@ remove_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns2=-1 \ addr_nr_ns2=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_rm_tx_nr 1 chk_rm_tx_nr 1
chk_rm_nr 1 1 chk_rm_nr 1 1
...@@ -2290,8 +2310,8 @@ remove_tests() ...@@ -2290,8 +2310,8 @@ remove_tests()
pm_nl_set_limits $ns2 0 2 pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns2=-2 \ addr_nr_ns2=-2 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_rm_nr 2 2 chk_rm_nr 2 2
fi fi
...@@ -2301,8 +2321,8 @@ remove_tests() ...@@ -2301,8 +2321,8 @@ remove_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
addr_nr_ns1=-1 \ addr_nr_ns1=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
...@@ -2314,8 +2334,8 @@ remove_tests() ...@@ -2314,8 +2334,8 @@ remove_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 2 pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns1=-1 addr_nr_ns2=-1 \ addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
...@@ -2328,8 +2348,8 @@ remove_tests() ...@@ -2328,8 +2348,8 @@ remove_tests()
pm_nl_set_limits $ns2 1 3 pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
addr_nr_ns1=-1 addr_nr_ns2=-2 \ addr_nr_ns1=-1 addr_nr_ns2=-2 speed=10 \
run_tests $ns1 $ns2 10.0.1.1 speed_10 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 2 2 chk_rm_nr 2 2
...@@ -2342,8 +2362,8 @@ remove_tests() ...@@ -2342,8 +2362,8 @@ remove_tests()
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
pm_nl_set_limits $ns2 3 3 pm_nl_set_limits $ns2 3 3
addr_nr_ns1=-3 \ addr_nr_ns1=-3 speed=10 \
run_tests $ns1 $ns2 10.0.1.1 speed_10 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 3 invert chk_rm_nr 3 3 invert
...@@ -2356,8 +2376,8 @@ remove_tests() ...@@ -2356,8 +2376,8 @@ remove_tests()
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
pm_nl_set_limits $ns2 3 3 pm_nl_set_limits $ns2 3 3
addr_nr_ns1=-3 \ addr_nr_ns1=-3 speed=10 \
run_tests $ns1 $ns2 10.0.1.1 speed_10 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 1 invert chk_rm_nr 3 1 invert
...@@ -2370,8 +2390,8 @@ remove_tests() ...@@ -2370,8 +2390,8 @@ remove_tests()
pm_nl_set_limits $ns2 1 3 pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
addr_nr_ns1=-8 addr_nr_ns2=-8 \ addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 3 invert simult chk_rm_nr 1 3 invert simult
...@@ -2384,8 +2404,8 @@ remove_tests() ...@@ -2384,8 +2404,8 @@ remove_tests()
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
addr_nr_ns1=-8 addr_nr_ns2=-8 \ addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
if mptcp_lib_kversion_ge 5.18; then if mptcp_lib_kversion_ge 5.18; then
...@@ -2403,8 +2423,8 @@ remove_tests() ...@@ -2403,8 +2423,8 @@ remove_tests()
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
pm_nl_set_limits $ns2 3 3 pm_nl_set_limits $ns2 3 3
addr_nr_ns1=-8 addr_nr_ns2=-8 \ addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 3 invert simult chk_rm_nr 3 3 invert simult
...@@ -2417,8 +2437,8 @@ remove_tests() ...@@ -2417,8 +2437,8 @@ remove_tests()
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
pm_nl_set_limits $ns2 3 3 pm_nl_set_limits $ns2 3 3
addr_nr_ns1=-8 \ addr_nr_ns1=-8 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 1 invert chk_rm_nr 3 1 invert
...@@ -2429,8 +2449,8 @@ remove_tests() ...@@ -2429,8 +2449,8 @@ remove_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns2=-9 \ addr_nr_ns2=-9 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
fi fi
...@@ -2440,8 +2460,8 @@ remove_tests() ...@@ -2440,8 +2460,8 @@ remove_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
addr_nr_ns1=-9 \ addr_nr_ns1=-9 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
...@@ -2454,8 +2474,8 @@ add_tests() ...@@ -2454,8 +2474,8 @@ add_tests()
if reset "add single subflow"; then if reset "add single subflow"; then
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
addr_nr_ns2=1 \ addr_nr_ns2=1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
...@@ -2463,8 +2483,8 @@ add_tests() ...@@ -2463,8 +2483,8 @@ add_tests()
if reset "add signal address"; then if reset "add signal address"; then
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
addr_nr_ns1=1 \ addr_nr_ns1=1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -2473,8 +2493,8 @@ add_tests() ...@@ -2473,8 +2493,8 @@ add_tests()
if reset "add multiple subflows"; then if reset "add multiple subflows"; then
pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2 pm_nl_set_limits $ns2 0 2
addr_nr_ns2=2 \ addr_nr_ns2=2 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
fi fi
...@@ -2482,8 +2502,8 @@ add_tests() ...@@ -2482,8 +2502,8 @@ add_tests()
if reset "add multiple subflows IPv6"; then if reset "add multiple subflows IPv6"; then
pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2 pm_nl_set_limits $ns2 0 2
addr_nr_ns2=2 \ addr_nr_ns2=2 speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1 slow run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
fi fi
...@@ -2491,8 +2511,8 @@ add_tests() ...@@ -2491,8 +2511,8 @@ add_tests()
if reset "add multiple addresses IPv6"; then if reset "add multiple addresses IPv6"; then
pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 2 2 pm_nl_set_limits $ns2 2 2
addr_nr_ns1=2 \ addr_nr_ns1=2 speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1 slow run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 2 2 chk_add_nr 2 2
fi fi
...@@ -2505,14 +2525,16 @@ ipv6_tests() ...@@ -2505,14 +2525,16 @@ ipv6_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
run_tests $ns1 $ns2 dead:beef:1::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
# add_address, unused IPv6 # add_address, unused IPv6
if reset "unused signal address IPv6"; then if reset "unused signal address IPv6"; then
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
run_tests $ns1 $ns2 dead:beef:1::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -2522,7 +2544,8 @@ ipv6_tests() ...@@ -2522,7 +2544,8 @@ ipv6_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 dead:beef:1::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -2532,8 +2555,8 @@ ipv6_tests() ...@@ -2532,8 +2555,8 @@ ipv6_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
addr_nr_ns1=-1 \ addr_nr_ns1=-1 speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1 slow run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
...@@ -2545,8 +2568,8 @@ ipv6_tests() ...@@ -2545,8 +2568,8 @@ ipv6_tests()
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 2 pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
addr_nr_ns1=-1 addr_nr_ns2=-1 \ addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1 slow run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
...@@ -2647,7 +2670,8 @@ mixed_tests() ...@@ -2647,7 +2670,8 @@ mixed_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
fi fi
...@@ -2657,7 +2681,8 @@ mixed_tests() ...@@ -2657,7 +2681,8 @@ mixed_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.1.1 flags signal pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
run_tests $ns1 $ns2 dead:beef:2::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:2::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
...@@ -2668,7 +2693,8 @@ mixed_tests() ...@@ -2668,7 +2693,8 @@ mixed_tests()
pm_nl_set_limits $ns2 1 4 pm_nl_set_limits $ns2 1 4
pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow,fullmesh
pm_nl_add_endpoint $ns1 10.0.1.1 flags signal pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
run_tests $ns1 $ns2 dead:beef:2::1 slow speed=slow \
run_tests $ns1 $ns2 dead:beef:2::1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
fi fi
...@@ -2680,8 +2706,8 @@ mixed_tests() ...@@ -2680,8 +2706,8 @@ mixed_tests()
pm_nl_set_limits $ns2 2 4 pm_nl_set_limits $ns2 2 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
addr_nr_ns2=fullmesh_1 \ fullmesh=1 speed=slow \
run_tests $ns1 $ns2 dead:beef:1::1 slow run_tests $ns1 $ns2 dead:beef:1::1
chk_join_nr 4 4 4 chk_join_nr 4 4 4
fi fi
} }
...@@ -2694,8 +2720,8 @@ backup_tests() ...@@ -2694,8 +2720,8 @@ backup_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
sflags=nobackup \ sflags=nobackup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_prio_nr 0 1 chk_prio_nr 0 1
fi fi
...@@ -2706,8 +2732,8 @@ backup_tests() ...@@ -2706,8 +2732,8 @@ backup_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
sflags=backup \ sflags=backup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_prio_nr 1 1 chk_prio_nr 1 1
...@@ -2719,8 +2745,8 @@ backup_tests() ...@@ -2719,8 +2745,8 @@ backup_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
sflags=backup \ sflags=backup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_prio_nr 1 1 chk_prio_nr 1 1
...@@ -2729,7 +2755,8 @@ backup_tests() ...@@ -2729,7 +2755,8 @@ backup_tests()
if reset "mpc backup" && if reset "mpc backup" &&
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_prio_nr 0 1 chk_prio_nr 0 1
fi fi
...@@ -2738,7 +2765,8 @@ backup_tests() ...@@ -2738,7 +2765,8 @@ backup_tests()
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 slow speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_prio_nr 1 1 chk_prio_nr 1 1
fi fi
...@@ -2746,8 +2774,8 @@ backup_tests() ...@@ -2746,8 +2774,8 @@ backup_tests()
if reset "mpc switch to backup" && if reset "mpc switch to backup" &&
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
sflags=backup \ sflags=backup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_prio_nr 0 1 chk_prio_nr 0 1
fi fi
...@@ -2756,8 +2784,8 @@ backup_tests() ...@@ -2756,8 +2784,8 @@ backup_tests()
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
sflags=backup \ sflags=backup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_prio_nr 1 1 chk_prio_nr 1 1
fi fi
...@@ -2846,8 +2874,8 @@ add_addr_ports_tests() ...@@ -2846,8 +2874,8 @@ add_addr_ports_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
addr_nr_ns1=-1 \ addr_nr_ns1=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 1 chk_add_nr 1 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
...@@ -2863,8 +2891,8 @@ add_addr_ports_tests() ...@@ -2863,8 +2891,8 @@ add_addr_ports_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 2 pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns1=-1 addr_nr_ns2=-1 \ addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 1 1 1 chk_add_nr 1 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
...@@ -2877,8 +2905,8 @@ add_addr_ports_tests() ...@@ -2877,8 +2905,8 @@ add_addr_ports_tests()
pm_nl_set_limits $ns2 1 3 pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
addr_nr_ns1=-8 addr_nr_ns2=-2 \ addr_nr_ns1=-8 addr_nr_ns2=-2 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 3 invert simult chk_rm_nr 1 3 invert simult
...@@ -3080,8 +3108,8 @@ fullmesh_tests() ...@@ -3080,8 +3108,8 @@ fullmesh_tests()
pm_nl_set_limits $ns2 1 4 pm_nl_set_limits $ns2 1 4
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh
addr_nr_ns1=1 \ addr_nr_ns1=1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 4 4 4 chk_join_nr 4 4 4
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -3093,8 +3121,8 @@ fullmesh_tests() ...@@ -3093,8 +3121,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns1 1 3
pm_nl_set_limits $ns2 1 3 pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
addr_nr_ns2=fullmesh_1 \ fullmesh=1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -3106,8 +3134,8 @@ fullmesh_tests() ...@@ -3106,8 +3134,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns1 2 5
pm_nl_set_limits $ns2 1 5 pm_nl_set_limits $ns2 1 5
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
addr_nr_ns2=fullmesh_2 \ fullmesh=2 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 5 5 5 chk_join_nr 5 5 5
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -3120,8 +3148,8 @@ fullmesh_tests() ...@@ -3120,8 +3148,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns1 2 4
pm_nl_set_limits $ns2 1 4 pm_nl_set_limits $ns2 1 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
addr_nr_ns2=fullmesh_2 \ fullmesh=2 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 4 4 4 chk_join_nr 4 4 4
chk_add_nr 1 1 chk_add_nr 1 1
fi fi
...@@ -3132,8 +3160,8 @@ fullmesh_tests() ...@@ -3132,8 +3160,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4 pm_nl_set_limits $ns2 4 4
addr_nr_ns2=1 sflags=fullmesh \ addr_nr_ns2=1 sflags=fullmesh speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_rm_nr 0 1 chk_rm_nr 0 1
fi fi
...@@ -3144,8 +3172,8 @@ fullmesh_tests() ...@@ -3144,8 +3172,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
pm_nl_set_limits $ns2 4 4 pm_nl_set_limits $ns2 4 4
addr_nr_ns2=fullmesh_1 sflags=nofullmesh \ fullmesh=1 sflags=nofullmesh speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_rm_nr 0 1 chk_rm_nr 0 1
fi fi
...@@ -3156,8 +3184,8 @@ fullmesh_tests() ...@@ -3156,8 +3184,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4 pm_nl_set_limits $ns2 4 4
addr_nr_ns2=1 sflags=backup,fullmesh \ addr_nr_ns2=1 sflags=backup,fullmesh speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_prio_nr 0 1 chk_prio_nr 0 1
chk_rm_nr 0 1 chk_rm_nr 0 1
...@@ -3169,8 +3197,8 @@ fullmesh_tests() ...@@ -3169,8 +3197,8 @@ fullmesh_tests()
pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns1 4 4
pm_nl_set_limits $ns2 4 4 pm_nl_set_limits $ns2 4 4
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
sflags=nobackup,nofullmesh \ sflags=nobackup,nofullmesh speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_prio_nr 0 1 chk_prio_nr 0 1
chk_rm_nr 0 1 chk_rm_nr 0 1
...@@ -3180,7 +3208,7 @@ fullmesh_tests() ...@@ -3180,7 +3208,7 @@ fullmesh_tests()
fastclose_tests() fastclose_tests()
{ {
if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then
test_linkfail=1024 addr_nr_ns2=fastclose_client \ test_linkfail=1024 fastclose=client \
run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_fclose_nr 1 1 chk_fclose_nr 1 1
...@@ -3188,7 +3216,7 @@ fastclose_tests() ...@@ -3188,7 +3216,7 @@ fastclose_tests()
fi fi
if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; then if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; then
test_linkfail=1024 addr_nr_ns2=fastclose_server \ test_linkfail=1024 fastclose=server \
run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_fclose_nr 1 1 invert chk_fclose_nr 1 1 invert
...@@ -3345,8 +3373,8 @@ userspace_tests() ...@@ -3345,8 +3373,8 @@ userspace_tests()
pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
sflags=backup \ sflags=backup speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 0 chk_join_nr 1 1 0
chk_prio_nr 0 0 chk_prio_nr 0 0
fi fi
...@@ -3359,8 +3387,8 @@ userspace_tests() ...@@ -3359,8 +3387,8 @@ userspace_tests()
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1 pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
addr_nr_ns2=-1 \ addr_nr_ns2=-1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1 slow run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0 chk_join_nr 0 0 0
chk_rm_nr 0 0 chk_rm_nr 0 0
fi fi
...@@ -3370,7 +3398,8 @@ userspace_tests() ...@@ -3370,7 +3398,8 @@ userspace_tests()
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns1 set_userspace_pm $ns1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 speed_10 & speed=10 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$! local tests_pid=$!
wait_mpj $ns1 wait_mpj $ns1
userspace_pm_add_addr 10.0.2.1 10 userspace_pm_add_addr 10.0.2.1 10
...@@ -3390,7 +3419,8 @@ userspace_tests() ...@@ -3390,7 +3419,8 @@ userspace_tests()
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns2 set_userspace_pm $ns2
pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns1 0 1
run_tests $ns1 $ns2 10.0.1.1 speed_10 & speed=10 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$! local tests_pid=$!
wait_mpj $ns2 wait_mpj $ns2
userspace_pm_add_sf 10.0.3.2 20 userspace_pm_add_sf 10.0.3.2 20
...@@ -3413,7 +3443,8 @@ endpoint_tests() ...@@ -3413,7 +3443,8 @@ endpoint_tests()
pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns1 2 2
pm_nl_set_limits $ns2 2 2 pm_nl_set_limits $ns2 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 slow 2>/dev/null & speed=slow \
run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
wait_mpj $ns1 wait_mpj $ns1
pm_nl_check_endpoint 1 "creation" \ pm_nl_check_endpoint 1 "creation" \
...@@ -3436,8 +3467,8 @@ endpoint_tests() ...@@ -3436,8 +3467,8 @@ endpoint_tests()
pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
test_linkfail=4 \ test_linkfail=4 speed=20 \
run_tests $ns1 $ns2 10.0.1.1 speed_20 2>/dev/null & run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
wait_mpj $ns2 wait_mpj $ns2
chk_subflow_nr needtitle "before delete" 2 chk_subflow_nr needtitle "before delete" 2
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7