Commit 48d73f60 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

selftests: mptcp: update userspace pm addr tests 



This patch is linked to the previous commit ("mptcp: only send RM_ADDR in
nl_cmd_remove").

To align with what is done by the in-kernel PM, update userspace pm addr
selftests, by sending a remove_subflows command together after the
remove_addrs command.

Fixes: d9a4594e ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")
Fixes: 97040cf9 ("selftests: mptcp: userspace pm address tests")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b1c94da

tools/testing/selftests/net/mptcp/mptcp_join.sh

+8 −0
Original line number Diff line number Diff line
@@ -862,7 +862,15 @@ do_transfer() 
				     sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q')

				ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id

				sleep 1

				sp=$(grep "type:10" "$evts_ns1" |

				     sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')

				da=$(grep "type:10" "$evts_ns1" |

				     sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')

				dp=$(grep "type:10" "$evts_ns1" |

				     sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q')

				ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id

				ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" \

							lport $sp rip $da rport $dp token $tk

			fi



			counter=$((counter + 1))