Skip to content

Fix signal handling #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 21, 2025
Merged

Fix signal handling #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a257c9
Revert "tlshd: Add a SIGINT handler"
benh-debian Jul 17, 2025
853d14c
netlink: Introduce event loop and use signalfd to catch signals
benh-debian Jul 17, 2025
a75ad79
netlink: Handle SIGTERM like SIGINT
benh-debian Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/tlshd/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,6 @@ static void usage(char *progname)
fprintf(stderr, "usage: %s [-chsv]\n", progname);
}

static void tlshd_sigint(int signum)
{
if (signum == SIGINT) {
tlshd_gnutls_priority_deinit();
tlshd_config_shutdown();
tlshd_log_shutdown();
tlshd_log_close();
exit(EXIT_SUCCESS);
}
}

int main(int argc, char **argv)
{
static gchar config_file[PATH_MAX + 1] = "/etc/tlshd.conf";
Expand Down Expand Up @@ -124,8 +113,6 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}

signal(SIGINT, tlshd_sigint);

tlshd_genl_dispatch();

tlshd_gnutls_priority_deinit();
Expand Down
53 changes: 49 additions & 4 deletions src/tlshd/netlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/signalfd.h>

#include <stdbool.h>
#include <unistd.h>
Expand Down Expand Up @@ -106,6 +107,9 @@ tlshd_accept_nl_policy[HANDSHAKE_A_ACCEPT_MAX + 1] = {

static struct nl_sock *tlshd_notification_nls;

static sigset_t tlshd_sig_poll_mask;
static int tlshd_sig_poll_fd;

static int tlshd_genl_event_handler(struct nl_msg *msg,
__attribute__ ((unused)) void *arg)
{
Expand All @@ -127,6 +131,9 @@ static int tlshd_genl_event_handler(struct nl_msg *msg,

if (!fork()) {
/* child */
close(tlshd_sig_poll_fd);
sigprocmask(SIG_UNBLOCK, &tlshd_sig_poll_mask, NULL);

nlmsg_free(msg);
tlshd_genl_sock_close(tlshd_notification_nls);

Expand All @@ -146,8 +153,14 @@ static int tlshd_genl_event_handler(struct nl_msg *msg,
*/
void tlshd_genl_dispatch(void)
{
struct pollfd poll_fds[2];
int err, mcgrp;

/* Initialise signal poll mask */
sigemptyset(&tlshd_sig_poll_mask);
sigaddset(&tlshd_sig_poll_mask, SIGINT);
sigaddset(&tlshd_sig_poll_mask, SIGTERM);

err = tlshd_genl_sock_open(&tlshd_notification_nls);
if (err)
return;
Expand All @@ -174,14 +187,46 @@ void tlshd_genl_dispatch(void)
}

nl_socket_disable_seq_check(tlshd_notification_nls);
while (true) {
err = nl_recvmsgs_default(tlshd_notification_nls);
if (err < 0) {
tlshd_log_nl_error("nl_recvmsgs", err);

err = nl_socket_set_nonblocking(tlshd_notification_nls);
if (err != NLE_SUCCESS) {
tlshd_log_nl_error("nl_socket_set_nonblocking", err);
goto out_close;
}

if (sigprocmask(SIG_BLOCK, &tlshd_sig_poll_mask, NULL)) {
tlshd_log_perror("sigprocmask");
goto out_close;
}

tlshd_sig_poll_fd = signalfd(-1, &tlshd_sig_poll_mask,
SFD_NONBLOCK | SFD_CLOEXEC);
if (tlshd_sig_poll_fd < 0) {
tlshd_log_perror("signalfd");
goto out_close;
}

poll_fds[0].fd = nl_socket_get_fd(tlshd_notification_nls);
poll_fds[0].events = POLLIN;
poll_fds[1].fd = tlshd_sig_poll_fd;
poll_fds[1].events = POLLIN;

while (poll(poll_fds, ARRAY_SIZE(poll_fds), -1) >= 0) {
if (poll_fds[1].revents)
/* exit signal received */
break;

if (poll_fds[0].revents) {
err = nl_recvmsgs_default(tlshd_notification_nls);
if (err < 0) {
tlshd_log_nl_error("nl_recvmsgs", err);
break;
}
}
};

close(tlshd_sig_poll_fd);

out_close:
tlshd_genl_sock_close(tlshd_notification_nls);
}
Expand Down