From: Thierry FOURNIER Date: Tue, 10 Dec 2013 14:05:34 +0000 (+0100) Subject: MINOR: map: export parse output sample functions X-Git-Tag: v1.5-dev20~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c0a0f940f81bdfb530ed00d0e9bcc9fb0d69a7;p=thirdparty%2Fhaproxy.git MINOR: map: export parse output sample functions This export is used to identify the parser used --- diff --git a/include/proto/map.h b/include/proto/map.h index 4dd081b9f3..907c8ca9e3 100644 --- a/include/proto/map.h +++ b/include/proto/map.h @@ -24,6 +24,12 @@ #include +/* maps output sample parser */ +int map_parse_ip(const char *text, struct sample_storage *smp); +int map_parse_ip6(const char *text, struct sample_storage *smp); +int map_parse_str(const char *text, struct sample_storage *smp); +int map_parse_int(const char *text, struct sample_storage *smp); + struct map_reference *map_get_reference(const char *reference); #endif /* _PROTO_PATTERN_H */ diff --git a/src/map.c b/src/map.c index b1fa7f672d..28908c534f 100644 --- a/src/map.c +++ b/src/map.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -39,7 +40,7 @@ struct map_reference *map_get_reference(const char *reference) /* Parse an IPv4 address and store it into the sample. * The output type is IPV4. */ -static int map_parse_ip(const char *text, struct sample_storage *smp) +int map_parse_ip(const char *text, struct sample_storage *smp) { if (!buf2ip(text, strlen(text), &smp->data.ipv4)) return 0; @@ -50,7 +51,7 @@ static int map_parse_ip(const char *text, struct sample_storage *smp) /* Parse an IPv6 address and store it into the sample. * The output type is IPV6. */ -static int map_parse_ip6(const char *text, struct sample_storage *smp) +int map_parse_ip6(const char *text, struct sample_storage *smp) { if (!buf2ip6(text, strlen(text), &smp->data.ipv6)) return 0; @@ -62,7 +63,7 @@ static int map_parse_ip6(const char *text, struct sample_storage *smp) * string must be left in memory because we return a direct memory reference. * The output type is CSTR. */ -static int map_parse_str(const char *text, struct sample_storage *smp) +int map_parse_str(const char *text, struct sample_storage *smp) { /* The loose of the "const" is balanced by the SMP_T_CSTR type */ smp->data.str.str = (char *)text; @@ -76,7 +77,7 @@ static int map_parse_str(const char *text, struct sample_storage *smp) * number is negative, or UINT if it is positive or null. The function returns * zero (error) if the number is too large. */ -static int map_parse_int(const char *text, struct sample_storage *smp) +int map_parse_int(const char *text, struct sample_storage *smp) { long long int value; char *error;