RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-31 23:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: pattern/map: Maps can returns various types

Browse Source 
A map can store and return various types as output. The only one example is the
IPv4 and IPv6 types. The previous patch remove the type from the sample storage
struct and use the conoverter output type, expecting that all entries of the
map have the same type.

This will be wrong when the maps will support both IPv4 and IPv6 as output.
This commit is contained in:
Thierry FOURNIER 2015-08-19 09:05:25 +02:00 committed by Willy Tarreau
parent 5cc18d46f3
commit 7d4335c935
2 changed files with 1 additions and 7 deletions
include/types
applet.h
src
dumpstats.c

1
include/types/applet.h
View File

@ -95,7 +95,6 @@ struct appctx {
unsigned int display_flags;
struct pat_ref *ref;
struct pat_ref_elt *elt;
struct map_descriptor *desc;
struct pattern_expr *expr;
struct chunk chunk;
} map;

7
src/dumpstats.c
View File

@ -5619,11 +5619,6 @@ static int stats_map_lookup(struct stream_interface *si)
appctx->ctx.map.expr = LIST_ELEM(&appctx->ctx.map.ref->pat, struct pattern_expr *, list);
appctx->ctx.map.expr = pat_expr_get_next(appctx->ctx.map.expr, &appctx->ctx.map.ref->pat);
appctx->st2 = STAT_ST_LIST;
/* retrieve one of the compatible map descriptor for learnig the type. */
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
appctx->ctx.map.desc = container_of(appctx->ctx.map.expr->pat_head,
struct map_descriptor, pat);
/* fall through */
case STAT_ST_LIST:
@ -5698,7 +5693,7 @@ static int stats_map_lookup(struct stream_interface *si)
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (pat->data && pat->ref && pat->ref->sample)
chunk_appendf(&trash, ", value=\"%s\", type=\"%s\"", pat->ref->sample,
smp_to_type[appctx->ctx.map.desc->conv->out_type]);
smp_to_type[pat->data->type]);
else
chunk_appendf(&trash, ", value=none");
}