nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

<1112163342.018492.101240@f14g2000cwb.googlegroups.com> on

Browse Source 
comp.security.ssh contains a Dr Watson log which looks to me as if
`unclean-close-crash' occurred due to a rekey timer going off after
the session had closed. Hence, ssh2_timer() now avoids doing
anything if the session is already closed, and also ssh_do_close()
proactively calls expire_timer_context(). Between those I think they
ought to solve the problem.

[originally from svn r5564]
This commit is contained in:
Simon Tatham 2005-03-30 08:27:54 +00:00
parent a34ab9bfc9
commit 6df09c6275
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -2444,6 +2444,7 @@ static int ssh_do_close(Ssh ssh, int notify_exit)
struct ssh_channel *c; struct ssh_channel *c;
ssh->state = SSH_STATE_CLOSED; ssh->state = SSH_STATE_CLOSED;
expire_timer_context(ssh);
if (ssh->s) { if (ssh->s) {
sk_close(ssh->s); sk_close(ssh->s);
ssh->s = NULL; ssh->s = NULL;
@ -7571,6 +7572,9 @@ static void ssh2_timer(void *ctx, long now)
{ {
Ssh ssh = (Ssh)ctx; Ssh ssh = (Ssh)ctx;
if (ssh->state == SSH_STATE_CLOSED)
return;
if (!ssh->kex_in_progress && ssh->cfg.ssh_rekey_time != 0 && if (!ssh->kex_in_progress && ssh->cfg.ssh_rekey_time != 0 &&
now - ssh->next_rekey >= 0) { now - ssh->next_rekey >= 0) {
do_ssh2_transport(ssh, "timeout", -1, NULL); do_ssh2_transport(ssh, "timeout", -1, NULL);