selftests: mptcp: join: no RST when rm subflow/addr

Recently, we noticed that some RST were wrongly generated when removing
the initial subflow.

This patch makes sure RST are not sent when removing any subflows or any
addresses.

Fixes: c2b2ae3925 ("mptcp: handle correctly disconnect() failures")
Cc: stable@vger.kernel.org
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231018-send-net-20231018-v1-5-17ecb002e41d@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Matthieu Baerts 2023-10-18 11:23:56 -07:00 committed by Jakub Kicinski
parent 14c56686a6
commit 2cfaa8b3b7

View file

@ -2309,6 +2309,7 @@ remove_tests()
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_rm_tx_nr 1 chk_rm_tx_nr 1
chk_rm_nr 1 1 chk_rm_nr 1 1
chk_rst_nr 0 0
fi fi
# multiple subflows, remove # multiple subflows, remove
@ -2321,6 +2322,7 @@ remove_tests()
run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_rm_nr 2 2 chk_rm_nr 2 2
chk_rst_nr 0 0
fi fi
# single address, remove # single address, remove
@ -2333,6 +2335,7 @@ remove_tests()
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
chk_rst_nr 0 0
fi fi
# subflow and signal, remove # subflow and signal, remove
@ -2346,6 +2349,7 @@ remove_tests()
chk_join_nr 2 2 2 chk_join_nr 2 2 2
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
chk_rst_nr 0 0
fi fi
# subflows and signal, remove # subflows and signal, remove
@ -2360,6 +2364,7 @@ remove_tests()
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 2 2 chk_rm_nr 2 2
chk_rst_nr 0 0
fi fi
# addresses remove # addresses remove
@ -2374,6 +2379,7 @@ remove_tests()
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 3 invert chk_rm_nr 3 3 invert
chk_rst_nr 0 0
fi fi
# invalid addresses remove # invalid addresses remove
@ -2388,6 +2394,7 @@ remove_tests()
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 1 invert chk_rm_nr 3 1 invert
chk_rst_nr 0 0
fi fi
# subflows and signal, flush # subflows and signal, flush
@ -2402,6 +2409,7 @@ remove_tests()
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 3 invert simult chk_rm_nr 1 3 invert simult
chk_rst_nr 0 0
fi fi
# subflows flush # subflows flush
@ -2421,6 +2429,7 @@ remove_tests()
else else
chk_rm_nr 3 3 chk_rm_nr 3 3
fi fi
chk_rst_nr 0 0
fi fi
# addresses flush # addresses flush
@ -2435,6 +2444,7 @@ remove_tests()
chk_join_nr 3 3 3 chk_join_nr 3 3 3
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 3 invert simult chk_rm_nr 3 3 invert simult
chk_rst_nr 0 0
fi fi
# invalid addresses flush # invalid addresses flush
@ -2449,6 +2459,7 @@ remove_tests()
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 3 3 chk_add_nr 3 3
chk_rm_nr 3 1 invert chk_rm_nr 3 1 invert
chk_rst_nr 0 0
fi fi
# remove id 0 subflow # remove id 0 subflow
@ -2460,6 +2471,7 @@ remove_tests()
run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_rm_nr 1 1 chk_rm_nr 1 1
chk_rst_nr 0 0
fi fi
# remove id 0 address # remove id 0 address
@ -2472,6 +2484,7 @@ remove_tests()
chk_join_nr 1 1 1 chk_join_nr 1 1 1
chk_add_nr 1 1 chk_add_nr 1 1
chk_rm_nr 1 1 invert chk_rm_nr 1 1 invert
chk_rst_nr 0 0 invert
fi fi
} }