lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

tests: Use sigterm handler for graceful exit

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
This commit is contained in:
Jakub Jelen
2023-04-27 17:09:38 +02:00
parent f80faa89ce
commit 28dc1ef45b
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/server/test_server/test_server.c
View File

@ -64,6 +64,15 @@ static void sigchld_handler(int signo) {
while (waitpid(-1, NULL, WNOHANG) > 0); while (waitpid(-1, NULL, WNOHANG) > 0);
} }
bool done = false;
static void sigterm_handler(int signo)
{
(void) signo;
fprintf(stderr, "Received SIGTERM. Gracefully exiting ...\n");
done = true;
}
int run_server(struct server_state_st *state) int run_server(struct server_state_st *state)
{ {
ssh_session session = NULL; ssh_session session = NULL;
@ -92,6 +101,15 @@ int run_server(struct server_state_st *state)
return SSH_ERROR; return SSH_ERROR;
} }
/* Set up SIGTERM handler. */
sa.sa_handler = sigterm_handler;
sa.sa_flags = 0;
if (sigaction(SIGTERM, &sa, NULL) != 0) {
fprintf(stderr, "Failed to register SIGTERM handler\n");
return SSH_ERROR;
}
/* Redirect all the output and errors to the file to avoid mixing up with /* Redirect all the output and errors to the file to avoid mixing up with
* the output from the client */ * the output from the client */
if (state->log_file != NULL) { if (state->log_file != NULL) {
@ -227,7 +245,7 @@ int run_server(struct server_state_st *state)
printf("Started libssh test server on port %d\n", state->port); printf("Started libssh test server on port %d\n", state->port);
for (;;) { while (done == false) {
session = ssh_new(); session = ssh_new();
if (session == NULL) { if (session == NULL) {
fprintf(stderr, "Out of memory\n"); fprintf(stderr, "Out of memory\n");
@ -245,6 +263,9 @@ int run_server(struct server_state_st *state)
/* Remove the SIGCHLD handler inherited from parent. */ /* Remove the SIGCHLD handler inherited from parent. */
sa.sa_handler = SIG_DFL; sa.sa_handler = SIG_DFL;
sigaction(SIGCHLD, &sa, NULL); sigaction(SIGCHLD, &sa, NULL);
/* Remove the SIGTERM handler inherited from parent. */
sa.sa_handler = SIG_DFL;
sigaction(SIGTERM, &sa, NULL);
/* Remove socket binding, which allows us to restart the /* Remove socket binding, which allows us to restart the
* parent process, without terminating existing sessions. */ * parent process, without terminating existing sessions. */
ssh_bind_free(sshbind); ssh_bind_free(sshbind);