src/usr.bin/ssh/ssh-keyscan.c - diff

Return to ssh-keyscan.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.131, 2019/12/15 19:47:10

version 1.132, 2020/08/12 01:23:45

Line 566

monotime_tv(&now);

c = TAILQ_FIRST(&tq);

if (c && (c->c_tv.tv_sec > now.tv_sec ||

if (c && timercmp(&c->c_tv, &now, >))

(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) {

timersub(&c->c_tv, &now, &seltime);

seltime = c->c_tv;

else

seltime.tv_sec -= now.tv_sec;

seltime.tv_usec -= now.tv_usec;

if (seltime.tv_usec < 0) {

seltime.tv_usec += 1000000;

seltime.tv_sec--;

}

} else

timerclear(&seltime);

r = xcalloc(read_wait_nfdset, sizeof(fd_mask));

Line 598

Line 591

free(e);

c = TAILQ_FIRST(&tq);

while (c && (c->c_tv.tv_sec < now.tv_sec ||

while (c && timercmp(&c->c_tv, &now, <)) {

(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) {

int s = c->c_fd;

c = TAILQ_NEXT(c, c_link);