selftests: mptcp: add deny_join_id0 testcases

This patch added a new argument '-d' for mptcp_join.sh script, to invoke
the testcases for the MP_CAPABLE 'C' flag.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 523c7797f30ac2a0cc102a0f9e0af12528effc43..9a191c1a5de8d41cab91b21debc5ea4852fa6c64 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -139,6 +139,17 @@ reset_with_checksum()
        ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
 }
 
+reset_with_allow_join_id0()
+{
+       local ns1_enable=$1
+       local ns2_enable=$2
+
+       reset
+
+       ip netns exec $ns1 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns1_enable
+       ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
+}
+
 ip -Version > /dev/null 2>&1
 if [ $? -ne 0 ];then
        echo "SKIP: Could not run test without ip tool"
@@ -1462,6 +1473,63 @@ checksum_tests()
        chk_csum_nr "checksum test 1 0"
 }
 
+deny_join_id0_tests()
+{
+       # subflow allow join id0 ns1
+       reset_with_allow_join_id0 1 0
+       ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "single subflow allow join id0 ns1" 1 1 1
+
+       # subflow allow join id0 ns2
+       reset_with_allow_join_id0 0 1
+       ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "single subflow allow join id0 ns2" 0 0 0
+
+       # signal address allow join id0 ns1
+       # ADD_ADDRs are not affected by allow_join_id0 value.
+       reset_with_allow_join_id0 1 0
+       ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "signal address allow join id0 ns1" 1 1 1
+       chk_add_nr 1 1
+
+       # signal address allow join id0 ns2
+       # ADD_ADDRs are not affected by allow_join_id0 value.
+       reset_with_allow_join_id0 0 1
+       ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+       ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "signal address allow join id0 ns2" 1 1 1
+       chk_add_nr 1 1
+
+       # subflow and address allow join id0 ns1
+       reset_with_allow_join_id0 1 0
+       ip netns exec $ns1 ./pm_nl_ctl limits 2 2
+       ip netns exec $ns2 ./pm_nl_ctl limits 2 2
+       ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+       ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "subflow and address allow join id0 1" 2 2 2
+
+       # subflow and address allow join id0 ns2
+       reset_with_allow_join_id0 0 1
+       ip netns exec $ns1 ./pm_nl_ctl limits 2 2
+       ip netns exec $ns2 ./pm_nl_ctl limits 2 2
+       ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+       ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+       run_tests $ns1 $ns2 10.0.1.1
+       chk_join_nr "subflow and address allow join id0 2" 1 1 1
+}
+
 all_tests()
 {
        subflows_tests
@@ -1476,6 +1544,7 @@ all_tests()
        add_addr_ports_tests
        syncookies_tests
        checksum_tests
+       deny_join_id0_tests
 }
 
 usage()
@@ -1493,6 +1562,7 @@ usage()
        echo "  -p add_addr_ports_tests"
        echo "  -k syncookies_tests"
        echo "  -S checksum_tests"
+       echo "  -d deny_join_id0_tests"
        echo "  -c capture pcap files"
        echo "  -C enable data checksum"
        echo "  -h help"
@@ -1528,7 +1598,7 @@ if [ $do_all_tests -eq 1 ]; then
        exit $ret
 fi
 
-while getopts 'fsltra64bpkchCS' opt; do
+while getopts 'fsltra64bpkdchCS' opt; do
        case $opt in
                f)
                        subflows_tests
@@ -1566,6 +1636,9 @@ while getopts 'fsltra64bpkchCS' opt; do
                S)
                        checksum_tests
                        ;;
+               d)
+                       deny_join_id0_tests
+                       ;;
                c)
                        ;;
                C)