mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: remove references to burst in quic-cc-algo parsing

Browse Source 
Pacing activation configuration has been recently revamped. Previously,
pacing related quic-cc-algo argument was used to specify a burst size.
It evolved into a boolean value as burst size is dynamically calculated
now. As such, removes any references to the old burst value in config
parsing code for cleaner code.

This should be backported up to 3.1, after a period of observation.
This commit is contained in:
Amaury Denoyelle 2025-01-30 11:57:55 +01:00
parent bd7a688b8b
commit 6acf391e89
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cfgparse-quic.c
View File

@ -70,27 +70,27 @@ static unsigned long parse_window_size(const char *kw, char *value,
return 0;
}
/* Parse <value> as a number of datagrams allowed for burst.
/* Parse <value> as pacing argument.
*
* Returns the parsed value or a negative error code.
*/
static int parse_burst(const char *kw, char *value, char **end_opt, char **err)
static int parse_pacing(const char *kw, char *value, char **end_opt, char **err)
{
int burst;
int pacing;
errno = 0;
burst = strtoul(value, end_opt, 0);
pacing = strtoul(value, end_opt, 0);
if (*end_opt == value || errno != 0) {
memprintf(err, "'%s' : could not parse burst value", kw);
memprintf(err, "'%s' : could not parse pacing value", kw);
goto fail;
}
if (burst < 0 || burst > 1024) {
memprintf(err, "'%s' : pacing burst value must be between 0 and 1024", kw);
if (!pacing) {
memprintf(err, "'%s' : pacing value cannot be negative", kw);
goto fail;
}
return burst;
return pacing;
fail:
return -1;
@ -187,15 +187,15 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
goto out;
if (*arg != ',') {
int burst = parse_burst(args[cur_arg], arg, &end_opt, err);
if (burst < 0)
int pacing = parse_pacing(args[cur_arg], arg, &end_opt, err);
if (pacing < 0)
goto fail;
if (!(cc_algo->flags & QUIC_CC_ALGO_FL_OPT_PACING)) {
ha_warning("'%s' : burst parameter ignored for '%s' congestion algorithm\n",
ha_warning("'%s' : pacing parameter ignored for '%s' congestion algorithm\n",
args[cur_arg], algo);
}
else if (burst) {
else if (pacing) {
if (!experimental_directives_allowed) {
memprintf(err, "'%s' : support for pacing is experimental, must be allowed via a global "
"'expose-experimental-directives'\n", args[cur_arg]);
@ -209,7 +209,7 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
goto out;
}
else if (*end_opt != ',') {
memprintf(err, "'%s' : cannot parse burst argument for '%s' algorithm", args[cur_arg], algo);
memprintf(err, "'%s' : cannot parse pacing argument for '%s' algorithm", args[cur_arg], algo);
goto fail;
}
arg = end_opt;