MINOR: quic: register QMux transport parameter as an extra frame

Use the newly introduced infrastructure for extra QUIC frames definition
for QMux usage. This only concerns the frame used for transport
parameters exchange.

This allows to remove specific code in qf_parser()/qf_builder() helper
functions.

Author: a-denoyelle

include/haproxy/quic_frame-t.h

@@ -81,13 +81,6 @@ enum quic_frame_type {
 	QUIC_FT_MAX
 };
 
-/* Extra frame types larger than QUIC_FT_MAX should be declared here.
- * For every new value, an associated builder and parser instances should be
- * defined in quic_frame.c. Do not forget to complete the associated function
- * quic_frame_type_is_known() and both qf_builder()/qf_parser().
- */
-extern const uint64_t QUIC_FT_QX_TRANSPORT_PARAMETERS;
-
 #define QUIC_FT_PKT_TYPE_I_BITMASK (1 << QUIC_PACKET_TYPE_INITIAL)
 #define QUIC_FT_PKT_TYPE_0_BITMASK (1 << QUIC_PACKET_TYPE_0RTT)
 #define QUIC_FT_PKT_TYPE_H_BITMASK (1 << QUIC_PACKET_TYPE_HANDSHAKE)

include/haproxy/quic_frame.h

@@ -35,6 +35,9 @@
 #define QF_PROTO_QUIC 0x01
 #define QF_PROTO_QMUX 0x02
 
+/* quic-on-streams transport parameters frame. */
+#define QUIC_FT_QX_TRANSPORT_PARAMETERS 0x3f5153300d0a0d0a
+
 const char *quic_frame_type_string(enum quic_frame_type ft);
 
 void quic_register_extra_frame(uint64_t type,

src/quic_frame.c

@@ -1155,17 +1155,16 @@ const struct quic_frame_parser quic_frame_parsers[] = {
 	[QUIC_FT_HANDSHAKE_DONE]       = { .func = quic_parse_handshake_done_frame,       .proto = QF_PROTO_QUIC,               .flags = QUIC_FL_RX_PACKET_ACK_ELICITING, .mask = QUIC_FT_PKT_TYPE____1_BITMASK, },
 };
 
-/* quic-on-streams transport parameters frame. */
-const uint64_t QUIC_FT_QX_TRANSPORT_PARAMETERS = 0x3f5153300d0a0d0a;
-const struct quic_frame_parser qf_parser_qx_transport_parameters = {
-	.func  = quic_parse_qmux_transport_parameters,
-	.proto = QF_PROTO_QMUX,
+static const struct quic_frame_builder qf_builder_qx_transport_parameters = {
+	.func  = quic_build_qmux_transport_parameters,
 	.mask  = 0,
 	.flags = 0,
 };
-const struct quic_frame_builder qf_builder_qx_transport_parameters = {
-	.func = quic_build_qmux_transport_parameters,
-	.mask = 0,
+
+static const struct quic_frame_parser qf_parser_qx_transport_parameters = {
+	.func  = quic_parse_qmux_transport_parameters,
+	.proto = QF_PROTO_QMUX,
+	.mask  = 0,
 	.flags = 0,
 };
 
@@ -1181,17 +1180,22 @@ void quic_register_extra_frame(uint64_t type,
 	LIST_APPEND(&quic_extra_frame_handlers.list, &handler->list);
 }
 
+static struct quic_extra_frame_handler qf_handler_qx_transport_parameters = {
+	.builder = qf_builder_qx_transport_parameters,
+	.parser = qf_parser_qx_transport_parameters,
+};
+
+INITCALL2(STG_REGISTER, quic_register_extra_frame,
+          QUIC_FT_QX_TRANSPORT_PARAMETERS,
+          &qf_handler_qx_transport_parameters);
+
 static const struct quic_frame_parser *qf_parser(uint64_t type)
 {
 	const struct quic_extra_frame_handler *frm_handler;
 
 	if (type < QUIC_FT_MAX)
 		return &quic_frame_parsers[type];
 
-	/* Complete here for extra frame types greater than QUIC_FT_MAX. */
-	if (type == QUIC_FT_QX_TRANSPORT_PARAMETERS)
-		return &qf_parser_qx_transport_parameters;
-
 	list_for_each_entry(frm_handler, &quic_extra_frame_handlers.list, list) {
 		if (frm_handler->type == type)
 			return &frm_handler->parser;
@@ -1226,10 +1230,6 @@ const struct quic_frame_builder *qf_builder(uint64_t type)
 	if (type < QUIC_FT_MAX)
 		return &quic_frame_builders[type];
 
-	/* Complete here for extra frame types greater than QUIC_FT_MAX. */
-	if (type == QUIC_FT_QX_TRANSPORT_PARAMETERS)
-		return &qf_builder_qx_transport_parameters;
-
 	list_for_each_entry(frm_handler, &quic_extra_frame_handlers.list, list) {
 		if (frm_handler->type == type)
 			return &frm_handler->builder;