From: Philip Craig <philipjcraig@gmail.com>
Date: Mon, 13 Jul 2015 02:12:28 +0000 (+1000)
Subject: ustream-fd: handle uloop errors
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=e88d816d6e462180f0337565e04e36be58a63309

ustream-fd: handle uloop errors

The default uloop error handling is to delete the fd. Continue to do
that, but also set the write_error flag and notify the user.

Signed-off-by: Philip Craig <philipjcraig@gmail.com>
---

diff --git a/ustream-fd.c b/ustream-fd.c
index 5ffca53..d5abb5a 100644
--- a/ustream-fd.c
+++ b/ustream-fd.c
@@ -25,7 +25,7 @@ static void ustream_fd_set_uloop(struct ustream *s, bool write)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
 	struct ustream_buf *buf;
-	unsigned int flags = ULOOP_EDGE_TRIGGER;
+	unsigned int flags = ULOOP_EDGE_TRIGGER | ULOOP_ERROR_CB;
 
 	if (!s->read_blocked && !s->eof)
 		flags |= ULOOP_READ;
@@ -127,6 +127,12 @@ static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)
 			ustream_fd_set_uloop(s, false);
 	}
 
+	if (sf->fd.error && !s->write_error) {
+		ustream_state_change(s);
+		s->write_error = true;
+		ustream_fd_set_uloop(s, false);
+	}
+
 	return more;
 }