]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: stream: Use generic version to perform sync receives and sends
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 1 Feb 2024 15:36:25 +0000 (16:36 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 28 Mar 2024 16:28:20 +0000 (17:28 +0100)
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.

src/stream.c

index 1e2940974ff139660a5bb8c5d601efdd06aee480..0c8d87cfb595d568a4bf99c974a870184a134511 100644 (file)
@@ -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