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

BUG/MINOR: quic: newreno QUIC congestion control algorithm no more available

Browse Source 
There is a typo in the statement to initialize this variable when selecting
newreno as cc algo:
      const char *newreno = "newrno";
This would have happened if #defines had be used in place of several const char *
variables harcoded values.

Take the opportunity of this patch to use #defines for all the available cc algorithms.

Must be backported to 2.9.
This commit is contained in:
Frederic Lecaille 2024-01-25 07:30:40 +01:00
parent 6b69512332
commit b9a163e7e1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cfgparse-quic.c
View File

@ -10,6 +10,10 @@
#include <haproxy/quic_cc-t.h> #include <haproxy/quic_cc-t.h>
#include <haproxy/tools.h> #include <haproxy/tools.h>
#define QUIC_CC_NEWRENO_STR "newreno"
#define QUIC_CC_CUBIC_STR "cubic"
#define QUIC_CC_NO_CC_STR "nocc"
static int bind_parse_quic_force_retry(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err) static int bind_parse_quic_force_retry(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
{ {
conf->options |= BC_O_QUIC_FORCE_RETRY; conf->options |= BC_O_QUIC_FORCE_RETRY;
@ -21,9 +25,6 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
struct bind_conf *conf, char **err) struct bind_conf *conf, char **err)
{ {
struct quic_cc_algo *cc_algo; struct quic_cc_algo *cc_algo;
const char *newreno = "newrno";
const char *cubic = "cubic";
const char *nocc = "nocc";
const char *algo = NULL; const char *algo = NULL;
char *arg; char *arg;
@ -33,19 +34,19 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
} }
arg = args[cur_arg + 1]; arg = args[cur_arg + 1];
if (strncmp(arg, newreno, strlen(newreno)) == 0) { if (strncmp(arg, QUIC_CC_NEWRENO_STR, strlen(QUIC_CC_NEWRENO_STR)) == 0) {
/* newreno */ /* newreno */
algo = newreno; algo = QUIC_CC_NEWRENO_STR;
cc_algo = &quic_cc_algo_nr; cc_algo = &quic_cc_algo_nr;
arg += strlen(newreno); arg += strlen(QUIC_CC_NEWRENO_STR);
} }
else if (strncmp(arg, cubic, strlen(cubic)) == 0) { else if (strncmp(arg, QUIC_CC_CUBIC_STR, strlen(QUIC_CC_CUBIC_STR)) == 0) {
/* cubic */ /* cubic */
algo = cubic; algo = QUIC_CC_CUBIC_STR;
cc_algo = &quic_cc_algo_cubic; cc_algo = &quic_cc_algo_cubic;
arg += strlen(cubic); arg += strlen(QUIC_CC_CUBIC_STR);
} }
else if (strncmp(arg, nocc, strlen(nocc)) == 0) { else if (strncmp(arg, QUIC_CC_NO_CC_STR, strlen(QUIC_CC_NO_CC_STR)) == 0) {
/* nocc */ /* nocc */
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 "
@ -53,9 +54,9 @@ static int bind_parse_quic_cc_algo(char **args, int cur_arg, struct proxy *px,
goto fail; goto fail;
} }
algo = nocc; algo = QUIC_CC_NO_CC_STR;
cc_algo = &quic_cc_algo_nocc; cc_algo = &quic_cc_algo_nocc;
arg += strlen(nocc); arg += strlen(QUIC_CC_NO_CC_STR);
} }
else { else {
memprintf(err, "'%s' : unknown control congestion algorithm", args[cur_arg + 1]); memprintf(err, "'%s' : unknown control congestion algorithm", args[cur_arg + 1]);