diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2020-03-06 19:20:44 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-03-13 03:18:09 +0100 |
| commit | 1ddf5682f3992bdacd29164891abb71a19c2cf61 (patch) | |
| tree | b188db61456f15eb099856a1bdd78073995f6e5c | |
| parent | upstream: initialize cname in case ai_canonname is NULL or too (diff) | |
| download | openssh-1ddf5682f3992bdacd29164891abb71a19c2cf61.tar.xz openssh-1ddf5682f3992bdacd29164891abb71a19c2cf61.zip | |
upstream: consistently check packet_timeout_ms against 0; ok djm
OpenBSD-Commit-ID: e8fb8cb2c96c980f075069302534eaf830929928
| -rw-r--r-- | packet.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.290 2020/01/30 07:20:05 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.291 2020/03/06 18:20:44 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1365,7 +1365,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) } /* Wait for some data to arrive. */ for (;;) { - if (state->packet_timeout_ms != -1) { + if (state->packet_timeout_ms > 0) { ms_to_timeval(&timeout, ms_remain); monotime_tv(&start); } @@ -1377,7 +1377,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) r = SSH_ERR_SYSTEM_ERROR; goto out; } - if (state->packet_timeout_ms == -1) + if (state->packet_timeout_ms <= 0) continue; ms_subtract_diff(&start, &ms_remain); if (ms_remain <= 0) { @@ -2014,7 +2014,7 @@ ssh_packet_write_wait(struct ssh *ssh) timeoutp = &timeout; } for (;;) { - if (state->packet_timeout_ms != -1) { + if (state->packet_timeout_ms > 0) { ms_to_timeval(&timeout, ms_remain); monotime_tv(&start); } @@ -2024,7 +2024,7 @@ ssh_packet_write_wait(struct ssh *ssh) if (errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK) break; - if (state->packet_timeout_ms == -1) + if (state->packet_timeout_ms <= 0) continue; ms_subtract_diff(&start, &ms_remain); if (ms_remain <= 0) { |