8000 Don't check socket error too early. · freebsd-net/tcp-testsuite@558d79e · GitHub
[go: up one dir, main page]
Skip to content

Commit 558d79e

Browse files
tuexentuexen
committed
Don't check socket error too early.
1 parent 8e01b96 commit 558d79e

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

‎snd-syn/snd-syn-rtx-max-number-ipv4.pkt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@
3636
--tolerance_usecs=600000
3737

3838
// Ensure that all relevant sysctl variables have their default variables.
39-
0.00 `sysctl -w net.inet.tcp.rfc1323=1`
40-
+0.00 `sysctl -w net.inet.tcp.sack.enable=1`
41-
+0.00 `sysctl -w net.inet.tcp.ecn.enable=2`
42-
+0.00 `sysctl -w net.inet.tcp.rexmit_initial=1000`
43-
+0.00 `sysctl -w net.inet.tcp.rexmit_slop=200`
44-
+0.00 `sysctl -w net.inet.tcp.rexmit_drop_options=0`
45-
+0.00 `sysctl -w kern.ipc.maxsockbuf=2097152`
46-
+0.00 `sysctl -w net.inet.tcp.recvspace=65536`
39+
0.00 `sysctl -w net.inet.tcp.rfc1323=1`
40+
+ 0.00 `sysctl -w net.inet.tcp.sack.enable=1`
41+
+ 0.00 `sysctl -w net.inet.tcp.ecn.enable=2`
42+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_initial=1000`
43+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_slop=200`
44+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_drop_options=0`
45+
+ 0.00 `sysctl -w kern.ipc.maxsockbuf=2097152`
46+
+ 0.00 `sysctl -w net.inet.tcp.recvspace=65536`
4747
// Flush host cache.
48-
+0.00 `sysctl -w net.inet.tcp.hostcache.purgenow=1`
48+
+ 0.00 `sysctl -w net.inet.tcp.hostcache.purgenow=1`
4949
// Create a non-blocking TCP/IPv4 socket
50-
+0.00 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
51-
+0.00 fcntl(3, F_GETFL) = 0x02 (flags O_RDWR)
52-
+0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
50+
+ 0.00 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
51+
+ 0.00 fcntl(3, F_GETFL) = 0x02 (flags O_RDWR)
52+
+ 0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
53 8000 53
// Make sure that the time limit for connection setup does not apply
54-
+0.00 setsockopt(3, IPPROTO_TCP, TCP_KEEPINIT, [363], 4) = 0
54+
+ 0.00 setsockopt(3, IPPROTO_TCP, TCP_KEEPINIT, [363], 4) = 0
5555
// Try to establish a TCP connection
56-
+1.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
57-
+0.00 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 100 ecr 0>
58-
+1.00 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 1100 ecr 0>
59-
+2.20 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 3300 ecr 0>
60-
+4.20 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 7500 ecr 0>
61-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 15700 ecr 0>
62-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 31900 ecr 0>
63-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 64100 ecr 0>
64-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 128300 ecr 0>
65-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 192500 ecr 0>
66-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 256700 ecr 0>
67-
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 329700 ecr 0>
68-
+1.00 getsockopt(3, SOL_SOCKET, SO_ERROR, [ETIMEDOUT], [4]) = 0
69-
+0.00 close(3) = 0
56+
+ 1.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
57+
+ 0.00 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 100 ecr 0>
58+
+ 1.00 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 1100 ecr 0>
59+
+ 2.20 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 3300 ecr 0>
60+
+ 4.20 > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 7500 ecr 0>
61+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 15700 ecr 0>
62+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 31900 ecr 0>
63+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 64100 ecr 0>
64+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 128300 ecr 0>
65+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 192500 ecr 0>
66+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 256700 ecr 0>
67+
* > S 0:0(0) win 65535 <mss 1460,nop,wscale 6,sackOK,TS val 329700 ecr 0>
68+
+65.00 getsockopt(3, SOL_SOCKET, SO_ERROR, [ETIMEDOUT], [4]) = 0
69+
+ 0.00 close(3) = 0

‎snd-syn/snd-syn-rtx-max-number-ipv6.pkt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@
3636
--tolerance_usecs=600000
3737

3838
// Ensure that all relevant sysctl variables have their default variables.
39-
0.00 `sysctl -w net.inet.tcp.rfc1323=1`
40-
+0.00 `sysctl -w net.inet.tcp.sack.enable=1`
41-
+0.00 `sysctl -w net.inet.tcp.ecn.enable=2`
42-
+0.00 `sysctl -w net.inet.tcp.rexmit_initial=1000`
43-
+0.00 `sysctl -w net.inet.tcp.rexmit_slop=200`
44-
+0.00 `sysctl -w net.inet.tcp.rexmit_drop_options=0`
45-
+0.00 `sysctl -w kern.ipc.maxsockbuf=2097152`
46-
+0.00 `sysctl -w net.inet.tcp.recvspace=65536`
39+
0.00 `sysctl -w net.inet.tcp.rfc1323=1`
40+
+ 0.00 `sysctl -w net.inet.tcp.sack.enable=1`
41+
+ 0.00 `sysctl -w net.inet.tcp.ecn.enable=2`
42+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_initial=1000`
43+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_slop=200`
44+
+ 0.00 `sysctl -w net.inet.tcp.rexmit_drop_options=0`
45+
+ 0.00 `sysctl -w kern.ipc.maxsockbuf=2097152`
46+
+ 0.00 `sysctl -w net.inet.tcp.recvspace=65536`
4747
// Flush host cache.
48-
+0.00 `sysctl -w net.inet.tcp.hostcache.purgenow=1`
48+
+ 0.00 `sysctl -w net.inet.tcp.hostcache.purgenow=1`
4949
// Create a non-blocking TCP/IPv4 socket
50-
+0.00 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
51-
+0.00 fcntl(3, F_GETFL) = 0x02 (flags O_RDWR)
52-
+0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
50+
+ 0.00 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
51+
+ 0.00 fcntl(3, F_GETFL) = 0x02 (flags O_RDWR)
52+
+ 0.00 fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK) = 0
5353
// Make sure that the time limit for connection setup does not apply
54-
+0.00 setsockopt(3, IPPROTO_TCP, TCP_KEEPINIT, [363], 4) = 0
54+
+ 0.00 setsockopt(3, IPPROTO_TCP, TCP_KEEPINIT, [363], 4) = 0
5555
// Try to establish a TCP connection.
56-
+1.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
57-
+0.00 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 100 ecr 0>
58-
+1.00 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 1100 ecr 0>
59-
+2.20 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 3300 ecr 0>
56+
+ 1.00 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
57+
+ 0.00 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 100 ecr 0>
58+
+ 1.00 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 1100 ecr 0>
59+
+ 2.20 > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 3300 ecr 0>
6060
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 7500 ecr 0>
6161
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 15700 ecr 0>
6262
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 31900 ecr 0>
@@ -65,5 +65,5 @@
6565
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 192500 ecr 0>
6666
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 256700 ecr 0>
6767
* > S 0:0(0) win 65535 <mss 1440,nop,wscale 6,sackOK,TS val 329700 ecr 0>
68-
+1.00 getsockopt(3, SOL_SOCKET, SO_ERROR, [ETIMEDOUT], [4]) = 0
69-
+0.00 close(3) = 0
68+
+65.00 getsockopt(3, SOL_SOCKET, SO_ERROR, [ETIMEDOUT], [4]) = 0
69+
+ 0.00 close(3) = 0

0 commit comments

Comments
 (0)
0