RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-04 10:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: conn_stream: make cs_set_error() work on the endpoint instead

Browse Source 
Wherever we need to report an error, we have an even easier access to
the endpoint than the conn_stream. Let's first adjust the API to use
the endpoint and rename the function accordingly to cs_ep_set_error().
This commit is contained in:
Willy Tarreau 2022-05-10 08:46:07 +02:00
parent b112b1d02a
commit 386346f5eb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/haproxy/conn_stream.h
View File

@ -205,13 +205,13 @@ static inline void cs_conn_drain_and_shut(struct conn_stream *cs)
cs_conn_shutr(cs, CO_SHR_DRAIN);
}
/* sets CS_EP_ERROR or CS_EP_ERR_PENDING on the cs */
static inline void cs_set_error(struct conn_stream *cs)
/* sets CS_EP_ERROR or CS_EP_ERR_PENDING on the endpoint */
static inline void cs_ep_set_error(struct cs_endpoint *endp)
{
if (cs->endp->flags & CS_EP_EOS)
cs->endp->flags |= CS_EP_ERROR;
if (endp->flags & CS_EP_EOS)
endp->flags |= CS_EP_ERROR;
else
cs->endp->flags |= CS_EP_ERR_PENDING;
endp->flags |= CS_EP_ERR_PENDING;
}
/* Retrieves any valid conn_stream from this connection, preferably the first

4
src/mux_fcgi.c
View File

@ -917,7 +917,7 @@ static inline void fcgi_strm_error(struct fcgi_strm *fstrm)
TRACE_STATE("switching to ERROR", FCGI_EV_FSTRM_ERR, fstrm->fconn->conn, fstrm);
}
if (fstrm->cs)
cs_set_error(fstrm->cs);
cs_ep_set_error(fstrm->cs->endp);
}
}
@ -4113,7 +4113,7 @@ static size_t fcgi_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t co
if (fstrm->state == FCGI_SS_ERROR) {
TRACE_DEVEL("reporting error to the app-layer stream", FCGI_EV_STRM_SEND|FCGI_EV_FSTRM_ERR|FCGI_EV_STRM_ERR, fconn->conn, fstrm);
cs_set_error(cs);
cs_ep_set_error(cs->endp);
if (!(fstrm->flags & FCGI_SF_BEGIN_SENT) || fcgi_strm_send_abort(fconn, fstrm))
fcgi_strm_close(fstrm);
}

6
src/mux_h2.c
View File

@ -1274,7 +1274,7 @@ static inline __maybe_unused void h2s_error(struct h2s *h2s, enum h2_err err)
if (h2s->st < H2_SS_ERROR)
h2s->st = H2_SS_ERROR;
if (h2s->cs)
cs_set_error(h2s->cs);
cs_ep_set_error(h2s->endp);
}
}
@ -2749,7 +2749,7 @@ static int h2c_handle_rst_stream(struct h2c *h2c, struct h2s *h2s)
h2s_close(h2s);
if (h2s->cs) {
cs_set_error(h2s->cs);
cs_ep_set_error(h2s->endp);
h2s_alert(h2s);
}
@ -6662,7 +6662,7 @@ static size_t h2_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t coun
/* RST are sent similarly to frame acks */
if (h2s->st == H2_SS_ERROR || h2s->flags & H2_SF_RST_RCVD) {
TRACE_DEVEL("reporting RST/error to the app-layer stream", H2_EV_H2S_SEND|H2_EV_H2S_ERR|H2_EV_STRM_ERR, h2s->h2c->conn, h2s);
cs_set_error(cs);
cs_ep_set_error(cs->endp);
if (h2s_send_rst_stream(h2s->h2c, h2s) > 0)
h2s_close(h2s);
}