selftests: mptcp: remove id 0 address testcases

This patch added the testcases for removing the id 0 subflow and the id 0
address.

In do_transfer, use the removing addresses number '9' for deleting the id
0 address.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.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 679de3a..d2273b8 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -294,9 +294,12 @@ do_transfer()
                                        let id+=1
                                done
                        fi
-               else
+               elif [ $rm_nr_ns1 -eq 8 ]; then
                        sleep 1
                        ip netns exec ${listener_ns} ./pm_nl_ctl flush
+               elif [ $rm_nr_ns1 -eq 9 ]; then
+                       sleep 1
+                       ip netns exec ${listener_ns} ./pm_nl_ctl del 0 ${connect_addr}
                fi
        fi
 
@@ -333,9 +336,18 @@ do_transfer()
                                        let id+=1
                                done
                        fi
-               else
+               elif [ $rm_nr_ns2 -eq 8 ]; then
                        sleep 1
                        ip netns exec ${connector_ns} ./pm_nl_ctl flush
+               elif [ $rm_nr_ns2 -eq 9 ]; then
+                       local addr
+                       if is_v6 "${connect_addr}"; then
+                               addr="dead:beef:1::2"
+                       else
+                               addr="10.0.1.2"
+                       fi
+                       sleep 1
+                       ip netns exec ${connector_ns} ./pm_nl_ctl del 0 $addr
                fi
        fi
 
@@ -988,6 +1000,25 @@ remove_tests()
        chk_join_nr "flush invalid addresses" 1 1 1
        chk_add_nr 3 3
        chk_rm_nr 3 1 invert
+
+       # remove id 0 subflow
+       reset
+       ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+       ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+       ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+       run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow
+       chk_join_nr "remove id 0 subflow" 1 1 1
+       chk_rm_nr 1 1
+
+       # remove id 0 address
+       reset
+       ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+       ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+       ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+       run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow
+       chk_join_nr "remove id 0 address" 1 1 1
+       chk_add_nr 1 1
+       chk_rm_nr 1 1 invert
 }
 
 add_tests()