8000 Minor tweaks. · freebsd-net/tcp-testsuite@834bb85 · GitHub
[go: up one dir, main page]
Skip to content

Commit 834bb85

Browse files
tuexentuexen
committed
Minor tweaks.
1 parent d65757c commit 834bb85

File tree

3 files changed

+55
-28
lines changed

3 files changed

+55
-28
lines changed

‎snippets/noopt-parallel-syn-w-options-ipv4.pkt

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
// All rights reserved.
2+
//
3+
// Redistribution and use in source and binary forms, with or without
4+
// modification, are permitted provided that the following conditions
5+
// are met:
6+
// 1. Redistributions of source code must retain the above copyright
7+
// notice, this list of conditions and the following disclaimer.
8+
// 2. Redistributions in binary form must reproduce the above copyright
9+
// notice, this list of conditions and the following disclaimer in the
10+
// documentation and/or other materials provided with the distribution.
11+
//
12+
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
13+
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
14+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
15+
// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
16+
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
17+
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
18+
// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
19+
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
20+
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
21+
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
22+
// SUCH DAMAGE.
23+
//
24+
25+
--ip_version=ipv4
26+
--tolerance_usecs=50000
27+
128
0.00 `sysctl -w net.inet.tcp.hostcache.purgenow=1`
229
+0.00 `sysctl -w net.inet.tcp.syncookies_only=0`
330
+0.00 `sysctl -w net.inet.tcp.syncookies=1`
@@ -11,33 +38,33 @@
1138
+0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
1239
+0.00 setsockopt(3, IPPROTO_TCP, TCP_NOOPT, [1], 4) = 0
1340
+0.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
14-
+0.00 > S 0:0(0) win 65535
15-
+0.05 < S 0:0(0) win 65535 <sackOK, TS val 100 ecr 0>
16-
+0.00 > S. 0:0(0) ack 1 win 65535
17-
+0.00 < . 1:1(0) ack 1 win 65535
41+
+0.00 > S 0:0(0) win 65535
42+
+0.05 < S 0:0(0) win 65535 <sackOK,TS val 100 ecr 0>
43+
+0.00 > S. 0:0(0) ack 1 win 65535
44+
+0.00 < . 1:1(0) ack 1 win 65535
1845
+0.00 %{ assert tcpi_state == TCPI_ESTABLISHED }%
1946
+0.00 %{ assert tcpi_options == 0}%
2047
+0.05 write(3, ..., 5360) = 5360
21-
+0.00 > . 1:537(536) ack 1 win 65535
22-
+0.00 > . 537:1073(536) ack 1 win 65535
23-
+0.00 > . 1073:1609(536) ack 1 win 65535
24-
+0.00 > . 1609:2145(536) ack 1 win 65535
25-
+0.00 > . 2145:2681(536) ack 1 win 65535
26-
+0.00 > . 2681:3217(536) ack 1 win 65535
27-
+0.00 > . 3217:3753(536) ack 1 win 65535
28-
+0.00 > . 3753:4289(536) ack 1 win 65535
29-
+0.00 > . 4289:4825(536) ack 1 win 65535
30-
+0.00 > P. 4825:5361(536) ack 1 win 65535
48+
+0.00 > . 1:537(536) ack 1 win 65535
49+
+0.00 > . 537:1073(536) ack 1 win 65535
50+
+0.00 > . 1073:1609(536) ack 1 win 65535
51+
+0.00 > . 1609:2145(536) ack 1 win 65535
52+
+0.00 > . 2145:2681(536) ack 1 win 65535
53+
+0.00 > . 2681:3217(536) ack 1 win 65535
54+
+0.00 > . 3217:3753(536) ack 1 win 65535
55+
+0.00 > . 3753:4289(536) ack 1 win 65535
56+
+0.00 > . 4289:4825(536) ack 1 win 65535
57+
+0.00 > P. 4825:5361(536) ack 1 win 65535
3158

3259
// Validate DupThresh loss recovery works
33-
+0.01 < . 1:1(0) ack 537 win 65535
34-
+0.01 < . 1:1(0) ack 537 win 65535
35-
+0.01 < . 1:1(0) ack 537 win 65535
36-
+0.01 < . 1:1(0) ack 537 win 65535
37-
+0.00 > . 537:1073(536) ack 1 win 65535
60+
+0.01 < . 1:1(0) ack 537 win 65535
61+
+0.01 < . 1:1(0) ack 537 win 65535
62+
+0.01 < . 1:1(0) ack 537 win 65535
63+
+0.01 < . 1:1(0) ack 537 win 65535
64+
+0.00 > . 537:1073(536) ack 1 win 65535
3865

3966
// Verify that no SACK block is sent out
40-
+0.00 < . 10:20(10) ack 5361 win 65535
41-
+0.00 > . 5361:5361(0) ack 1 win 65535
67+
+0.00 < . 10:20(10) ack 5361 win 65535
68+
+0.00 > . 5361:5361(0) ack 1 win 65535
4269

4370
+0.01 close(3) = 0

‎snippets/noopt-strict-tsopt.pkt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949
+0.00 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
5050
+0.00 bind(3, ..., ...) = 0
5151
+0.00 listen(3, 1) = 0
52-
+0.00 < S 0:0(0) win 65535 <mss 1000, wscale 6, TS val 100 ecr 0, sackOK, eol>
53-
+0.00 > S. 0:0(0) ack 1 win 65535
54-
+0.00 < . 1:1(0) ack 1 win 65535
52+
+0.00 < S 0:0(0) win 65535 <mss 1000,wscale 6,TS val 100 ecr 0,sackOK, eol>
53+
+0.00 > S. 0:0(0) ack 1 win 65535
54+
+0.00 < . 1:1(0) ack 1 win 65535
5555
// Verify that there are no errors pending at the socket layer.
5656
+0.10 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
5757
+0.00 accept(3, ..., ...) = 4
5858
// Now it is in the ESTABLISHED state.
5959
+0.00 %{ assert tcpi_state == TCPI_ESTABLISHED }%
6060
+0.00 %{ assert tcpi_options == 0 }%
6161
+0.00 write(4, ..., 10) = 10
62-
+0.00 > P. 1:11(10) ack 1 win 65535
62+
+0.00 > P. 1:11(10) ack 1 win 65535
6363
+0.00 < P. 1:11(10) ack 11 win 65535
64-
+0.00 > . 11:11(0) ack 11 win 65535
64+
+0.00 > . 11:11(0) ack 11 win 65535
6565
+0.00 read(4, ..., 10) = 10
6666
// Tear it down.
6767
+0.00 close(4) = 0

‎snippets/noopt-syn-rcvd-via-syn-sent-ipv4.pkt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
+0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
4848
+0.00 setsockopt(3, IPPROTO_TCP, TCP_NOOPT, [1], 4) = 0
4949
+0.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
50-
+0.00 > S 0:0(0) win 65535
51-
+0.05 < S 0:0(0) win 65535
50+
+0.00 > S 0:0(0) win 65535
51+
+0.05 < S 0:0(0) win 65535
5252
+0.00 > S. 0:0(0) ack 1 win 65535
5353
+0.00 < . 1:1(0) ack 1 win 65535
5454
// Verify that there are no errors pending at the socket layer.

0 commit comments

Comments
 (0)
0