Attachment 2719 Details for Bug 2476 – report channel write errors

[patch] report channel write errors

bz2476.diff (text/plain), 995 bytes, created by Damien Miller on 2015-10-06 05:09:32 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-10-06 05:09:32 AEDT

Size: 995 bytes

patch

obsolete

>diff --git a/channels.c b/channels.c
>index a84b487..f870130 100644
>--- a/channels.c
>+++ b/channels.c
>@@ -1774,6 +1774,9 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)
> 				debug2("channel %d: input draining.", c->self);
> 				c->type = SSH_CHANNEL_INPUT_DRAINING;
> 			} else {
>+				if (len < 0 && errno != EPIPE)
>+					error("channel %d: write error: %s",
>+					    c->self, strerror(errno));
> 				chan_write_failed(c);
> 			}
> 			return -1;
>@@ -1820,8 +1823,13 @@ channel_handle_efd(Channel *c, fd_set *readset, fd_set *writeset)
> 			    errno == EWOULDBLOCK))
> 				return 1;
> 			if (len <= 0) {
>-				debug2("channel %d: closing write-efd %d",
>-				    c->self, c->efd);
>+				if (len < 0 && errno != EPIPE) {
>+					error("channel %d: write-efd error: %s",
>+					    c->self, strerror(errno));
>+				} else {
>+					debug2("channel %d: write-efd close %d",
>+					    c->self, c->efd);
>+				}
> 				channel_close_fd(&c->efd);
> 			} else {
> 				buffer_consume(&c->extended, len);

Actions: View | Diff

Attachments on bug 2476: 2719