Merge pull request aschils#13 from matttbe/mp_join_server_start

MPJ/ADD_ADDR: be more tolerant
multipath-tcp · Jul 15, 2020 · 0a2359c · 0a2359c
2 parents 82dbe73 + 77f91c3
commit 0a2359c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/gtests/net/mptcp/add_addr/add_addr_client.pkt b/gtests/net/mptcp/add_addr/add_addr_client.pkt
@@ -4,13 +4,13 @@
 
 +0   `../common/client.sh`
 
-0.0   socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3
++0.0  socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3
 +0.0  setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
 +0.0  fcntl(3, F_GETFL) = 0x2 (flags O_RDWR)
 +0.0  fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0
 
 +0.0  connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
-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) <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

diff --git a/gtests/net/mptcp/add_addr/add_addr_server.pkt b/gtests/net/mptcp/add_addr/add_addr_server.pkt
@@ -19,7 +19,7 @@
 // read and ack 1 data segment
 +0.01  < P. 1:1001(1000) ack 1 win 450 <nop, nop, dss dack8=1 dsn8=1 ssn=1 dll=1000 nocs>
 +0     > . 1:1(0) ack 1001 <add_address addr[saddr] hmac=auto,dss dack8=1001 ssn=1 dll=0 nocs>
-0.3  read(4, ..., 1000) = 1000
++0.3  read(4, ..., 1000) = 1000
 
-+0   close(4) = 0
++0    close(4) = 0
 +0     > F. 1:1(0) ack 1001 <dss dack8=1001 dsn8=1 ssn=0 dll=1 nocs fin, nop, nop>
diff --git a/gtests/net/mptcp/mp_join/mp_join_server.pkt b/gtests/net/mptcp/mp_join/mp_join_server.pkt
@@ -3,7 +3,7 @@
 
 +0    `../common/server.sh`
 
-0.0   socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3
++0.0  socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3
 +0.0  setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
 +0.0  fcntl(3, F_GETFL) = 0x2 (flags O_RDWR)
 +0.0  fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0