Merge pull request google#16 from matttbe/relax-syscall

mptcp: tests: relax syscalls
dcaratti · Jul 30, 2020 · 2399cd3 · 2399cd3
2 parents 3152f1c + 87af41c
commit 2399cd3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/gtests/net/mptcp/add_addr/add_addr_client.pkt b/gtests/net/mptcp/add_addr/add_addr_client.pkt
@@ -13,8 +13,8 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_h] key[skey=2]>
 +0.0 > . 1:1(0) ack 1 <nop,nop,TS val 100 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey]>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 
 +0.01 write(3,..., 100) = 100
 +0.0 > P. 1:101(100) ack 1 <nop,nop,TS val 305 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey] mpcdatalen 100,nop,nop>

diff --git a/gtests/net/mptcp/dss/dss_ssn_specified_client.pkt b/gtests/net/mptcp/dss/dss_ssn_specified_client.pkt
@@ -14,13 +14,13 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_h] key[skey=2] >
 +0.0 > . 1:1(0) ack 1 <nop, nop, TS val 100 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey]>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 +0.1 < P. 1:1001(1000) ack 1 win 450 <nop, nop, dss dack8=1 dsn8=1 ssn=1 dll=1000 nocs>
 +0.0 > . 1:1(0) ack 1001 <nop, nop, TS val 100 ecr 700,dss dack8=1001 ssn=1 dll=0 nocs>
-0.3 read(3, ..., 1000) = 1000
++0.3 read(3, ..., 1000) = 1000
 +0.0 write(3,..., 100) = 100
 +0.0 > P. 1:101(100) ack 1001 <nop, nop, TS val 100 ecr 700, dss dack8=1001 dsn8=1 ssn=1 dll=100 nocs, nop, nop>
-0.4 close(3) = 0
++0.4 close(3) = 0
 // SSN should be 0 for DATA-FIN packets carrying no data at all
 +0.0 > F. 101:101(0) ack 1001 <nop, nop,TS val 100 ecr 700,dss dack8=1001 dsn8=101 ssn=0 dll=1 nocs fin, nop, nop>
diff --git a/gtests/net/mptcp/dss/dss_ssn_specified_server.pkt b/gtests/net/mptcp/dss/dss_ssn_specified_server.pkt
@@ -25,7 +25,7 @@
 // read and ack 1 data segment
 +0 < P. 1:11(10) ack 2001 win 225 <dss dack8=2001 dsn8=1 ssn=1 dll=10 nocs, nop, nop>
 +0 > . 2001:2001(0) ack 11 <dss dack8=11 nocs>
-0.3 read(4, ..., 10) = 10
++0.3 read(4, ..., 10) = 10
 
 // send 1 more data segment, this time dack8 will have to be used: server sent dsn8
 +0 write(4, ..., 1000) = 1000

diff --git a/gtests/net/mptcp/dss/mpc_with_data_client.pkt b/gtests/net/mptcp/dss/mpc_with_data_client.pkt
@@ -14,11 +14,11 @@
 +0.01 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.01 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_h] key[skey=2] >
 +0.01 > . 1:1(0) ack 1 <nop, nop, TS val 100 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey]>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.205 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 
 // send 2 data segments and get them acked by packetdrill
-0.3 write(3, ..., 1000) = 1000
++0.3 write(3, ..., 1000) = 1000
 +0.01 > P. 1:1001(1000) ack 1 <nop, nop, TS val 100 ecr 700, mpcapable v1 flags[flag_h] key[ckey,skey] mpcdatalen 1000, nop, nop>
 +0.01 < . 1:1(0) ack 1001 win 225 <dss dack8=1001 nocs>
 +0.1 write(3, ..., 500) = 500

diff --git a/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_flagB.pkt b/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_flagB.pkt
@@ -13,8 +13,8 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_b,flag_h] key[skey=2] >
 +0.0 > . 1:1(0) ack 1 <nop,nop,TS val 100 ecr 700>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 
 // ensure that traffic plane is functional and does not use DSS
 

diff --git a/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_flagH.pkt b/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_flagH.pkt
@@ -13,8 +13,8 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags 0x0 key[skey=2] >
 +0.0 > . 1:1(0) ack 1 <nop,nop,TS val 100 ecr 700>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 
 // ensure that traffic plane is functional and does not use DSS
 

diff --git a/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_wrongver.pkt b/gtests/net/mptcp/mp_capable/v1_connect_tcpfallback_wrongver.pkt
@@ -13,8 +13,8 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v0 flags[flag_h] key[ckey=3,skey=2] >
 +0.0 > . 1:1(0) ack 1 <nop,nop,TS val 100 ecr 700>
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
 
 // ensure that traffic plane is functional and does not use DSS
 

diff --git a/gtests/net/mptcp/mp_capable/v1_mp_capable_connect_no_cs.pkt b/gtests/net/mptcp/mp_capable/v1_mp_capable_connect_no_cs.pkt
@@ -13,5 +13,5 @@
 +0.0 > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
 +0.0 < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_h] key[skey=2] >
 +0.0 > . 1:1(0) ack 1 <nop,nop,TS val 100 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey] >
-0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking
++0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
++0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking