third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-21 19:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

moved watcher add to watcher init

Browse Source
This commit is contained in:
yrutschle 2021-10-28 15:41:09 +02:00
parent 5ec1f7eb98
commit 4cd3ab8958
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
processes.h
View File

@ -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);

15
sslh-select.c
View File

@ -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);