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 cebc477107d6894cb3f54adac20478d8b10dcc51..c785384ec6cd30b1b71c9ffdfa041666ed662ed4 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -589,9 +589,7 @@ int tcp_connect_probe(struct connection *conn)
         */
 
        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 cdb0e271406f7eca10df4d34144eae75a552903d..8136d601ca346dfefd71df8aa27d7a07f2916a0c 100644 (file)
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -467,9 +467,7 @@ static int sock_raw_read(struct connection *conn)
         */
 
        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 @@ static int sock_raw_write(struct connection *conn)
         */
 
        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 9d6f9616c47f56daa8a08e9d0cf6ce8f53ee7c82..1a6db199ac0c8e389048559ccba94e1f480bf1ec 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -498,6 +498,9 @@ void stream_sock_update_conn(struct connection *conn)
                __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) {