mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-util-sockets: Test the complete abstract socket matrix

Browse Source 
The test covers only two out of nine combinations.  Test all nine.
Four turn out to be broken.  Marked /* BUG */.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2020-11-02 10:44:17 +01:00 committed by Daniel P. Berrangé
parent 39458d4e30
commit a72f6754a1
1 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
tests/test-util-sockets.c
View File

@ -230,60 +230,99 @@ static void test_socket_fd_pass_num_nocli(void)
#endif #endif
#ifdef __linux__ #ifdef __linux__
#define ABSTRACT_SOCKET_VARIANTS 3
typedef struct {
SocketAddress *server, *client[ABSTRACT_SOCKET_VARIANTS];
bool expect_connect[ABSTRACT_SOCKET_VARIANTS];
} abstract_socket_matrix_row;
static gpointer unix_client_thread_func(gpointer user_data) static gpointer unix_client_thread_func(gpointer user_data)
{ {
SocketAddress *addr = user_data; abstract_socket_matrix_row *row = user_data;
int fd; Error *err = NULL;
int i, fd;
fd = socket_connect(addr, &error_abort); for (i = 0; i < ABSTRACT_SOCKET_VARIANTS; i++) {
if (row->expect_connect[i]) {
fd = socket_connect(row->client[i], &error_abort);
g_assert_cmpint(fd, >=, 0); g_assert_cmpint(fd, >=, 0);
} else {
fd = socket_connect(row->client[i], &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
}
close(fd); close(fd);
}
return NULL; return NULL;
} }
static void test_socket_unix_abstract_one(SocketAddress *addr) static void test_socket_unix_abstract_row(abstract_socket_matrix_row *test)
{ {
int fd, connfd; int fd, connfd, i;
GThread *cli; GThread *cli;
struct sockaddr_un un; struct sockaddr_un un;
socklen_t len = sizeof(un); socklen_t len = sizeof(un);
fd = socket_listen(addr, 1, &error_abort); /* Last one must connect, or else accept() below hangs */
assert(test->expect_connect[ABSTRACT_SOCKET_VARIANTS - 1]);
fd = socket_listen(test->server, 1, &error_abort);
g_assert_cmpint(fd, >=, 0); g_assert_cmpint(fd, >=, 0);
g_assert(fd_is_socket(fd)); g_assert(fd_is_socket(fd));
cli = g_thread_new("abstract_unix_client", cli = g_thread_new("abstract_unix_client",
unix_client_thread_func, unix_client_thread_func,
addr); test);
for (i = 0; i < ABSTRACT_SOCKET_VARIANTS; i++) {
if (test->expect_connect[i]) {
connfd = accept(fd, (struct sockaddr *)&un, &len); connfd = accept(fd, (struct sockaddr *)&un, &len);
g_assert_cmpint(connfd, !=, -1); g_assert_cmpint(connfd, !=, -1);
close(connfd); close(connfd);
}
}
close(fd); close(fd);
g_thread_join(cli); g_thread_join(cli);
} }
static void test_socket_unix_abstract_good(void) static void test_socket_unix_abstract(void)
{ {
SocketAddress addr; SocketAddress addr, addr_tight, addr_padded;
abstract_socket_matrix_row matrix[ABSTRACT_SOCKET_VARIANTS] = {
{ &addr,
{ &addr_tight, &addr_padded, &addr },
{ false /* BUG */, true /* BUG */, true } },
{ &addr_tight,
{ &addr_padded, &addr, &addr_tight },
{ false, false /* BUG */, true } },
{ &addr_padded,
{ &addr, &addr_tight, &addr_padded },
{ true /* BUG */, false, true } }
};
int i;
addr.type = SOCKET_ADDRESS_TYPE_UNIX; addr.type = SOCKET_ADDRESS_TYPE_UNIX;
addr.u.q_unix.path = g_strdup_printf("unix-%d-%u", addr.u.q_unix.path = g_strdup_printf("unix-%d-%u",
getpid(), g_random_int()); getpid(), g_random_int());
addr.u.q_unix.has_abstract = true; addr.u.q_unix.has_abstract = true;
addr.u.q_unix.abstract = true; addr.u.q_unix.abstract = true;
/* non tight socklen serv and cli */
addr.u.q_unix.has_tight = false; addr.u.q_unix.has_tight = false;
addr.u.q_unix.tight = false; addr.u.q_unix.tight = false;
test_socket_unix_abstract_one(&addr);
/* tight socklen serv and cli */ addr_tight = addr;
addr.u.q_unix.has_tight = true; addr_tight.u.q_unix.has_tight = true;
addr.u.q_unix.tight = true; addr_tight.u.q_unix.tight = true;
test_socket_unix_abstract_one(&addr);
addr_padded = addr;
addr_padded.u.q_unix.has_tight = true;
addr_padded.u.q_unix.tight = false;
for (i = 0; i < ABSTRACT_SOCKET_VARIANTS; i++) {
test_socket_unix_abstract_row(&matrix[i]);
}
g_free(addr.u.q_unix.path); g_free(addr.u.q_unix.path);
} }
@ -330,8 +369,8 @@ int main(int argc, char **argv)
} }
#ifdef __linux__ #ifdef __linux__
g_test_add_func("/util/socket/unix-abstract/good", g_test_add_func("/util/socket/unix-abstract",
test_socket_unix_abstract_good); test_socket_unix_abstract);
#endif #endif
end: end: