Skip to content

Commit 2cfaa8b

Browse files
matttbekuba-moo
authored andcommitted
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: c2b2ae3 ("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>
1 parent 14c5668 commit 2cfaa8b

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,6 +2309,7 @@ remove_tests()
23092309
chk_join_nr 1 1 1
23102310
chk_rm_tx_nr 1
23112311
chk_rm_nr 1 1
2312+
chk_rst_nr 0 0
23122313
fi
23132314

23142315
# multiple subflows, remove
@@ -2321,6 +2322,7 @@ remove_tests()
23212322
run_tests $ns1 $ns2 10.0.1.1
23222323
chk_join_nr 2 2 2
23232324
chk_rm_nr 2 2
2325+
chk_rst_nr 0 0
23242326
fi
23252327

23262328
# single address, remove
@@ -2333,6 +2335,7 @@ remove_tests()
23332335
chk_join_nr 1 1 1
23342336
chk_add_nr 1 1
23352337
chk_rm_nr 1 1 invert
2338+
chk_rst_nr 0 0
23362339
fi
23372340

23382341
# subflow and signal, remove
@@ -2346,6 +2349,7 @@ remove_tests()
23462349
chk_join_nr 2 2 2
23472350
chk_add_nr 1 1
23482351
chk_rm_nr 1 1
2352+
chk_rst_nr 0 0
23492353
fi
23502354

23512355
# subflows and signal, remove
@@ -2360,6 +2364,7 @@ remove_tests()
23602364
chk_join_nr 3 3 3
23612365
chk_add_nr 1 1
23622366
chk_rm_nr 2 2
2367+
chk_rst_nr 0 0
23632368
fi
23642369

23652370
# addresses remove
@@ -2374,6 +2379,7 @@ remove_tests()
23742379
chk_join_nr 3 3 3
23752380
chk_add_nr 3 3
23762381
chk_rm_nr 3 3 invert
2382+
chk_rst_nr 0 0
23772383
fi
23782384

23792385
# invalid addresses remove
@@ -2388,6 +2394,7 @@ remove_tests()
23882394
chk_join_nr 1 1 1
23892395
chk_add_nr 3 3
23902396
chk_rm_nr 3 1 invert
2397+
chk_rst_nr 0 0
23912398
fi
23922399

23932400
# subflows and signal, flush
@@ -2402,6 +2409,7 @@ remove_tests()
24022409
chk_join_nr 3 3 3
24032410
chk_add_nr 1 1
24042411
chk_rm_nr 1 3 invert simult
2412+
chk_rst_nr 0 0
24052413
fi
24062414

24072415
# subflows flush
@@ -2421,6 +2429,7 @@ remove_tests()
24212429
else
24222430
chk_rm_nr 3 3
24232431
fi
2432+
chk_rst_nr 0 0
24242433
fi
24252434

24262435
# addresses flush
@@ -2435,6 +2444,7 @@ remove_tests()
24352444
chk_join_nr 3 3 3
24362445
chk_add_nr 3 3
24372446
chk_rm_nr 3 3 invert simult
2447+
chk_rst_nr 0 0
24382448
fi
24392449

24402450
# invalid addresses flush
@@ -2449,6 +2459,7 @@ remove_tests()
24492459
chk_join_nr 1 1 1
24502460
chk_add_nr 3 3
24512461
chk_rm_nr 3 1 invert
2462+
chk_rst_nr 0 0
24522463
fi
24532464

24542465
# remove id 0 subflow
@@ -2460,6 +2471,7 @@ remove_tests()
24602471
run_tests $ns1 $ns2 10.0.1.1
24612472
chk_join_nr 1 1 1
24622473
chk_rm_nr 1 1
2474+
chk_rst_nr 0 0
24632475
fi
24642476

24652477
# remove id 0 address
@@ -2472,6 +2484,7 @@ remove_tests()
24722484
chk_join_nr 1 1 1
24732485
chk_add_nr 1 1
24742486
chk_rm_nr 1 1 invert
2487+
chk_rst_nr 0 0 invert
24752488
fi
24762489
}
24772490

0 commit comments

Comments
 (0)