Skip to content

Commit 538622b

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
Squash to "selftests/bpf: Add mptcp subflow subtest"
Close client_fd as Martin suggested. Please update my email address of this patch squashed to as: From: Geliang Tang <[email protected]> since BPF CI complained about it: WARNING: From:/Signed-off-by: email address mismatch: 'From: Geliang Tang <[email protected]>' != 'Signed-off-by: Geliang Tang <[email protected]>' Signed-off-by: Geliang Tang <[email protected]>
1 parent c65deb8 commit 538622b

File tree

1 file changed

+5
-2
lines changed
  • tools/testing/selftests/bpf/prog_tests

1 file changed

+5
-2
lines changed

tools/testing/selftests/bpf/prog_tests/mptcp.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static void run_subflow(char *new)
383383
{
384384
int server_fd, client_fd, err;
385385
char cc[TCP_CA_NAME_MAX];
386-
socklen_t len = sizeof(cc);
386+
socklen_t len;
387387

388388
server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
389389
if (!ASSERT_GE(server_fd, 0, "start_mptcp_server"))
@@ -393,9 +393,12 @@ static void run_subflow(char *new)
393393
if (!ASSERT_GE(client_fd, 0, "connect to fd"))
394394
goto fail;
395395

396+
len = sizeof(cc);
396397
err = getsockopt(server_fd, SOL_TCP, TCP_CONGESTION, cc, &len);
397-
if (!ASSERT_OK(err, "getsockopt(srv_fd, TCP_CONGESTION)"))
398+
if (!ASSERT_OK(err, "getsockopt(server_fd, TCP_CONGESTION)")) {
399+
close(client_fd);
398400
goto fail;
401+
}
399402

400403
send_byte(client_fd);
401404

0 commit comments

Comments
 (0)