From: Emeric Brun Date: Tue, 16 Jun 2015 16:26:17 +0000 (+0200) Subject: BUG/MAJOR: sample: regression on sample cast to stick table types. X-Git-Tag: v1.6-dev2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31c56530b80c00451bc26e85f664a1ba28fc91c1;p=thirdparty%2Fhaproxy.git BUG/MAJOR: sample: regression on sample cast to stick table types. This regression was introduce by commit 9c627e84b2 (MEDIUM: sample: Add type any) New sample type 'any' was not handled in the matrix used to cast to stick-tables types. --- diff --git a/src/stick_table.c b/src/stick_table.c index 7c1e857a8b..2792960bde 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -609,7 +609,8 @@ static void *k_str2int(struct sample *smp, union stktable_key_data *kdata, size_ typedef void *(*sample_to_key_fct)(struct sample *smp, union stktable_key_data *kdata, size_t *len); static sample_to_key_fct sample_to_key[SMP_TYPES][STKTABLE_TYPES] = { /* table type: IP IPV6 INTEGER STRING BINARY */ -/* patt. type: BOOL */ { NULL, NULL, k_int2int, k_int2str, NULL }, +/* patt. type: ANY */ { k_ip2ip, k_ip2ipv6, k_int2int, k_str2str, k_str2str }, +/* BOOL */ { NULL, NULL, k_int2int, k_int2str, NULL }, /* UINT */ { k_int2ip, NULL, k_int2int, k_int2str, NULL }, /* SINT */ { k_int2ip, NULL, k_int2int, k_int2str, NULL }, /* ADDR */ { k_ip2ip, k_ip2ipv6, k_ip2int, k_ip2str, NULL },