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

Fix double "Network error" message on SSH/Windows.

Browse Source 
On Windows, PuTTY using the SSH backend could emit messages like
"Network error: Network error: Software caused connection abort".

When ssh.c regained the ability to emit plug_closing error messages in
ed0104c2fe (after it disappeared in fe6caf563c), it came with an extra
"Network error:". But winnet.c already adds that prefix.

This changes it back the way it was, which is also consistent with the
other backends.
This commit is contained in:
Jacob Nevins 2019-04-08 23:36:12 +01:00
parent dfc215d0c0
commit cf91937bd6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssh.c
View File

@ -580,7 +580,7 @@ static void ssh_closing(Plug *plug, const char *error_msg, int error_code,
{ {
Ssh *ssh = container_of(plug, Ssh, plug); Ssh *ssh = container_of(plug, Ssh, plug);
if (error_msg) { if (error_msg) {
ssh_remote_error(ssh, "Network error: %s", error_msg); ssh_remote_error(ssh, "%s", error_msg);
} else if (ssh->bpp) { } else if (ssh->bpp) {
ssh->bpp->input_eof = true; ssh->bpp->input_eof = true;
queue_idempotent_callback(&ssh->bpp->ic_in_raw); queue_idempotent_callback(&ssh->bpp->ic_in_raw);

2
sshserver.c
View File

@ -133,7 +133,7 @@ static void server_closing(Plug *plug, const char *error_msg, int error_code,
{ {
server *srv = container_of(plug, server, plug); server *srv = container_of(plug, server, plug);
if (error_msg) { if (error_msg) {
ssh_remote_error(&srv->ssh, "Network error: %s", error_msg); ssh_remote_error(&srv->ssh, "%s", error_msg);
} else if (srv->bpp) { } else if (srv->bpp) {
srv->bpp->input_eof = true; srv->bpp->input_eof = true;
queue_idempotent_callback(&srv->bpp->ic_in_raw); queue_idempotent_callback(&srv->bpp->ic_in_raw);