mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-11 12:41:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: extract cc-algo parsing in a dedicated function

Browse Source 
Extract code from bind_parse_quic_cc_algo() related to pure parsing of
quic-cc-algo keyword. The objective is to be able to quickly duplicate
this option on the server line.

This may need to be backported to support QUIC congestion control
algorithm support on the server line in version 3.3.
This commit is contained in:
Amaury Denoyelle 2025-11-27 16:25:07 +01:00
parent 979588227f
commit 4f43abd731
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/cfgparse-quic.c
View File

@ -97,18 +97,23 @@ static unsigned long parse_window_size(const char *kw, char *value,
return 0; return 0;
} }
/* parse "quic-cc-algo" bind keyword */ /* Parse option 'quic-cc-algo' on bind and server lines.
static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px, *
struct bind_conf *conf, char **err) * Returns the selected algorithm or NULL on error. <max_cwnd> is used as a
* secondary output parameter, set to the maximum window size if specified.
*/
static const struct quic_cc_algo *parse_cc_algo(char **args, int cur_arg, char **err,
size_t *max_cwnd)
{ {
const struct quic_cc_algo *cc_algo; const struct quic_cc_algo *cc_algo;
const char *algo = NULL; const char *algo = NULL;
struct ist algo_ist, arg_ist; struct ist algo_ist, arg_ist;
unsigned long cwnd = 0;
char *arg; char *arg;
if (!*args[cur_arg + 1]) { if (!*args[cur_arg + 1]) {
memprintf(err, "'%s' : missing control congestion algorithm", args[cur_arg]); memprintf(err, "'%s' : missing control congestion algorithm", args[cur_arg]);
goto fail; goto err;
} }
arg = args[cur_arg + 1]; arg = args[cur_arg + 1];
@ -137,7 +142,7 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
if (!experimental_directives_allowed) { if (!experimental_directives_allowed) {
ha_alert("'%s' algo is experimental, must be allowed via a global " ha_alert("'%s' algo is experimental, must be allowed via a global "
"'expose-experimental-directives'\n", arg); "'expose-experimental-directives'\n", arg);
goto fail; goto err;
} }
algo = QUIC_CC_NO_CC_STR; algo = QUIC_CC_NO_CC_STR;
@ -147,7 +152,7 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
} }
else { else {
memprintf(err, "'%s' : unknown control congestion algorithm", args[cur_arg + 1]); memprintf(err, "'%s' : unknown control congestion algorithm", args[cur_arg + 1]);
goto fail; goto err;
} }
if (*arg++ == '(') { if (*arg++ == '(') {
@ -157,28 +162,46 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
goto out; goto out;
if (*arg != ',') { if (*arg != ',') {
unsigned long cwnd = parse_window_size(args[cur_arg], arg, &end_opt, err); cwnd = parse_window_size(args[cur_arg], arg, &end_opt, err);
if (!cwnd) if (!cwnd)
goto fail; goto err;
conf->max_cwnd = cwnd;
if (*end_opt == ')') { if (*end_opt == ')') {
goto out; goto out;
} }
else if (*end_opt != ',') { else if (*end_opt != ',') {
memprintf(err, "'%s' : cannot parse max-window argument for '%s' algorithm", args[cur_arg], algo); memprintf(err, "'%s' : cannot parse max-window argument for '%s' algorithm", args[cur_arg], algo);
goto fail; goto err;
} }
arg = end_opt; arg = end_opt;
} }
if (*++arg != ')') { if (*++arg != ')') {
memprintf(err, "'%s' : too many argument for '%s' algorithm", args[cur_arg], algo); memprintf(err, "'%s' : too many argument for '%s' algorithm", args[cur_arg], algo);
goto fail; goto err;
} }
} }
out:
if (cwnd)
*max_cwnd = cwnd;
return cc_algo;
err:
return NULL;
}
/* parse "quic-cc-algo" bind keyword */
static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
struct bind_conf *conf, char **err)
{
const struct quic_cc_algo *cc_algo = NULL;
cc_algo = parse_cc_algo(args, cur_arg, err, &conf->max_cwnd);
if (!cc_algo)
goto fail;
out: out:
conf->quic_cc_algo = cc_algo; conf->quic_cc_algo = cc_algo;
return 0; return 0;