Mercurial > dropbear
diff process-packet.c @ 1733:d529a52b2f7c coverity coverity
merge coverity from main
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 26 Jun 2020 21:07:34 +0800 |
parents | 41bf8f216644 |
children |
line wrap: on
line diff
--- a/process-packet.c Thu Mar 21 23:28:59 2019 +0800 +++ b/process-packet.c Fri Jun 26 21:07:34 2020 +0800 @@ -51,8 +51,6 @@ type = buf_getbyte(ses.payload); TRACE(("process_packet: packet type = %d, len %d", type, ses.payload->len)) - ses.lastpacket = type; - now = monotonic_now(); ses.last_packet_time_keepalive_recv = now; @@ -78,7 +76,9 @@ idle detection. This is slightly incorrect since a tcp forwarded global request with failure won't trigger the idle timeout, but that's probably acceptable */ - if (!(type == SSH_MSG_GLOBAL_REQUEST || type == SSH_MSG_REQUEST_FAILURE)) { + if (!(type == SSH_MSG_GLOBAL_REQUEST + || type == SSH_MSG_REQUEST_FAILURE + || type == SSH_MSG_CHANNEL_FAILURE)) { ses.last_packet_time_idle = now; } @@ -154,6 +154,7 @@ recv_unimplemented(); out: + ses.lastpacket = type; buf_free(ses.payload); ses.payload = NULL;