mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stream-int: Set CO_RFL transient/persistent flags apart in si_cs_rcv()

Browse Source 
In si_cs_recv(), some CO_RFL flags are set when the mux's .rcv_buf()
function is called. Some are persitent inside si_cs_recv() scope, some
others must be computed at each call to rcv_buf(). This patch takes care of
distinguishing them.

Among others, CO_RFL_KEEP_RECV is a persistent flag while CO_RFL_BUF_WET is
transient.
This commit is contained in:
Christopher Faulet 2021-09-21 15:14:57 +02:00
parent 7833596ff4
commit 68a14db573
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stream_interface.c
View File

@ -1336,6 +1336,10 @@ int si_cs_recv(struct conn_stream *cs)
if (!si_alloc_ibuf(si, &(si_strm(si)->buffer_wait))) if (!si_alloc_ibuf(si, &(si_strm(si)->buffer_wait)))
goto end_recv; goto end_recv;
/* Instruct the mux it must subscribed for read events */
flags |= ((!conn_is_back(conn) && (si_strm(si)->be->options & PR_O_ABRT_CLOSE)) ? CO_RFL_KEEP_RECV : 0);
/* Important note : if we're called with POLL_IN|POLL_HUP, it means the read polling /* Important note : if we're called with POLL_IN|POLL_HUP, it means the read polling
* was enabled, which implies that the recv buffer was not full. So we have a guarantee * was enabled, which implies that the recv buffer was not full. So we have a guarantee
* that if such an event is not handled above in splice, it will be handled here by * that if such an event is not handled above in splice, it will be handled here by
@ -1344,12 +1348,17 @@ int si_cs_recv(struct conn_stream *cs)
while ((cs->flags & CS_FL_RCV_MORE) || while ((cs->flags & CS_FL_RCV_MORE) ||
(!(conn->flags & (CO_FL_ERROR | CO_FL_HANDSHAKE)) && (!(conn->flags & (CO_FL_ERROR | CO_FL_HANDSHAKE)) &&
(!(cs->flags & (CS_FL_ERROR|CS_FL_EOS))) && !(ic->flags & CF_SHUTR))) { (!(cs->flags & (CS_FL_ERROR|CS_FL_EOS))) && !(ic->flags & CF_SHUTR))) {
int cur_flags = flags;
/* Compute transient CO_RFL_* flags */
if (co_data(ic))
cur_flags |= CO_RFL_BUF_WET;
/* <max> may be null. This is the mux responsibility to set /* <max> may be null. This is the mux responsibility to set
* CS_FL_RCV_MORE on the CS if more space is needed. * CS_FL_RCV_MORE on the CS if more space is needed.
*/ */
max = channel_recv_max(ic); max = channel_recv_max(ic);
flags |= ((!conn_is_back(conn) && (si_strm(si)->be->options & PR_O_ABRT_CLOSE)) ? CO_RFL_KEEP_RECV : 0); ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, cur_flags);
ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, flags | (co_data(ic) ? CO_RFL_BUF_WET : 0));
if (cs->flags & CS_FL_WANT_ROOM) { if (cs->flags & CS_FL_WANT_ROOM) {
si_rx_room_blk(si); si_rx_room_blk(si);