mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stktable/cli: support v6tov4 and v4tov6 conversions

Browse Source 
Add a special treatment for the IPV4 and IPV6 cases in
table_process_entry_per_key() function so that input string is parsed
in best effort (STR to pseudo type ADDR): input format is first considered
over table type and then let smp_to_stkey() do the type conversion for us
when needed.

This patch heavily depends on:
- "MEDIUM: stktable/cli: simplify entry key handling"

And optionally depends on:
- 72514a44 ("MEDIUM: tools/ip: v4tov6() and v6tov4() rework")
This commit is contained in:
Aurelien DARRAGON 2023-11-08 11:35:05 +01:00 committed by Christopher Faulet
parent 0a47e6bccc
commit 8dae361f35
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/stick_table.c
View File

@ -4908,6 +4908,13 @@ static int table_process_entry_per_key(struct appctx *appctx, char **args)
switch (t->type) {
case SMP_T_IPV4:
case SMP_T_IPV6:
/* prefer input format over table type when parsing ip addresses,
* then let smp_to_stkey() do the conversion for us when needed
*/
BUG_ON(!sample_casts[key.data.type][SMP_T_ADDR]);
if (!sample_casts[key.data.type][SMP_T_ADDR](&key))
return cli_err(appctx, "Invalid key\n");
break;
case SMP_T_SINT:
case SMP_T_STR:
break;