mherrb/echoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store timeout value in a struct timeval and use timercmp to check it

Browse source 
This fixes timeouts > 1s.
This commit is contained in:
Matthieu Herrb 2012-08-03 11:13:16 +02:00
parent 59abe4422e
commit 6fd2a5e47b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
echoc.c
View file

@ -64,7 +64,7 @@ main(int argc, char *argv[])
struct addrinfo hints, *res, *res0; struct addrinfo hints, *res, *res0;
struct itimerval itv; struct itimerval itv;
struct timeval last_ts; struct timeval last_ts;
struct timeval now, diff; struct timeval now, diff, timeout_tv;
struct tm *tm; struct tm *tm;
struct pollfd pfd[1]; struct pollfd pfd[1];
socklen_t addrlen; socklen_t addrlen;
@ -106,6 +106,8 @@ main(int argc, char *argv[])
warnx("adjusting timeout to %ld ms " warnx("adjusting timeout to %ld ms "
"(must be greater than interval)", timeout); "(must be greater than interval)", timeout);
} }
timeout_tv.tv_sec = timeout / 1000;
timeout_tv.tv_usec = (timeout % 1000) * 1000;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC; hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; hints.ai_socktype = SOCK_DGRAM;
@ -152,7 +154,7 @@ main(int argc, char *argv[])
break; break;
if (nfds == -1 && errno != EINTR) if (nfds == -1 && errno != EINTR)
warn("poll error"); warn("poll error");
if (diff.tv_sec > 0 || diff.tv_usec > timeout*1000) { if (!timercmp(&diff, &timeout_tv, <)) {
disconnected++; disconnected++;
nfds = 0; nfds = 0;
break; break;