mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 23:27:04 +02:00
This commit is a direct follow-up on the major rearchitecture of send buffering. It allows application protocol to react if current QCS sending buffer space is too small. In this case, the buffer can be released to the quic-conn layer. This allows to allocate a new QCS buffer and retry HTX parsing, unless connection buffer pool is already depleted. A new function qcc_release_stream_txbuf() serves as API for app protocol to release the QCS sending buffer. This operation fails if there is unsent data in it. In this case, MUX has to keep it to finalize transfer of unsent data to quic-conn layer. QCS is thus flagged with QC_SF_BLK_MROOM to interrupt snd_buf operation. When all data are sent to the quic-conn layer, QC_SF_BLK_MROOM is cleared via qcc_streams_sent_done() and stream layer is woken up to restart snd_buf. Note that a new function qcc_stream_can_send() has been defined. It allows app proto to check if sending is currently blocked for the current QCS. For now, it checks QC_SF_BLK_MROOM flag. However, it will be extended to other conditions with the following patches.
238 lines
4.8 KiB
C
238 lines
4.8 KiB
C
#include <haproxy/hq_interop.h>
|
|
|
|
#include <import/ist.h>
|
|
#include <haproxy/buf.h>
|
|
#include <haproxy/connection.h>
|
|
#include <haproxy/dynbuf.h>
|
|
#include <haproxy/htx.h>
|
|
#include <haproxy/http.h>
|
|
#include <haproxy/mux_quic.h>
|
|
#include <haproxy/qmux_http.h>
|
|
#include <haproxy/qmux_trace.h>
|
|
#include <haproxy/trace.h>
|
|
|
|
static ssize_t hq_interop_rcv_buf(struct qcs *qcs, struct buffer *b, int fin)
|
|
{
|
|
struct htx *htx;
|
|
struct htx_sl *sl;
|
|
struct buffer htx_buf = BUF_NULL;
|
|
struct ist path;
|
|
char *ptr = b_head(b);
|
|
size_t data = b_data(b);
|
|
|
|
/* hq-interop parser does not support buffer wrapping. */
|
|
BUG_ON(b_data(b) != b_contig_data(b, 0));
|
|
|
|
/* hq-interop parser is only done once full message is received. */
|
|
if (!fin)
|
|
return 0;
|
|
|
|
b_alloc(&htx_buf);
|
|
htx = htx_from_buf(&htx_buf);
|
|
|
|
/* skip method */
|
|
while (data && HTTP_IS_TOKEN(*ptr)) {
|
|
ptr++;
|
|
data--;
|
|
}
|
|
|
|
if (!data || !HTTP_IS_SPHT(*ptr)) {
|
|
fprintf(stderr, "truncated stream\n");
|
|
return -1;
|
|
}
|
|
|
|
ptr++;
|
|
if (!--data) {
|
|
fprintf(stderr, "truncated stream\n");
|
|
return -1;
|
|
}
|
|
|
|
if (HTTP_IS_LWS(*ptr)) {
|
|
fprintf(stderr, "malformed stream\n");
|
|
return -1;
|
|
}
|
|
|
|
/* extract path */
|
|
path.ptr = ptr;
|
|
while (data && !HTTP_IS_LWS(*ptr)) {
|
|
ptr++;
|
|
data--;
|
|
}
|
|
|
|
if (!data) {
|
|
fprintf(stderr, "truncated stream\n");
|
|
return -1;
|
|
}
|
|
|
|
path.len = ptr - path.ptr;
|
|
|
|
sl = htx_add_stline(htx, HTX_BLK_REQ_SL, 0, ist("GET"), path, ist("HTTP/1.0"));
|
|
if (!sl)
|
|
return -1;
|
|
|
|
sl->flags |= HTX_SL_F_BODYLESS;
|
|
sl->info.req.meth = find_http_meth("GET", 3);
|
|
|
|
htx_add_endof(htx, HTX_BLK_EOH);
|
|
htx->flags |= HTX_FL_EOM;
|
|
htx_to_buf(htx, &htx_buf);
|
|
|
|
if (!qcs_attach_sc(qcs, &htx_buf, fin))
|
|
return -1;
|
|
|
|
b_free(&htx_buf);
|
|
|
|
return b_data(b);
|
|
}
|
|
|
|
static size_t hq_interop_snd_buf(struct qcs *qcs, struct buffer *buf,
|
|
size_t count)
|
|
{
|
|
enum htx_blk_type btype;
|
|
struct htx *htx = NULL;
|
|
struct htx_blk *blk;
|
|
int32_t idx;
|
|
uint32_t bsize, fsize;
|
|
struct buffer *res = NULL;
|
|
size_t total = 0;
|
|
|
|
htx = htx_from_buf(buf);
|
|
|
|
while (count && !htx_is_empty(htx) && qcc_stream_can_send(qcs)) {
|
|
/* Not implemented : QUIC on backend side */
|
|
idx = htx_get_head(htx);
|
|
blk = htx_get_blk(htx, idx);
|
|
btype = htx_get_blk_type(blk);
|
|
fsize = bsize = htx_get_blksz(blk);
|
|
|
|
BUG_ON(btype == HTX_BLK_REQ_SL);
|
|
|
|
switch (btype) {
|
|
case HTX_BLK_DATA:
|
|
res = qcc_get_stream_txbuf(qcs);
|
|
if (!res) {
|
|
/* TODO */
|
|
ABORT_NOW();
|
|
}
|
|
|
|
if (unlikely(fsize == count &&
|
|
!b_data(res) &&
|
|
htx_nbblks(htx) == 1 && btype == HTX_BLK_DATA)) {
|
|
void *old_area = res->area;
|
|
|
|
TRACE_DATA("perform zero-copy DATA transfer", QMUX_EV_STRM_SEND,
|
|
qcs->qcc->conn, qcs);
|
|
|
|
/* remap MUX buffer to HTX area */
|
|
*res = b_make(buf->area, buf->size,
|
|
sizeof(struct htx) + blk->addr, fsize);
|
|
|
|
/* assign old MUX area to HTX buffer. */
|
|
buf->area = old_area;
|
|
buf->data = buf->head = 0;
|
|
total += fsize;
|
|
|
|
/* reload HTX with empty buffer. */
|
|
*htx = *htx_from_buf(buf);
|
|
goto end;
|
|
}
|
|
|
|
if (fsize > count)
|
|
fsize = count;
|
|
|
|
if (b_contig_space(res) < fsize)
|
|
fsize = b_contig_space(res);
|
|
|
|
if (!fsize) {
|
|
/* Release buf and restart parsing if sending still possible. */
|
|
qcc_release_stream_txbuf(qcs);
|
|
continue;
|
|
}
|
|
|
|
b_putblk(res, htx_get_blk_ptr(htx, blk), fsize);
|
|
total += fsize;
|
|
count -= fsize;
|
|
|
|
if (fsize == bsize)
|
|
htx_remove_blk(htx, blk);
|
|
else
|
|
htx_cut_data_blk(htx, blk, fsize);
|
|
break;
|
|
|
|
/* only body is transferred on HTTP/0.9 */
|
|
case HTX_BLK_RES_SL:
|
|
case HTX_BLK_TLR:
|
|
case HTX_BLK_EOT:
|
|
default:
|
|
htx_remove_blk(htx, blk);
|
|
total += bsize;
|
|
count -= bsize;
|
|
break;
|
|
}
|
|
}
|
|
|
|
end:
|
|
htx_to_buf(htx, buf);
|
|
|
|
return total;
|
|
}
|
|
|
|
static size_t hq_interop_nego_ff(struct qcs *qcs, size_t count)
|
|
{
|
|
int ret = 0;
|
|
struct buffer *res;
|
|
|
|
start:
|
|
res = qcc_get_stream_txbuf(qcs);
|
|
if (!res) {
|
|
qcs->sd->iobuf.flags |= IOBUF_FL_FF_BLOCKED;
|
|
goto end;
|
|
/* TODO */
|
|
ABORT_NOW();
|
|
}
|
|
|
|
if (!b_room(res)) {
|
|
if (qcc_release_stream_txbuf(qcs)) {
|
|
qcs->sd->iobuf.flags |= IOBUF_FL_FF_BLOCKED;
|
|
goto end;
|
|
}
|
|
|
|
goto start;
|
|
}
|
|
|
|
/* No header required for HTTP/0.9, no need to reserve an offset. */
|
|
qcs->sd->iobuf.buf = res;
|
|
qcs->sd->iobuf.offset = 0;
|
|
qcs->sd->iobuf.data = 0;
|
|
|
|
ret = MIN(count, b_contig_space(res));
|
|
end:
|
|
return ret;
|
|
}
|
|
|
|
static size_t hq_interop_done_ff(struct qcs *qcs)
|
|
{
|
|
const size_t ret = qcs->sd->iobuf.data;
|
|
|
|
/* No header required for HTTP/0.9, simply mark ff as done. */
|
|
qcs->sd->iobuf.buf = NULL;
|
|
qcs->sd->iobuf.offset = 0;
|
|
qcs->sd->iobuf.data = 0;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int hq_interop_attach(struct qcs *qcs, void *conn_ctx)
|
|
{
|
|
qcs_wait_http_req(qcs);
|
|
return 0;
|
|
}
|
|
|
|
const struct qcc_app_ops hq_interop_ops = {
|
|
.rcv_buf = hq_interop_rcv_buf,
|
|
.snd_buf = hq_interop_snd_buf,
|
|
.nego_ff = hq_interop_nego_ff,
|
|
.done_ff = hq_interop_done_ff,
|
|
.attach = hq_interop_attach,
|
|
};
|