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

Changed my mind about the EOF policy in SSH mode: I think the SSH

Browse Source 
backend should unilaterally assume outgoing EOF when it sees incoming
EOF, if and only if the main session channel is talking to a pty.
(Because ptys don't have a strong concept of EOF in the first place,
that seems like a sensible place to draw the line.) This fixes a bug
introduced by today's revamp in which if you used Unix Plink to run a
console session it would hang after you hit ^D - because the server
had sent EOF, but it was waiting for a client-side EOF too.

[originally from svn r9282]
This commit is contained in:
Simon Tatham 2011-09-13 15:38:12 +00:00
parent 5848c8cc3d
commit 6e2bcd24a4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ssh.c
View File

@ -850,6 +850,7 @@ struct ssh_tag {
int size_needed, eof_needed; int size_needed, eof_needed;
int sent_console_eof; int sent_console_eof;
int got_pty; /* affects EOF behaviour on main channel */
struct Packet **queue; struct Packet **queue;
int queuelen, queuesize; int queuelen, queuesize;
@ -5181,9 +5182,11 @@ static void do_ssh1_connection(Ssh ssh, unsigned char *in, int inlen,
} else if (pktin->type == SSH1_SMSG_FAILURE) { } else if (pktin->type == SSH1_SMSG_FAILURE) {
c_write_str(ssh, "Server refused to allocate pty\r\n"); c_write_str(ssh, "Server refused to allocate pty\r\n");
ssh->editing = ssh->echoing = 1; ssh->editing = ssh->echoing = 1;
} } else {
logeventf(ssh, "Allocated pty (ospeed %dbps, ispeed %dbps)", logeventf(ssh, "Allocated pty (ospeed %dbps, ispeed %dbps)",
ssh->ospeed, ssh->ispeed); ssh->ospeed, ssh->ispeed);
ssh->got_pty = TRUE;
}
} else { } else {
ssh->editing = ssh->echoing = 1; ssh->editing = ssh->echoing = 1;
} }
@ -6932,10 +6935,15 @@ static void ssh2_channel_got_eof(struct ssh_channel *c)
} else if (c->type == CHAN_MAINSESSION) { } else if (c->type == CHAN_MAINSESSION) {
Ssh ssh = c->ssh; Ssh ssh = c->ssh;
if (!ssh->sent_console_eof && from_backend_eof(ssh->frontend)) { if (!ssh->sent_console_eof &&
(from_backend_eof(ssh->frontend) || ssh->got_pty)) {
/* /*
* The front end wants us to close the outgoing side of the * Either from_backend_eof told us that the front end
* connection as soon as we see EOF from the far end. * wants us to close the outgoing side of the connection
* as soon as we see EOF from the far end, or else we've
* unilaterally decided to do that because we've allocated
* a remote pty and hence EOF isn't a particularly
* meaningful concept.
*/ */
sshfwd_write_eof(c); sshfwd_write_eof(c);
} }
@ -9018,6 +9026,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
} else { } else {
logeventf(ssh, "Allocated pty (ospeed %dbps, ispeed %dbps)", logeventf(ssh, "Allocated pty (ospeed %dbps, ispeed %dbps)",
ssh->ospeed, ssh->ispeed); ssh->ospeed, ssh->ispeed);
ssh->got_pty = TRUE;
} }
} else { } else {
ssh->editing = ssh->echoing = 1; ssh->editing = ssh->echoing = 1;
@ -9445,6 +9454,7 @@ static const char *ssh_init(void *frontend_handle, void **backend_handle,
ssh->frozen = FALSE; ssh->frozen = FALSE;
ssh->username = NULL; ssh->username = NULL;
ssh->sent_console_eof = FALSE; ssh->sent_console_eof = FALSE;
ssh->got_pty = FALSE;
*backend_handle = ssh; *backend_handle = ssh;