From 0e00a781b2913d1c3c9da15e54af3875a1d8af17 Mon Sep 17 00:00:00 2001 From: Matthieu Baerts Date: Fri, 3 Jul 2020 11:01:32 +0200 Subject: [PATCH] mptcp: remove MP_CAPABLE v0 tests The upstream kernel no longer supports MPTCP v0 so these tests are currently failing. In order to execute all tests related to MPTCP with one command, better to remove these tests we can no longer validate. Signed-off-by: Matthieu Baerts --- .../mp_capable_v0/v0_mp_capable_bind_no_cs.pkt | 13 ------------- .../mp_capable_v0/v0_mp_capable_connect_no_cs.pkt | 14 -------------- 2 files changed, 27 deletions(-) delete mode 100644 gtests/net/mptcp/mp_capable_v0/v0_mp_capable_bind_no_cs.pkt delete mode 100644 gtests/net/mptcp/mp_capable_v0/v0_mp_capable_connect_no_cs.pkt diff --git a/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_bind_no_cs.pkt b/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_bind_no_cs.pkt deleted file mode 100644 index 8f98fbca..00000000 --- a/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_bind_no_cs.pkt +++ /dev/null @@ -1,13 +0,0 @@ -// Test mp_capable mptcp option, first syn sent by packetdrill -`../common/defaults.sh` - -+0 socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3 -+0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 - -+0 bind(3, ..., ...) = 0 -+0 listen(3, 1) = 0 -+0 < S 0:0(0) win 32792 -+0 > S. 0:0(0) ack 1 -+0.01 < . 1:1(0) ack 1 win 257 -+0 accept(3, ..., ...) = 4 - diff --git a/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_connect_no_cs.pkt b/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_connect_no_cs.pkt deleted file mode 100644 index 36c0b92b..00000000 --- a/gtests/net/mptcp/mp_capable_v0/v0_mp_capable_connect_no_cs.pkt +++ /dev/null @@ -1,14 +0,0 @@ -// connect() function, connection initiated by the kernel -`../common/defaults.sh` - -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 -// Establish connection and verify that there was no error. -+0.0 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress) -+0.0 > S 0:0(0) -+0.0 < S. 0:0(0) ack 1 win 65535 -+0.0 > . 1:1(0) ack 1 -0.200 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0 -0.200 fcntl(3, F_SETFL, O_RDWR) = 0 // set back to blocking