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

Return to ssh-keyscan.c CVS log

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

Diff for /src/usr.bin/ssh/ssh-keyscan.c between version 1.115 and 1.116

version 1.115, 2017/06/30 04:17:23

version 1.116, 2017/11/25 06:46:22

Line 357

Line 357

fdcon[s].c_len = 4;

fdcon[s].c_len = 4;

fdcon[s].c_off = 0;

fdcon[s].c_off = 0;

fdcon[s].c_keytype = keytype;

fdcon[s].c_keytype = keytype;

gettimeofday(&fdcon[s].c_tv, NULL);

monotime_tv(&fdcon[s].c_tv);

fdcon[s].c_tv.tv_sec += timeout;

fdcon[s].c_tv.tv_sec += timeout;

TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);

TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);

FD_SET(s, read_wait);

FD_SET(s, read_wait);

Line 391

Line 391

contouch(int s)

contouch(int s)

{

{

TAILQ_REMOVE(&tq, &fdcon[s], c_link);

TAILQ_REMOVE(&tq, &fdcon[s], c_link);

gettimeofday(&fdcon[s].c_tv, NULL);

monotime_tv(&fdcon[s].c_tv);

fdcon[s].c_tv.tv_sec += timeout;

fdcon[s].c_tv.tv_sec += timeout;

TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);

TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);

}

}

Line 525

Line 525

con *c;

con *c;

int i;

int i;

gettimeofday(&now, NULL);

monotime_tv(&now);

c = TAILQ_FIRST(&tq);

c = TAILQ_FIRST(&tq);

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

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