upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MINOR: quic: abstract stream type in qf_stream frame

Browse source 
STREAM frame will also be used by the new QMux protocol. This requires
some adaptation in the qf_stream structure. Reference to qc_stream_desc
object is replaced by a generic void* pointer.

This change is necessary as QMux protocol will not use any
qc_stream_desc elements for emission.
This commit is contained in:
Amaury Denoyelle 2025-12-10 10:43:36 +01:00
parent ce4aab4fdb
commit f16c851625
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/haproxy/quic_frame-t.h
View file

@ -32,7 +32,6 @@
#include <import/ebtree-t.h>
#include <haproxy/buf-t.h>
#include <haproxy/list.h>
#include <haproxy/quic_stream-t.h>
#include <haproxy/quic_token.h>
extern struct pool_head *pool_head_quic_frame;
@ -170,7 +169,7 @@ struct qf_new_token {
struct qf_stream {
uint64_t id;
struct qc_stream_desc *stream;
void *stream;
/* used only on TX when constructing frames.
* Data cleared when processing ACK related to this STREAM frame.

3
src/mux_quic.c
View file

@ -2499,7 +2499,8 @@ static int qcs_build_stream_frm(struct qcs *qcs, struct buffer *out, char fin,
goto err;
}
frm->stream.stream = qcs->tx.stream;
frm->stream.stream =
conn_is_quic(qcc->conn) ? (void *)qcs->tx.stream : (void *)qcs;
frm->stream.id = qcs->id;
frm->stream.offset = 0;
frm->stream.dup = 0;