sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-03 00:00:24 -04:00
Code Issues Projects Releases Wiki Activity

unit-tests: Let the TLS server thread close its own socket

Browse Source 
Closing the socket from the main thread, while the server thread is
still in accept() (or is just about to enter it), seems to
occasionally cause a deadlock on macOS.
This commit is contained in:
Tobias Brunner 2022-09-06 15:31:41 +02:00
parent c6b6ad8d89
commit 55f7268eb1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtls/tests/suites/test_socket.c
View File

@ -493,13 +493,17 @@ START_TEARDOWN(teardown_creds)
if (server_config)
{
shutdown(server_config->fd, SHUT_RDWR);
close(server_config->fd);
free(server_config);
server_config = NULL;
}
}
END_TEARDOWN
static void close_fd_ptr(void *fd)
{
close(*(int*)fd);
}
/**
* Run an echo server
*/
@ -519,6 +523,7 @@ static job_requeue_t serve_echo(echo_server_config_t *config)
}
sfd = config->fd;
thread_cleanup_push((thread_cleanup_t)server->destroy, server);
thread_cleanup_push(close_fd_ptr, &sfd);
while (TRUE)
{
oldstate = thread_cancelability(TRUE);
@ -554,6 +559,7 @@ static job_requeue_t serve_echo(echo_server_config_t *config)
close(cfd);
}
thread_cleanup_pop(TRUE);
thread_cleanup_pop(TRUE);
return JOB_REQUEUE_NONE;
}