From: Aurelien DARRAGON Date: Fri, 26 May 2023 15:07:40 +0000 (+0200) Subject: MINOR: sample: fix ipmask sample definition X-Git-Tag: v2.9-dev2~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67544fdd1c563d10329db6195cb9981fc0ea3a77;p=thirdparty%2Fhaproxy.git MINOR: sample: fix ipmask sample definition Since 1478aa7 ("MEDIUM: sample: Add IPv6 support to the ipmask converter") ipmask converter may return IPV6 as well, so the sample definition must be updated. (the output type is currently explicited to IPV4) This has no functional impact: one visible effect will be that converter's visible output type will change from "ipv4" to "addr" when using 'haproxy -dKcnv'. --- diff --git a/src/sample.c b/src/sample.c index 48f108de53..83cdb92597 100644 --- a/src/sample.c +++ b/src/sample.c @@ -4501,7 +4501,7 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, { { "be2hex", sample_conv_be2hex, ARG3(1,STR,SINT,SINT), sample_conv_be2hex_check, SMP_T_BIN, SMP_T_STR }, { "hex", sample_conv_bin2hex, 0, NULL, SMP_T_BIN, SMP_T_STR }, { "hex2i", sample_conv_hex2int, 0, NULL, SMP_T_STR, SMP_T_SINT }, - { "ipmask", sample_conv_ipmask, ARG2(1,MSK4,MSK6), NULL, SMP_T_ADDR, SMP_T_IPV4 }, + { "ipmask", sample_conv_ipmask, ARG2(1,MSK4,MSK6), NULL, SMP_T_ADDR, SMP_T_ADDR }, { "ltime", sample_conv_ltime, ARG2(1,STR,SINT), NULL, SMP_T_SINT, SMP_T_STR }, { "utime", sample_conv_utime, ARG2(1,STR,SINT), NULL, SMP_T_SINT, SMP_T_STR }, { "crc32", sample_conv_crc32, ARG1(0,SINT), NULL, SMP_T_BIN, SMP_T_SINT },