]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
Move call to ssh2_channnel_check_close().
authorBen Harris <bjh21@bjh21.me.uk>
Wed, 25 May 2016 22:06:20 +0000 (23:06 +0100)
committerBen Harris <bjh21@bjh21.me.uk>
Wed, 25 May 2016 22:06:20 +0000 (23:06 +0100)
From ssh2_channel_got_eof() to ssh2_msg_channel_eof().  This removes
the only SSH-2 specicifity from the former.  ssh2_channel_got_eof()
can also be called from ssh2_msg_channel_close(), but that calls
ssh2_channel_check_close() already.

ssh.c

diff --git a/ssh.c b/ssh.c
index 9ab1d771c43e501cfc1ef7bd49d68d293a85b018..48116ccdfe58912a21ed172ada59b81a0394b76d 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -8267,8 +8267,6 @@ static void ssh2_channel_got_eof(struct ssh_channel *c)
         }
         ssh->sent_console_eof = TRUE;
     }
-
-    ssh2_channel_check_close(c);
 }
 
 static void ssh2_msg_channel_eof(Ssh ssh, struct Packet *pktin)
@@ -8279,6 +8277,7 @@ static void ssh2_msg_channel_eof(Ssh ssh, struct Packet *pktin)
     if (!c)
        return;
     ssh2_channel_got_eof(c);
+    ssh2_channel_check_close(c);
 }
 
 static void ssh2_msg_channel_close(Ssh ssh, struct Packet *pktin)