Paths

Table of Contentst

Differential D20086

Replace ncat by a perl script for running an SCTP discard server
ClosedPublic
Actions

Authored by tuexen on Apr 28 2019, 10:57 AM.

Details

Reviewers

markj
gnn
lwhsu
ngie

Commits

rS347126: MFC r346854:
rS346854: Some test scripts use ncat --sctp --listen port to run an SCTP discard

Summary

Some test scripts use ncat --sctp --listen port to run an SCTP discard server in the background.
However, when running in the background, stdin is closed and ncat initiates a graceful shutdown
of the SCTP association. This is not expected by the client.

Therefore, the ncat-based discard server is replaced by a perl-based one.

In addition, to remove the dependency from ncat, which needs to be installed via the nmap port, also the
code testing for a free SCTP port is changed to use the perl-based client.

This fixes:

common.ip.t_dtrace_contrib.tst_ipv4localsctp_ksh
common.ip.t_dtrace_contrib.tst_localsctpstate_ksh

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

tuexen created this revision.Apr 28 2019, 10:57 AM

Herald added 1 blocking reviewer(s): gnn. · View Herald TranscriptApr 28 2019, 10:57 AM

Herald added a subscriber: imp. · View Herald Transcript

Harbormaster completed remote builds in B23954: Diff 56773.Apr 28 2019, 10:57 AM

I've tested test in my development environment and testvm images from artifact.ci.freebsd.org, for making these two tests passing, we also need to modify tst.localsctpstate.ksh.out to added an extra blank line at the end of the file. I think it's acceptable for now, and other .out files also have this line. I would like to check that extra blank line is generated by the test driver or these ksh test scripts later, and fix them all together.

cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localsctp.ksh

144 ↗

(On Diff #56773)

After checking with tst.ipv4localsctp.ksh.out and guessing the intent of the code, I think these 4 lines need to be changed to:

printf("ip:::send - %s\n", ipsend >= 7 ? "yes" : "no");
printf("ip:::receive - %s\n", ipreceive >= 7 ? "yes" : "no");
printf("sctp:::send - %s\n", sctpsend >= 7 ? "yes" : "no");
printf("sctp:::receive - %s\n", sctpreceive >= 7 ? "yes" : "no");

This revision now requires changes to proceed.Apr 28 2019, 6:25 PM

Remove debug output.

Harbormaster completed remote builds in B23964: Diff 56790.Apr 28 2019, 6:46 PM

tuexen marked an inline comment as done.Apr 28 2019, 6:47 PM

tuexen added inline comments.

cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localsctp.ksh
144 ↗	(On Diff #56773)	Fixed. It was debug output I used a while back and forgot to remove.

tuexen marked an inline comment as done.Apr 28 2019, 6:48 PM

lwhsu accepted this revision.Apr 28 2019, 6:50 PM

In D20086#432158, @lwhsu wrote:

I've tested test in my development environment and testvm images from artifact.ci.freebsd.org, for making these two tests passing, we also need to modify tst.localsctpstate.ksh.out to added an extra blank line at the end of the file. I think it's acceptable for now, and other .out files also have this line. I would like to check that extra blank line is generated by the test driver or these ksh test scripts later, and fix them all together.

Just to double check: tst.ipv4localsctp.ksh.out and tst.localsctpstate.ksh.out both contain a single empty line at the end. Do you want me to add another one to tst.localsctpstate.ksh.out. This would make them inconsistent...

This revision was not accepted when it landed; it landed in state Needs Review.Apr 28 2019, 7:07 PM

Closed by commit rS346854: Some test scripts use ncat --sctp --listen port to run an SCTP discard (authored by tuexen). · Explain Why

This revision was automatically updated to reflect the committed changes.

In D20086#432173, @tuexen wrote:

Just to double check: tst.ipv4localsctp.ksh.out and tst.localsctpstate.ksh.out both contain a single empty line at the end. Do you want me to add another one to tst.localsctpstate.ksh.out. This would make them inconsistent...

https://svnweb.freebsd.org/base/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localsctpstate.ksh.out?revision=338213&view=markup

tst.localsctpstate.ksh.out doesn't seem to have an empty line in the end.

In D20086#432179, @lwhsu wrote:

In D20086#432173, @tuexen wrote:

Just to double check: tst.ipv4localsctp.ksh.out and tst.localsctpstate.ksh.out both contain a single empty line at the end. Do you want me to add another one to tst.localsctpstate.ksh.out. This would make them inconsistent...

https://svnweb.freebsd.org/base/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localsctpstate.ksh.out?revision=338213&view=markup

tst.localsctpstate.ksh.out doesn't seem to have an empty line in the end.

Yes, you are right. Not sure what I was looking at. Should I add the trailing empty line to get things consistent?

In D20086#432185, @tuexen wrote:

Yes, you are right. Not sure what I was looking at. Should I add the trailing empty line to get things consistent?

Oh I just committed rS346873, let see if it helps.

In D20086#432223, @lwhsu wrote:

In D20086#432185, @tuexen wrote:

Yes, you are right. Not sure what I was looking at. Should I add the trailing empty line to get things consistent?

Oh I just committed rS346873, let see if it helps.

Great, thanks. Please drop me a note if there are any other issues.

Revision Contents
Changeset List

Path

Size

head/

cddl/

contrib/

opensolaris/

cmd/

dtrace/

test/

tst/

common/

ip/

tst.ipv4localsctp.ksh

56 lines

tst.localsctpstate.ksh

48 lines

Diff 56792

View Options

head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localsctp.ksh