Commit 5baa10a6 authored by Yousong Zhou's avatar Yousong Zhou
Browse files

Use AUTH_TIMEOUT only before authdone != 1.

While at it, fix a few indentations and typo.
parent 3e1a3896
......@@ -433,12 +433,13 @@ static long select_timeout() {
long ret = LONG_MAX;
if (KEX_REKEY_TIMEOUT > 0)
ret = MIN(KEX_REKEY_TIMEOUT, ret);
if (AUTH_TIMEOUT > 0)
/* AUTH_TIMEOUT is only relevant before authdone */
if (sess.authstate.authdone != 1 && AUTH_TIMEOUT > 0)
ret = MIN(AUTH_TIMEOUT, ret);
if (opts.keepalive_secs > 0)
ret = MIN(opts.keepalive_secs, ret);
if (opts.idle_timeout_secs > 0)
ret = MIN(opts.idle_timeout_secs, ret);
if (opts.idle_timeout_secs > 0)
ret = MIN(opts.idle_timeout_secs, ret);
return ret;
}
......
......@@ -87,12 +87,12 @@ void write_packet() {
if (written < 0) {
if (errno == EINTR) {
m_free(iov);
TRACE2(("leave writepacket: EINTR"))
TRACE2(("leave write_packet: EINTR"))
return;
} else {
dropbear_exit("Error writing");
}
}
}
if (written == 0) {
ses.remoteclosed();
......
......@@ -52,7 +52,7 @@ void process_packet() {
ses.lastpacket = type;
ses.last_packet_time = time(NULL);
ses.last_packet_time = time(NULL);
/* These packets we can receive at any time */
switch(type) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment