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

MEDIUM: peers: Use the sedesc to report and detect end of processing

Browse Source 
Just like for other applets, we now use the SE descriptor instead of the
channel to report error and end-of-stream. We must just be sure to consume
request data when we are waiting the applet to be released.
This commit is contained in:
Christopher Faulet 2023-03-31 11:21:06 +02:00
parent 22a88f06d4
commit 3d949010bc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/peers.c
View File

@ -2408,7 +2408,7 @@ static inline int peer_recv_msg(struct appctx *appctx, char *msg_head, size_t ms
return 1; return 1;
incomplete: incomplete:
if (reql < 0 || (sc_oc(sc)->flags & (CF_SHUTW|CF_SHUTW_NOW))) { if (reql < 0) {
/* there was an error or the message was truncated */ /* there was an error or the message was truncated */
appctx->st0 = PEER_SESS_ST_END; appctx->st0 = PEER_SESS_ST_END;
return -1; return -1;
@ -2923,6 +2923,11 @@ static void peer_io_handler(struct appctx *appctx)
unsigned int maj_ver, min_ver; unsigned int maj_ver, min_ver;
int prev_state; int prev_state;
if (unlikely(se_fl_test(appctx->sedesc, (SE_FL_EOS|SE_FL_ERROR|SE_FL_SHR|SE_FL_SHW)))) {
co_skip(sc_oc(sc), co_data(sc_oc(sc)));
goto out;
}
/* Check if the input buffer is available. */ /* Check if the input buffer is available. */
if (sc_ib(sc)->size == 0) { if (sc_ib(sc)->size == 0) {
sc_need_room(sc); sc_need_room(sc);
@ -3191,8 +3196,8 @@ static void peer_io_handler(struct appctx *appctx)
HA_SPIN_UNLOCK(PEER_LOCK, &curpeer->lock); HA_SPIN_UNLOCK(PEER_LOCK, &curpeer->lock);
curpeer = NULL; curpeer = NULL;
} }
sc_shutw(sc); se_fl_set(appctx->sedesc, SE_FL_EOS|SE_FL_EOI);
sc_shutr(sc); co_skip(sc_oc(sc), co_data(sc_oc(sc)));
goto out; goto out;
} }
} }