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

Avoid logging pre-verstring EPIPE from sharing downstreams.

Browse Source 
If you use the new 'plink -shareexists' feature, then on Unix at least
it's possible for the upstream to receive EPIPE, because the
downstream makes a test connection and immediately closes it, so that
upstream fails to write its version string.

This looks a bit ugly in the upstream's Event Log, so I'm making a
special case: an error of 'broken pipe' type, which occurs on a socket
from a connection sharing downstream, before we've received a version
string from that downstream, is treated as an unusual kind of normal
connection termination and not logged as an error.
This commit is contained in:
Simon Tatham 2015-09-25 12:05:55 +01:00
parent 7c2ea22784
commit 5133d2a133
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sshshare.c
View File

@ -133,6 +133,7 @@
#include <stdlib.h>
#include <assert.h>
#include <limits.h>
#include <errno.h>
#include "putty.h"
#include "tree234.h"
@ -914,8 +915,26 @@ static int share_closing(Plug plug, const char *error_msg, int error_code,
int calling_back)
{
struct ssh_sharing_connstate *cs = (struct ssh_sharing_connstate *)plug;
if (error_msg)
ssh_sharing_logf(cs->parent->ssh, cs->id, "%s", error_msg);
if (error_msg) {
#ifdef BROKEN_PIPE_ERROR_CODE
/*
* Most of the time, we log what went wrong when a downstream
* disappears with a socket error. One exception, though, is
* receiving EPIPE when we haven't received a protocol version
* string from the downstream, because that can happen as a result
* of plink -shareexists (opening the connection and instantly
* closing it again without bothering to read our version string).
* So that one case is not treated as a log-worthy error.
*/
printf("%d %d\n", error_code, cs->got_verstring);
if (error_code == BROKEN_PIPE_ERROR_CODE && !cs->got_verstring)
/* do nothing */;
else
#endif
ssh_sharing_logf(cs->parent->ssh, cs->id,
"Socket error: %s", error_msg);
}
share_begin_cleanup(cs);
return 1;
}

2
unix/unix.h
View File

@ -45,6 +45,8 @@ typedef void *Context; /* FIXME: probably needs changing */
extern Backend pty_backend;
#define BROKEN_PIPE_ERROR_CODE EPIPE /* used in sshshare.c */
typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */
#define PUTTY_UINT32_DEFINED

2
windows/winstuff.h
View File

@ -79,6 +79,8 @@ struct FontSpec *fontspec_new(const char *name,
#define PLATFORM_HAS_SMEMCLR /* inhibit cross-platform one in misc.c */
#endif
#define BROKEN_PIPE_ERROR_CODE ERROR_BROKEN_PIPE /* used in sshshare.c */
/*
* Dynamically linked functions. These come in two flavours:
*