mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: tcpheck: the source list must be a const in dup_tcpcheck_var()

Browse Source 
This is just an API bug but it's annoying when trying to tidy the code.
The source list passed in argument must be a const and not a variable,
as it's typically the list head from a default proxy and must obviously
not be modified by the function. No backport is needed as it only impacts
new code.
This commit is contained in:
Willy Tarreau 2021-02-12 08:42:30 +01:00
parent 016255a483
commit 09f2e77eb1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/tcpcheck.h
View File

@ -47,7 +47,7 @@ void deinit_proxy_tcpcheck(struct proxy *px);
struct tcpcheck_var *create_tcpcheck_var(const struct ist name); struct tcpcheck_var *create_tcpcheck_var(const struct ist name);
void free_tcpcheck_var(struct tcpcheck_var *var); void free_tcpcheck_var(struct tcpcheck_var *var);
int dup_tcpcheck_vars(struct list *dst, struct list *src); int dup_tcpcheck_vars(struct list *dst, const struct list *src);
void free_tcpcheck_vars(struct list *vars); void free_tcpcheck_vars(struct list *vars);
int add_tcpcheck_expect_str(struct tcpcheck_rules *rules, const char *str); int add_tcpcheck_expect_str(struct tcpcheck_rules *rules, const char *str);

5
src/tcpcheck.c
View File

@ -254,9 +254,10 @@ void free_tcpcheck_vars(struct list *vars)
} }
/* Duplicate a list of preset tcp-check variables */ /* Duplicate a list of preset tcp-check variables */
int dup_tcpcheck_vars(struct list *dst, struct list *src) int dup_tcpcheck_vars(struct list *dst, const struct list *src)
{ {
struct tcpcheck_var *var, *new = NULL; const struct tcpcheck_var *var;
struct tcpcheck_var *new = NULL;
list_for_each_entry(var, src, list) { list_for_each_entry(var, src, list) {
new = create_tcpcheck_var(var->name); new = create_tcpcheck_var(var->name);