Re: [PATCH mptcp-next v5 05/12] selftests: mptcp: connect: add dedicated port counter

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 26/02/2024 10:43, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> This patch adds a new dedicated counter 'PORT' instead of TEST_COUNT to
> increase port numbers in mptcp_connect.sh.
> 
> This can avoid outputting discontinuous test counters.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  tools/testing/selftests/net/mptcp/mptcp_connect.sh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> index c7483902026b..68073b255983 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> @@ -33,6 +33,7 @@ do_tcp=0
>  checksum=false
>  filesize=0
>  connect_per_transfer=1
> +PORT=0

Can you not initialise it her at '10000'...

>  
>  if [ $tc_loss -eq 100 ];then
>  	tc_loss=1%
> @@ -317,7 +318,7 @@ do_transfer()
>  	local extra_args="$7"
>  
>  	local port
> -	port=$((10000+TEST_COUNT))
> +	port=$((10000+PORT++))

... and here, have:

  port=$((PORT + TEST_COUNT))

(or PORT++ if TEST_COUNT is removed later)

>  	TEST_COUNT=$((TEST_COUNT+1))
>  
>  	if [ "$rcvbuf" -gt 0 ]; then
> @@ -712,7 +713,7 @@ EOF
>  
>  	mptcp_lib_print_info "INFO: test $msg"
>  
> -	TEST_COUNT=10000
> +	PORT=10000

So here you don't need to override the value, no?

>  	local extra_args="-o TRANSPARENT"
>  	do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP \
>  		    ${connect_addr} ${local_addr} "${extra_args}"

While at it, maybe use ${PORT} in check_mptcp_disabled()?

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.