MINOR: mux-quic: implement rcv_buf
Implement the stream rcv_buf operation on QUIC mux.
A new buffer is stored in qcs structure named app_buf. This new buffer
will contains HTX and will be filled for example on H3 DATA frame
parsing.
The rcv_buf operation transfer as much as possible data from the HTX
from app_buf to the conn-stream buffer. This is mainly identical to
mux-h2. This is required to support HTTP POST data.
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index f2b217f..88485ef 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -76,6 +76,7 @@
struct eb_root frms; /* received frames ordered by their offsets */
uint64_t offset; /* the current offset of received data */
struct buffer buf; /* receive buffer, always valid (buf_empty or real buffer) */
+ struct buffer app_buf; /* receive buffer used by conn_stream layer */
} rx;
struct {
uint64_t offset; /* the current offset of received data */
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 58d8c42..3424a22 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -5,6 +5,7 @@
#include <haproxy/api.h>
#include <haproxy/connection.h>
#include <haproxy/dynbuf.h>
+#include <haproxy/htx.h>
#include <haproxy/pool.h>
#include <haproxy/ssl_sock-t.h>
@@ -51,6 +52,7 @@
qcc->strms[type].nb_streams++;
qcs->rx.buf = BUF_NULL;
+ qcs->rx.app_buf = BUF_NULL;
qcs->rx.offset = 0;
qcs->rx.frms = EB_ROOT_UNIQUE;
@@ -552,10 +554,63 @@
static size_t qc_rcv_buf(struct conn_stream *cs, struct buffer *buf,
size_t count, int flags)
{
- /* XXX TODO XXX */
+ struct qcs *qcs = cs->ctx;
+ struct htx *qcs_htx = NULL;
+ struct htx *cs_htx = NULL;
+ size_t ret = 0;
+
fprintf(stderr, "%s\n", __func__);
- return 0;
+ qcs_htx = htx_from_buf(&qcs->rx.app_buf);
+ if (htx_is_empty(qcs_htx)) {
+ /* Set buffer data to 0 as HTX is empty. */
+ htx_to_buf(qcs_htx, &qcs->rx.app_buf);
+ goto end;
+ }
+
+ ret = qcs_htx->data;
+
+ cs_htx = htx_from_buf(buf);
+ if (htx_is_empty(cs_htx) && htx_used_space(qcs_htx) <= count) {
+ htx_to_buf(cs_htx, buf);
+ htx_to_buf(qcs_htx, &qcs->rx.app_buf);
+ b_xfer(buf, &qcs->rx.app_buf, b_data(&qcs->rx.app_buf));
+ goto end;
+ }
+
+ htx_xfer_blks(cs_htx, qcs_htx, count, HTX_BLK_UNUSED);
+ BUG_ON(qcs_htx->flags & HTX_FL_PARSING_ERROR);
+
+ /* Copy EOM from src to dst buffer if all data copied. */
+ if (htx_is_empty(qcs_htx))
+ cs_htx->flags |= (qcs_htx->flags & HTX_FL_EOM);
+
+ cs_htx->extra = qcs_htx->extra ? (qcs_htx->data + qcs_htx->extra) : 0;
+ htx_to_buf(cs_htx, buf);
+ htx_to_buf(qcs_htx, &qcs->rx.app_buf);
+ ret -= qcs_htx->data;
+
+ end:
+ if (b_data(&qcs->rx.app_buf)) {
+ cs->flags |= (CS_FL_RCV_MORE | CS_FL_WANT_ROOM);
+ }
+ else {
+ cs->flags &= ~(CS_FL_RCV_MORE | CS_FL_WANT_ROOM);
+ if (cs->flags & CS_FL_ERR_PENDING)
+ cs->flags |= CS_FL_ERROR;
+
+ /* TODO put CS_FL_EOI/EOS on fin */
+
+ if (b_size(&qcs->rx.app_buf)) {
+ b_free(&qcs->rx.app_buf);
+ offer_buffers(NULL, 1);
+ }
+ }
+
+ if (ret)
+ tasklet_wakeup(qcs->qcc->wait_event.tasklet);
+
+ return ret;
}
static size_t qc_snd_buf(struct conn_stream *cs, struct buffer *buf,