MINOR: stconn: Always report READ/WRITE event on shutr/shutw
It was done by hand by callers when a shutdown for read or write was
performed. It is now always handled by the functions performing the
shutdown. This way the callers don't take care of it. This will avoid some
bugs.
diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 724d24b..e4cc469 100644
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -1598,7 +1598,6 @@
case PROMEX_ST_END:
if (!(res->flags & CF_SHUTR)) {
- res->flags |= CF_READ_EVENT;
sc_shutr(sc);
}
}
@@ -1614,7 +1613,6 @@
return;
error:
- res->flags |= CF_READ_EVENT;
sc_shutr(sc);
sc_shutw(sc);
goto out;
diff --git a/src/backend.c b/src/backend.c
index 5a35bcc..d022627 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -2023,7 +2023,6 @@
sc_shutr(sc);
sc_shutw(sc);
sc_ep_set(sc, SE_FL_ERROR|SE_FL_EOS);
- req->flags |= CF_WRITE_EVENT;
s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
@@ -2184,7 +2183,6 @@
sc_shutr(sc);
sc_shutw(sc);
sc_ep_set(sc, SE_FL_ERROR|SE_FL_EOS);
- s->req.flags |= CF_WRITE_EVENT;
s->conn_err_type = STRM_ET_CONN_RES;
sc->state = SC_ST_CLO;
if (s->srv_error)
@@ -2211,7 +2209,6 @@
sc_shutr(sc);
sc_shutw(sc);
sc_ep_set(sc, SE_FL_ERROR|SE_FL_EOS);
- s->req.flags |= CF_WRITE_EVENT;
if (!s->conn_err_type)
s->conn_err_type = STRM_ET_CONN_OTHER;
sc->state = SC_ST_CLO;
@@ -2347,8 +2344,6 @@
/* shutw is enough to stop a connecting socket */
sc_shutw(sc);
sc_ep_set(sc, SE_FL_ERROR|SE_FL_EOS);
- s->req.flags |= CF_WRITE_EVENT;
- s->res.flags |= CF_READ_EVENT;
sc->state = SC_ST_CLO;
if (s->srv_error)
@@ -2382,8 +2377,6 @@
/* shutw is enough to stop a connecting socket */
sc_shutw(sc);
sc_ep_set(sc, SE_FL_ERROR|SE_FL_EOS);
- s->req.flags |= CF_WRITE_EVENT;
- s->res.flags |= CF_READ_EVENT;
sc->state = SC_ST_CLO;
if (s->srv_error)
diff --git a/src/cache.c b/src/cache.c
index 9683c08..ae57ce5 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1532,10 +1532,8 @@
}
end:
- if (!(res->flags & CF_SHUTR) && appctx->st0 == HTX_CACHE_END) {
- res->flags |= CF_READ_EVENT;
+ if (!(res->flags & CF_SHUTR) && appctx->st0 == HTX_CACHE_END)
sc_shutr(sc);
- }
out:
total = res_htx->data - total;
diff --git a/src/cli.c b/src/cli.c
index b683652..7058d7b 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1183,7 +1183,6 @@
* on the response buffer.
*/
sc_shutr(sc);
- res->flags |= CF_READ_EVENT;
}
out:
diff --git a/src/dns.c b/src/dns.c
index 057935a..9b09dfb 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -765,7 +765,6 @@
close:
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
}
void dns_queries_flush(struct dns_session *ds)
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 1f6b3a9..327614e 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -1303,7 +1303,6 @@
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
}
/* Destroy the task attached to this applet */
@@ -2022,7 +2021,6 @@
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
__fallthrough;
case SPOE_APPCTX_ST_END:
diff --git a/src/hlua.c b/src/hlua.c
index 1771d14..be3c1ac 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2003,7 +2003,6 @@
if (ctx->die) {
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
notification_wake(&ctx->wake_on_read);
notification_wake(&ctx->wake_on_write);
stream_shutdown(__sc_strm(sc), SF_ERR_KILLED);
@@ -9426,7 +9425,6 @@
struct hlua_tcp_ctx *tcp_ctx = ctx->svcctx;
struct stconn *sc = appctx_sc(ctx);
struct stream *strm = __sc_strm(sc);
- struct channel *res = sc_ic(sc);
struct act_rule *rule = ctx->rule;
struct proxy *px = strm->be;
struct hlua *hlua = tcp_ctx->hlua;
@@ -9450,7 +9448,6 @@
/* eat the whole request */
co_skip(sc_oc(sc), co_data(sc_oc(sc)));
- res->flags |= CF_READ_EVENT;
sc_shutr(sc);
return;
@@ -9732,10 +9729,8 @@
done:
if (http_ctx->flags & APPLET_DONE) {
- if (!(res->flags & CF_SHUTR)) {
- res->flags |= CF_READ_EVENT;
+ if (!(res->flags & CF_SHUTR))
sc_shutr(sc);
- }
/* eat the whole request */
if (co_data(req)) {
diff --git a/src/log.c b/src/log.c
index 04ead1f..da9766d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -3688,9 +3688,6 @@
close:
sc_shutw(sc);
sc_shutr(sc);
-
- sc_ic(sc)->flags |= CF_READ_EVENT;
-
return;
}
diff --git a/src/peers.c b/src/peers.c
index e3eb049..89e3bc7 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -3195,7 +3195,6 @@
}
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
goto out;
}
}
diff --git a/src/sink.c b/src/sink.c
index 9c1c4d4..bd04ec8 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -443,7 +443,6 @@
close:
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
}
/*
@@ -585,7 +584,6 @@
close:
sc_shutw(sc);
sc_shutr(sc);
- sc_ic(sc)->flags |= CF_READ_EVENT;
}
void __sink_forward_session_deinit(struct sink_forward_target *sft)
diff --git a/src/stats.c b/src/stats.c
index 4ee8e86..d9bb367 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -4506,10 +4506,8 @@
}
if (appctx->st0 == STAT_HTTP_END) {
- if (!(res->flags & CF_SHUTR)) {
- res->flags |= CF_READ_EVENT;
+ if (!(res->flags & CF_SHUTR))
sc_shutr(sc);
- }
/* eat the whole request */
if (co_data(req)) {
diff --git a/src/stconn.c b/src/stconn.c
index 07b9767..e6b7d59 100644
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -533,8 +533,8 @@
struct channel *ic = sc_ic(sc);
if (ic->flags & CF_SHUTR)
- return;
- ic->flags |= CF_SHUTR;
+
+ ic->flags |= CF_SHUTR|CF_READ_EVENT;
sc_ep_report_read_activity(sc);
sc_ep_reset_rex(sc);
@@ -569,7 +569,7 @@
oc->flags &= ~CF_SHUTW_NOW;
if (oc->flags & CF_SHUTW)
return;
- oc->flags |= CF_SHUTW;
+ oc->flags |= CF_SHUTW|CF_WRITE_EVENT;
sc_ep_reset_wex(sc);
if (tick_isset(sc->hcto)) {
@@ -676,7 +676,7 @@
if (ic->flags & CF_SHUTR)
return;
- ic->flags |= CF_SHUTR;
+ ic->flags |= CF_SHUTR|CF_READ_EVENT;
sc_ep_reset_rex(sc);
if (!sc_state_in(sc->state, SC_SB_CON|SC_SB_RDY|SC_SB_EST))
@@ -710,7 +710,7 @@
oc->flags &= ~CF_SHUTW_NOW;
if (oc->flags & CF_SHUTW)
return;
- oc->flags |= CF_SHUTW;
+ oc->flags |= CF_SHUTW|CF_WRITE_EVENT;
sc_ep_reset_wex(sc);
if (tick_isset(sc->hcto)) {
@@ -898,7 +898,7 @@
if (ic->flags & CF_SHUTR)
return;
- ic->flags |= CF_SHUTR;
+ ic->flags |= CF_SHUTR|CF_READ_EVENT;
sc_ep_reset_rex(sc);
/* Note: on shutr, we don't call the applet */
@@ -933,7 +933,7 @@
oc->flags &= ~CF_SHUTW_NOW;
if (oc->flags & CF_SHUTW)
return;
- oc->flags |= CF_SHUTW;
+ oc->flags |= CF_SHUTW|CF_WRITE_EVENT;
sc_ep_reset_wex(sc);
if (tick_isset(sc->hcto)) {
@@ -1240,7 +1240,7 @@
if (ic->flags & CF_SHUTR)
return;
- ic->flags |= CF_SHUTR;
+ ic->flags |= CF_SHUTR|CF_READ_EVENT;
sc_ep_report_read_activity(sc);
sc_ep_reset_rex(sc);
@@ -1589,7 +1589,6 @@
ret = 1;
else if (sc_ep_test(sc, SE_FL_EOS)) {
/* we received a shutdown */
- ic->flags |= CF_READ_EVENT;
if (ic->flags & CF_AUTO_CLOSE)
channel_shutw_now(ic);
sc_conn_read0(sc);
@@ -1874,7 +1873,6 @@
*/
if (sc_ep_test(sc, SE_FL_EOS) && !(ic->flags & CF_SHUTR)) {
/* we received a shutdown */
- ic->flags |= CF_READ_EVENT;
if (ic->flags & CF_AUTO_CLOSE)
channel_shutw_now(ic);
sc_conn_read0(sc);