From: Christopher Faulet Date: Thu, 1 Feb 2024 15:36:25 +0000 (+0100) Subject: MEDIUM: stream: Use generic version to perform sync receives and sends X-Git-Tag: v3.0-dev7~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6733eb45b1c5ef9d6d34767a1553504348b2e8;p=thirdparty%2Fhaproxy.git MEDIUM: stream: Use generic version to perform sync receives and sends Instead of using connection versions, we now use generic versions. It means we will also perfom sync receives and sync sends on applets too, but only for applets using their own buffers. Old applets are not concerned. --- diff --git a/src/stream.c b/src/stream.c index 1e2940974f..0c8d87cfb5 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1736,8 +1736,8 @@ struct task *process_stream(struct task *t, void *context, unsigned int state) scb = s->scb; /* First, attempt to receive pending data from I/O layers */ - sc_conn_sync_recv(scf); - sc_conn_sync_recv(scb); + sc_sync_recv(scf); + sc_sync_recv(scb); /* Let's check if we're looping without making any progress, e.g. due * to a bogus analyser or the fact that we're ignoring a read0. The @@ -2349,7 +2349,7 @@ struct task *process_stream(struct task *t, void *context, unsigned int state) } /* Let's see if we can send the pending request now */ - sc_conn_sync_send(scb); + sc_sync_send(scb); /* * Now forward all shutdown requests between both sides of the request buffer @@ -2459,7 +2459,7 @@ struct task *process_stream(struct task *t, void *context, unsigned int state) scf_flags = (scf_flags & ~(SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED)) | (scf->flags & (SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED)); /* Let's see if we can send the pending response now */ - sc_conn_sync_send(scf); + sc_sync_send(scf); /* * Now forward all shutdown requests between both sides of the buffer