third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-06-13 13:52:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix busy loop bug

Browse Source
This commit is contained in:
yrutschle 2021-04-03 21:27:35 +02:00
parent 3edf6a9d22
commit 465ecdda5b
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
echosrv.c
View File

@ -53,7 +53,7 @@ void start_echo(int fd)
while (1) { while (1) {
ret = read(fd, buffer + prefix_len, sizeof(buffer) - prefix_len); ret = read(fd, buffer + prefix_len, sizeof(buffer) - prefix_len);
if (ret == -1) { if (ret <= 0) {
fprintf(stderr, "%s", strerror(errno)); fprintf(stderr, "%s", strerror(errno));
return; return;
} }
@ -95,26 +95,6 @@ void main_loop(struct listen_endpoint listen_sockets[], int num_addr_listen)
wait(NULL); wait(NULL);
} }
static int config_resolve_listen(struct addrinfo **listen)
{
int i, res;
for (i = 0; i < cfg.listen_len; i++) {
res = resolve_split_name(listen, cfg.listen[i].host, cfg.listen[i].port);
if (res) return res;
/* getaddrinfo returned a list of addresses corresponding to the
* specification; move the pointer to the end of that list before
* processing the next specification, while setting flags for
* start_listen_sockets() through ai_flags (which is not meant for
* that, but is only used as hint in getaddrinfo, so it's OK) */
for (; *listen; listen = &((*listen)->ai_next)) {
if (cfg.listen[i].keepalive)
(*listen)->ai_flags = SO_KEEPALIVE;
}
}
return 0;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -130,7 +110,6 @@ int main(int argc, char *argv[])
sslhcfg_fprint(stdout, &cfg, 0); sslhcfg_fprint(stdout, &cfg, 0);
config_resolve_listen(&addr_listen);
num_addr_listen = start_listen_sockets(&listen_sockets); num_addr_listen = start_listen_sockets(&listen_sockets);
main_loop(listen_sockets, num_addr_listen); main_loop(listen_sockets, num_addr_listen);