@@ -5,7 +5,6 @@
#include <linux/const.h>
#include <netinet/in.h>
#include <test_progs.h>
-#include <time.h>
#include "cgroup_helpers.h"
#include "network_helpers.h"
#include "mptcp_sock.skel.h"
@@ -350,16 +349,12 @@ static void *server(void *arg)
static void send_data(int lfd, int fd, char *msg)
{
ssize_t nr_recv = 0, bytes = 0;
- struct timespec start, end;
- unsigned int delta_ms;
pthread_t srv_thread;
void *thread_ret;
char batch[1500];
int err;
WRITE_ONCE(stop, 0);
- if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
- return;
err = pthread_create(&srv_thread, NULL, server, (void *)(long)lfd);
if (CHECK(err != 0, "pthread_create", "err:%d errno:%d\n", err, errno))
@@ -376,18 +371,10 @@ static void send_data(int lfd, int fd, char *msg)
bytes += nr_recv;
}
- if (clock_gettime(CLOCK_MONOTONIC, &end) < 0)
- return;
-
- delta_ms = (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv_nsec) / 1000000;
-
CHECK(bytes != total_bytes, "recv", "%zd != %u nr_recv:%zd errno:%d\n",
bytes, total_bytes, nr_recv, errno);
- printf("%s: %u ms\n", msg, delta_ms);
-
WRITE_ONCE(stop, 1);
-
pthread_join(srv_thread, &thread_ret);
CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld",
PTR_ERR(thread_ret));
@@ -418,32 +405,65 @@ static struct nstoken *sched_init(char *flags, char *sched)
return NULL;
}
-static int has_bytes_sent(char *addr)
+static int has_bytes_sent(char *dst)
{
char cmd[128];
snprintf(cmd, sizeof(cmd), "ip netns exec %s ss -it src %s sport %d dst %s | %s",
- NS_TEST, ADDR_1, PORT_1, addr, "grep -q bytes_sent:");
+ NS_TEST, ADDR_1, PORT_1, dst, "grep -q bytes_sent:");
return system(cmd);
}
-static void test_default(void)
+static void send_data_and_verify(char *msg, int addr1, int addr2)
{
+ struct timespec start, end;
int server_fd, client_fd;
- struct nstoken *nstoken;
+ unsigned int delta_ms;
- nstoken = sched_init("subflow", "default");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:default"))
- goto fail;
server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
+ if (!ASSERT_NEQ(server_fd, -1, "start_mptcp_server"))
+ return;
+
client_fd = connect_to_fd(server_fd, 0);
+ if (!ASSERT_NEQ(client_fd, -1, "connect_to_fd")) {
+ close(server_fd);
+ return;
+ }
- send_data(server_fd, client_fd, "default");
- ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1");
- ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr_2");
+ if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
+ return;
+
+ send_data(server_fd, client_fd, msg);
+
+ if (clock_gettime(CLOCK_MONOTONIC, &end) < 0)
+ return;
+
+ delta_ms = (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv_nsec) / 1000000;
+ printf("%s: %u ms\n", msg, delta_ms);
+
+ if (addr1)
+ ASSERT_OK(has_bytes_sent(ADDR_1), "Should have bytes_sent on addr1");
+ else
+ ASSERT_GT(has_bytes_sent(ADDR_1), 0, "Shouldn't have bytes_sent on addr1");
+ if (addr2)
+ ASSERT_OK(has_bytes_sent(ADDR_2), "Should have bytes_sent on addr2");
+ else
+ ASSERT_GT(has_bytes_sent(ADDR_2), 0, "Shouldn't have bytes_sent on addr2");
close(client_fd);
close(server_fd);
+}
+
+static void test_default(void)
+{
+ struct nstoken *nstoken;
+
+ nstoken = sched_init("subflow", "default");
+ if (!ASSERT_OK_PTR(nstoken, "sched_init:default"))
+ goto fail;
+
+ send_data_and_verify("default", 1, 1);
+
fail:
cleanup_netns(nstoken);
}
@@ -633,8 +653,7 @@ void test_mptcp(void)
{
RUN_MPTCP_TEST(mptcp_sock);
RUN_MPTCP_TEST(mptcpify);
- if (test__start_subtest("default"))
- test_default();
+ RUN_MPTCP_TEST(default);
if (test__start_subtest("first"))
test_first();
if (test__start_subtest("bkup"))