From 4cd3ab8958e85e242fd7736ed2ef736e0adff44d Mon Sep 17 00:00:00 2001 From: yrutschle Date: Thu, 28 Oct 2021 15:41:09 +0200 Subject: [PATCH] moved watcher add to watcher init --- processes.h | 1 - sslh-select.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/processes.h b/processes.h index 295972b..a15d400 100644 --- a/processes.h +++ b/processes.h @@ -34,7 +34,6 @@ int tidy_connection(struct connection *cnx, struct loop_info* fd_info); /* These must be declared in the loop handler, sslh-ev or sslh-select */ -void watchers_init(watchers** w); void watchers_add_read(watchers* w, int fd); void watchers_del_read(watchers* w, int fd); void watchers_add_write(watchers* w, int fd); diff --git a/sslh-select.c b/sslh-select.c index 33240bb..8056e2a 100644 --- a/sslh-select.c +++ b/sslh-select.c @@ -50,11 +50,17 @@ struct watchers { #include "processes.h" -void watchers_init(watchers** w) +static void watchers_init(watchers** w, struct listen_endpoint* listen_sockets, + int num_addr_listen) { *w = malloc(sizeof(**w)); FD_ZERO(&(*w)->fds_r); FD_ZERO(&(*w)->fds_w); + + for (int i = 0; i < num_addr_listen; i++) { + watchers_add_read(*w, listen_sockets[i].socketfd); + set_nonblock(listen_sockets[i].socketfd); + } } void watchers_add_read(watchers* w, int fd) @@ -170,12 +176,7 @@ void main_loop(struct listen_endpoint listen_sockets[], int num_addr_listen) fd_info.num_probing = 0; fd_info.probing_list = gap_init(0); - watchers_init(&fd_info.watchers); - - for (i = 0; i < num_addr_listen; i++) { - watchers_add_read(fd_info.watchers, listen_sockets[i].socketfd); - set_nonblock(listen_sockets[i].socketfd); - } + watchers_init(&fd_info.watchers, listen_sockets, num_addr_listen); fd_info.collection = collection_init(fd_info.watchers->max_fd);