MEDIUM: stream_interface: centralize the SI_FL_ERR management
It's better to have only stream_sock_update_conn() handle the conversion
of the CO_FL_ERROR flag to SI_FL_ERR than having it in each and every I/O
callback.
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index cebc477..c785384 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -589,9 +589,7 @@
*/
conn->flags |= CO_FL_ERROR;
- fdtab[fd].ev &= ~FD_POLL_STICKY;
EV_FD_REM(fd);
- si->flags |= SI_FL_ERR;
retval = 1;
goto out_wakeup;
}
diff --git a/src/sock_raw.c b/src/sock_raw.c
index cdb0e27..8136d60 100644
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -467,9 +467,7 @@
*/
conn->flags |= CO_FL_ERROR;
- fdtab[fd].ev &= ~FD_POLL_STICKY;
EV_FD_REM(fd);
- si->flags |= SI_FL_ERR;
retval = 1;
goto out_wakeup;
}
@@ -662,9 +660,7 @@
*/
conn->flags |= CO_FL_ERROR;
- fdtab[fd].ev &= ~FD_POLL_STICKY;
EV_FD_REM(fd);
- si->flags |= SI_FL_ERR;
return 1;
}
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 9d6f961..1a6db19 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -498,6 +498,9 @@
__FUNCTION__,
si, si->state, si->ib->flags, si->ob->flags);
+ if (conn->flags & CO_FL_ERROR)
+ si->flags |= SI_FL_ERR;
+
/* process consumer side, only once if possible */
if (fdtab[fd].ev & (FD_POLL_OUT | FD_POLL_ERR)) {
if (si->ob->flags & BF_OUT_EMPTY) {