selftests: mptcp: add mptcp_lib_is_v6

commit b850f2c7dd85ecd14a333685c4ffd23f12665e94 upstream.

To avoid duplicated code in different MPTCP selftests, we can add
and use helpers defined in mptcp_lib.sh.

is_v6() helper is defined in mptcp_connect.sh, mptcp_join.sh and
mptcp_sockopt.sh, so export it into mptcp_lib.sh and rename it as
mptcp_lib_is_v6(). Use this new helper in all scripts.

Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-10-8d6b94150f6b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 10cd322e05c42c6ddb400643ed2c0eca50cce17a..3b971d1617d811a41afa04133407ef3b3d0b2e19 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -310,12 +310,6 @@ check_mptcp_disabled()
        return 0
 }
 
-# $1: IP address
-is_v6()
-{
-       [ -z "${1##*:*}" ]
-}
-
 do_ping()
 {
        local listener_ns="$1"
@@ -324,7 +318,7 @@ do_ping()
        local ping_args="-q -c 1"
        local rc=0
 
-       if is_v6 "${connect_addr}"; then
+       if mptcp_lib_is_v6 "${connect_addr}"; then
                $ipv6 || return 0
                ping_args="${ping_args} -6"
        fi
@@ -620,12 +614,12 @@ run_tests_lo()
        fi
 
        # skip if we don't want v6
-       if ! $ipv6 && is_v6 "${connect_addr}"; then
+       if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then
                return 0
        fi
 
        local local_addr
-       if is_v6 "${connect_addr}"; then
+       if mptcp_lib_is_v6 "${connect_addr}"; then
                local_addr="::"
        else
                local_addr="0.0.0.0"
@@ -693,7 +687,7 @@ run_test_transparent()
        TEST_GROUP="${msg}"
 
        # skip if we don't want v6
-       if ! $ipv6 && is_v6 "${connect_addr}"; then
+       if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then
                return 0
        fi
 
@@ -726,7 +720,7 @@ EOF
        fi
 
        local local_addr
-       if is_v6 "${connect_addr}"; then
+       if mptcp_lib_is_v6 "${connect_addr}"; then
                local_addr="::"
                r6flag="-6"
        else

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 7c560ced6ce49ea374125dbf2d721e26bea3ec7f..ef17e39abefaadb6240c31969d229617405516fd 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -592,12 +592,6 @@ link_failure()
        done
 }
 
-# $1: IP address
-is_v6()
-{
-       [ -z "${1##*:*}" ]
-}
-
 # $1: ns, $2: port
 wait_local_port_listen()
 {
@@ -877,7 +871,7 @@ pm_nl_set_endpoint()
                local id=10
                while [ $add_nr_ns1 -gt 0 ]; do
                        local addr
-                       if is_v6 "${connect_addr}"; then
+                       if mptcp_lib_is_v6 "${connect_addr}"; then
                                addr="dead:beef:$counter::1"
                        else
                                addr="10.0.$counter.1"
@@ -929,7 +923,7 @@ pm_nl_set_endpoint()
                local id=20
                while [ $add_nr_ns2 -gt 0 ]; do
                        local addr
-                       if is_v6 "${connect_addr}"; then
+                       if mptcp_lib_is_v6 "${connect_addr}"; then
                                addr="dead:beef:$counter::2"
                        else
                                addr="10.0.$counter.2"
@@ -971,7 +965,7 @@ pm_nl_set_endpoint()
                        pm_nl_flush_endpoint ${connector_ns}
                elif [ $rm_nr_ns2 -eq 9 ]; then
                        local addr
-                       if is_v6 "${connect_addr}"; then
+                       if mptcp_lib_is_v6 "${connect_addr}"; then
                                addr="dead:beef:1::2"
                        else
                                addr="10.0.1.2"
@@ -3336,7 +3330,7 @@ userspace_pm_rm_sf()
        local cnt
 
        [ "$1" == "$ns2" ] && evts=$evts_ns2
-       if is_v6 $2; then ip=6; fi
+       if mptcp_lib_is_v6 $2; then ip=6; fi
        tk=$(mptcp_lib_evts_get_info token "$evts")
        da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t)
        dp=$(mptcp_lib_evts_get_info dport "$evts" $t)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 3cf31be5f65584b21ed83456ff7cf1fe1499050c..f7b16d0bb5e541f5f3cdd4233e2da0c7eacfbb57 100644 (file)
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -227,6 +227,11 @@ mptcp_lib_kill_wait() {
        wait "${1}" 2>/dev/null
 }
 
+# $1: IP address
+mptcp_lib_is_v6() {
+       [ -z "${1##*:*}" ]
+}
+
 # $1: ns, $2: MIB counter
 mptcp_lib_get_counter() {
        local ns="${1}"

diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 8c8694f21e7dfeffbd5f6b3081832fe9aa7a92b4..306d6c4ed5bb4fc7e281da6584c0dfec2b06a73b 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -162,12 +162,6 @@ check_transfer()
        return 0
 }
 
-# $1: IP address
-is_v6()
-{
-       [ -z "${1##*:*}" ]
-}
-
 do_transfer()
 {
        local listener_ns="$1"
@@ -184,7 +178,7 @@ do_transfer()
        local mptcp_connect="./mptcp_connect -r 20"
 
        local local_addr ip
-       if is_v6 "${connect_addr}"; then
+       if mptcp_lib_is_v6 "${connect_addr}"; then
                local_addr="::"
                ip=ipv6
        else