selftests: mptcp: delete uncontinuous removing ids

The removing addresses testcases can only deal with the continuous ids.
This patch added the uncontinuous removing ids support.

Signed-off-by: Geliang Tang <geliangtang@xiaomi.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 b8311f325fac79c83fde5993fb1c89e5546f5ed8..8c7117e2c337d413f492de9d962ecbf7c074b381 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -344,17 +344,18 @@ do_transfer()
                let rm_nr_ns1=-addr_nr_ns1
                if [ $rm_nr_ns1 -lt 8 ]; then
                        counter=1
+                       pos=1
                        dump=(`ip netns exec ${listener_ns} ./pm_nl_ctl dump`)
                        if [ ${#dump[@]} -gt 0 ]; then
-                               id=${dump[1]}
                                sleep 1
 
                                while [ $counter -le $rm_nr_ns1 ]
                                do
+                                       id=${dump[$pos]}
                                        ip netns exec ${listener_ns} ./pm_nl_ctl del $id
                                        sleep 1
                                        let counter+=1
-                                       let id+=1
+                                       let pos+=5
                                done
                        fi
                elif [ $rm_nr_ns1 -eq 8 ]; then
@@ -392,17 +393,18 @@ do_transfer()
                let rm_nr_ns2=-addr_nr_ns2
                if [ $rm_nr_ns2 -lt 8 ]; then
                        counter=1
+                       pos=1
                        dump=(`ip netns exec ${connector_ns} ./pm_nl_ctl dump`)
                        if [ ${#dump[@]} -gt 0 ]; then
-                               id=${dump[1]}
                                sleep 1
 
                                while [ $counter -le $rm_nr_ns2 ]
                                do
+                                       id=${dump[$pos]}
                                        ip netns exec ${connector_ns} ./pm_nl_ctl del $id
                                        sleep 1
                                        let counter+=1
-                                       let id+=1
+                                       let pos+=5
                                done
                        fi
                elif [ $rm_nr_ns2 -eq 8 ]; then