From ee56a6b48f970b1ebf0e46f541efc87cd822cb07 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 22 Feb 2005 23:30:09 +0000 Subject: [PATCH] Remove the two logevent calls passing NULL as the first argument. This was copied straight from winnet.c and I don't believe it's _ever_ been valid in the Unix front end. [originally from svn r5384] --- unix/uxnet.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/unix/uxnet.c b/unix/uxnet.c index c624e0d4..7b970416 100644 --- a/unix/uxnet.c +++ b/unix/uxnet.c @@ -911,11 +911,9 @@ void try_send(Actual_Socket s) */ s->writable = FALSE; return; - } else if (nsent == 0 || - err == ECONNABORTED || err == ECONNRESET) { + } else { /* - * If send() returns CONNABORTED or CONNRESET, we - * unfortunately can't just call plug_closing(), + * We unfortunately can't just call plug_closing(), * because it's quite likely that we're currently * _in_ a call from the code we'd be calling back * to, so we'd have to make half the SSH code @@ -925,11 +923,6 @@ void try_send(Actual_Socket s) */ s->pending_error = err; return; - } else { - /* We're inside the Unix frontend here, so we know - * that the frontend handle is unnecessary. */ - logevent(NULL, strerror(err)); - fatalbox("%s", strerror(err)); } } else { if (s->sending_oob) { @@ -1024,12 +1017,9 @@ static int net_select_result(int fd, int event) ret = recv(s->s, buf, sizeof(buf), MSG_OOB); noise_ultralight(ret); if (ret <= 0) { - const char *str = (ret == 0 ? "Internal networking trouble" : - strerror(errno)); - /* We're inside the Unix frontend here, so we know - * that the frontend handle is unnecessary. */ - logevent(NULL, str); - fatalbox("%s", str); + return plug_closing(s->plug, + ret == 0 ? "Internal networking trouble" : + strerror(errno), errno, 0); } else { /* * Receiving actual data on a socket means we can