Skip to content

Commit

Permalink
test/vsock: add dobule bind connect test
Browse files Browse the repository at this point in the history
This add bind connect test which creates a listening server socket
and tries to connect a client with a bound local port to it twice.

Co-developed-by: Luigi Leonardi <luigi.leonardi@outlook.com>
Signed-off-by: Luigi Leonardi <luigi.leonardi@outlook.com>
Signed-off-by: Filippo Storniolo <f.storniolo95@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
fstorniolo authored and davem330 committed Nov 7, 2023
1 parent 84d5fb9 commit d80f63f
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 0 deletions.
47 changes: 47 additions & 0 deletions tools/testing/vsock/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,48 @@ void vsock_wait_remote_close(int fd)
close(epollfd);
}

/* Bind to <bind_port>, connect to <cid, port> and return the file descriptor. */
int vsock_bind_connect(unsigned int cid, unsigned int port, unsigned int bind_port, int type)
{
struct sockaddr_vm sa_client = {
.svm_family = AF_VSOCK,
.svm_cid = VMADDR_CID_ANY,
.svm_port = bind_port,
};
struct sockaddr_vm sa_server = {
.svm_family = AF_VSOCK,
.svm_cid = cid,
.svm_port = port,
};

int client_fd, ret;

client_fd = socket(AF_VSOCK, type, 0);
if (client_fd < 0) {
perror("socket");
exit(EXIT_FAILURE);
}

if (bind(client_fd, (struct sockaddr *)&sa_client, sizeof(sa_client))) {
perror("bind");
exit(EXIT_FAILURE);
}

timeout_begin(TIMEOUT);
do {
ret = connect(client_fd, (struct sockaddr *)&sa_server, sizeof(sa_server));
timeout_check("connect");
} while (ret < 0 && errno == EINTR);
timeout_end();

if (ret < 0) {
perror("connect");
exit(EXIT_FAILURE);
}

return client_fd;
}

/* Connect to <cid, port> and return the file descriptor. */
static int vsock_connect(unsigned int cid, unsigned int port, int type)
{
Expand Down Expand Up @@ -223,6 +265,11 @@ int vsock_stream_accept(unsigned int cid, unsigned int port,
return vsock_accept(cid, port, clientaddrp, SOCK_STREAM);
}

int vsock_stream_listen(unsigned int cid, unsigned int port)
{
return vsock_listen(cid, port, SOCK_STREAM);
}

int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
struct sockaddr_vm *clientaddrp)
{
Expand Down
3 changes: 3 additions & 0 deletions tools/testing/vsock/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ struct test_case {
void init_signals(void);
unsigned int parse_cid(const char *str);
int vsock_stream_connect(unsigned int cid, unsigned int port);
int vsock_bind_connect(unsigned int cid, unsigned int port,
unsigned int bind_port, int type);
int vsock_seqpacket_connect(unsigned int cid, unsigned int port);
int vsock_stream_accept(unsigned int cid, unsigned int port,
struct sockaddr_vm *clientaddrp);
int vsock_stream_listen(unsigned int cid, unsigned int port);
int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
struct sockaddr_vm *clientaddrp);
void vsock_wait_remote_close(int fd);
Expand Down
50 changes: 50 additions & 0 deletions tools/testing/vsock/vsock_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,51 @@ static void test_stream_shutrd_server(const struct test_opts *opts)
close(fd);
}

static void test_double_bind_connect_server(const struct test_opts *opts)
{
int listen_fd, client_fd, i;
struct sockaddr_vm sa_client;
socklen_t socklen_client = sizeof(sa_client);

listen_fd = vsock_stream_listen(VMADDR_CID_ANY, 1234);

for (i = 0; i < 2; i++) {
control_writeln("LISTENING");

timeout_begin(TIMEOUT);
do {
client_fd = accept(listen_fd, (struct sockaddr *)&sa_client,
&socklen_client);
timeout_check("accept");
} while (client_fd < 0 && errno == EINTR);
timeout_end();

if (client_fd < 0) {
perror("accept");
exit(EXIT_FAILURE);
}

/* Waiting for remote peer to close connection */
vsock_wait_remote_close(client_fd);
}

close(listen_fd);
}

static void test_double_bind_connect_client(const struct test_opts *opts)
{
int i, client_fd;

for (i = 0; i < 2; i++) {
/* Wait until server is ready to accept a new connection */
control_expectln("LISTENING");

client_fd = vsock_bind_connect(opts->peer_cid, 1234, 4321, SOCK_STREAM);

close(client_fd);
}
}

static struct test_case test_cases[] = {
{
.name = "SOCK_STREAM connection reset",
Expand Down Expand Up @@ -1285,6 +1330,11 @@ static struct test_case test_cases[] = {
.run_client = test_stream_msgzcopy_empty_errq_client,
.run_server = test_stream_msgzcopy_empty_errq_server,
},
{
.name = "SOCK_STREAM double bind connect",
.run_client = test_double_bind_connect_client,
.run_server = test_double_bind_connect_server,
},
{},
};

Expand Down

0 comments on commit d80f63f

Please sign in to comment.