DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ustream-fd: handle uloop errors

Browse source 
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>
This commit is contained in:
Philip Craig 2015-07-13 12:12:28 +10:00 committed by Felix Fietkau
parent e7e554c194
commit e88d816d6e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ustream-fd.c
View file

@ -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_fd *sf = container_of(s, struct ustream_fd, stream);
struct ustream_buf *buf; 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) if (!s->read_blocked && !s->eof)
flags |= ULOOP_READ; 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); 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; return more;
} }