Re: [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: connect: add dedicated port counter"

[Geliang Tang <geliang@kernel.org>]

Hi Matt,

On Thu, Mar 07, 2024 at 10:25:44AM +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 07/03/2024 02:14, Geliang Tang wrote:
> > From: Geliang Tang <tanggeliang@kylinos.cn>
> > 
> > Move port++ from the beginning of do_transfer to the end of it, then
> > 9999 can be set to 10000, the same as 19999.
> 
> I initially wanted to do that, but...
> 
> > Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> > ---
> >  tools/testing/selftests/net/mptcp/mptcp_connect.sh | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> > index 5942256857a5..8feb4eef0931 100755
> > --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> > +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> > @@ -33,7 +33,7 @@ do_tcp=0
> >  checksum=false
> >  filesize=0
> >  connect_per_transfer=1
> > -port=$((10000 - 1))
> > +port=10000
> >  
> >  if [ $tc_loss -eq 100 ];then
> >  	tc_loss=1%
> > @@ -320,8 +320,6 @@ do_transfer()
> >  	local local_addr="$6"
> >  	local extra_args="$7"
> >  
> > -	port=$((port + 1))
> > -
> >  	if [ "$rcvbuf" -gt 0 ]; then
> >  		extra_args+=" -R $rcvbuf"
> >  	fi
> > @@ -446,6 +444,8 @@ do_transfer()
> >  		return 1
> 
> ... the counter will not be incremented in case of failure.

Yes, let's drop this patch.

Thanks,
-Geliang
> 
> To avoid incrementing the counter from different places, I found it
> safer to start it one off the first one. We can still see it's 10000.
> 
> >  	fi
> >  
> > +	port=$((port+1))
> 
> (it is not really the end of the function :) )
> 
> > +
> >  	mptcp_lib_check_transfer $sin $cout "file received by client"
> >  	retc=$?
> >  	mptcp_lib_check_transfer $cin $sout "file received by server"
> > @@ -719,7 +719,7 @@ EOF
> >  
> >  	mptcp_lib_pr_info "test $msg"
> >  
> > -	port=$((20000 - 1))
> > +	port=20000
> >  	local extra_args="-o TRANSPARENT"
> >  	do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP \
> >  		    ${connect_addr} ${local_addr} "${extra_args}"
> 
> Cheers,
> Matt
> -- 
> Sponsored by the NGI0 Core fund.