loic/net-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: handle select() errors in try_recv

Browse source
This commit is contained in:
lohhiiccc 2026-03-23 23:03:15 +01:00
parent 3136b10395
commit 2ab904f106
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ping/core/loop.c
View file

@ -1,3 +1,4 @@
#include <errno.h>
#include <sys/select.h> #include <sys/select.h>
#include "ping/ft_ping_flags.h" #include "ping/ft_ping_flags.h"
@ -34,7 +35,8 @@ deadline_expired(const struct ping_state *state)
if (0.0 == state->config->deadline) if (0.0 == state->config->deadline)
return 0; return 0;
icmp_get_time(&now); if (0 != icmp_get_time(&now))
return 0;
elapsed = (double)(now.tv_sec - state->start_time.tv_sec) elapsed = (double)(now.tv_sec - state->start_time.tv_sec)
+ (double)(now.tv_nsec - state->start_time.tv_nsec) / 1e9; + (double)(now.tv_nsec - state->start_time.tv_nsec) / 1e9;
return elapsed >= state->config->deadline; return elapsed >= state->config->deadline;
@ -48,7 +50,8 @@ linger_expired(const struct ping_state *state)
if (0 == state->linger_start.tv_sec && 0 == state->linger_start.tv_nsec) if (0 == state->linger_start.tv_sec && 0 == state->linger_start.tv_nsec)
return 0; return 0;
icmp_get_time(&now); if (0 != icmp_get_time(&now))
return 0;
elapsed = (double)(now.tv_sec - state->linger_start.tv_sec) elapsed = (double)(now.tv_sec - state->linger_start.tv_sec)
+ (double)(now.tv_nsec - state->linger_start.tv_nsec) / 1e9; + (double)(now.tv_nsec - state->linger_start.tv_nsec) / 1e9;
return elapsed >= state->config->timeout; return elapsed >= state->config->timeout;
@ -93,7 +96,9 @@ try_recv(struct ping_state *state)
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(fd, &rfds); FD_SET(fd, &rfds);
ret = select(fd + 1, &rfds, NULL, NULL, &tv); ret = select(fd + 1, &rfds, NULL, NULL, &tv);
if (0 < ret) if (ret < 0 && errno != EINTR)
state->stop_flag = 1;
else if (0 < ret)
icmp_process(state->handle, ping_callback, state, 0); icmp_process(state->handle, ping_callback, state, 0);
} }