mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: pattern: Each pattern expression element store the reference struct.

Browse Source 
Now, each pattern entry known the original "struct pat_ref_elt" from
that was built. This patch permit to delete each pattern entry without
confusion. After this patch, each reference can use his pointer to be
targeted.
This commit is contained in:
Thierry FOURNIER 2014-01-28 15:54:36 +01:00 committed by Willy Tarreau
parent 0d6ba513a5
commit 6bb53ff164
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/pattern.h
View File

@ -125,6 +125,7 @@ struct pat_time {
*/ */
struct pattern_tree { struct pattern_tree {
struct sample_storage *smp; struct sample_storage *smp;
struct pat_ref_elt *ref;
struct ebmb_node node; struct ebmb_node node;
}; };
@ -164,7 +165,7 @@ struct pattern {
int flags; /* expr or pattern flags. */ int flags; /* expr or pattern flags. */
struct sample_storage *smp; /* used to store a pointer to sample value associated struct sample_storage *smp; /* used to store a pointer to sample value associated
with the match. It is used with maps */ with the match. It is used with maps */
struct pat_ref_elt *ref;
}; };
/* This struct is just used for chaining patterns */ /* This struct is just used for chaining patterns */

10
src/pattern.c
View File

@ -478,6 +478,7 @@ struct pattern *pat_match_str(struct sample *smp, struct pattern_expr *expr, int
if (fill) { if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node); elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp; static_pattern.smp = elt->smp;
static_pattern.ref = elt->ref;
static_pattern.flags = PAT_F_TREE; static_pattern.flags = PAT_F_TREE;
static_pattern.type = SMP_T_STR; static_pattern.type = SMP_T_STR;
static_pattern.ptr.str = (char *)elt->node.key; static_pattern.ptr.str = (char *)elt->node.key;
@ -764,6 +765,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (fill) { if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node); elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp; static_pattern.smp = elt->smp;
static_pattern.ref = elt->ref;
static_pattern.flags = PAT_F_TREE; static_pattern.flags = PAT_F_TREE;
static_pattern.type = SMP_T_IPV4; static_pattern.type = SMP_T_IPV4;
memcpy(&static_pattern.val.ipv4.addr.s_addr, elt->node.key, 4); memcpy(&static_pattern.val.ipv4.addr.s_addr, elt->node.key, 4);
@ -785,6 +787,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (fill) { if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node); elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp; static_pattern.smp = elt->smp;
static_pattern.ref = elt->ref;
static_pattern.flags = PAT_F_TREE; static_pattern.flags = PAT_F_TREE;
static_pattern.type = SMP_T_IPV6; static_pattern.type = SMP_T_IPV6;
memcpy(&static_pattern.val.ipv6.addr, elt->node.key, 16); memcpy(&static_pattern.val.ipv6.addr, elt->node.key, 16);
@ -804,6 +807,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (fill) { if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node); elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp; static_pattern.smp = elt->smp;
static_pattern.ref = elt->ref;
static_pattern.flags = PAT_F_TREE; static_pattern.flags = PAT_F_TREE;
static_pattern.type = SMP_T_IPV6; static_pattern.type = SMP_T_IPV6;
memcpy(&static_pattern.val.ipv6.addr, elt->node.key, 16); memcpy(&static_pattern.val.ipv6.addr, elt->node.key, 16);
@ -837,6 +841,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (fill) { if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node); elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp; static_pattern.smp = elt->smp;
static_pattern.ref = elt->ref;
static_pattern.flags = PAT_F_TREE; static_pattern.flags = PAT_F_TREE;
static_pattern.type = SMP_T_IPV4; static_pattern.type = SMP_T_IPV4;
memcpy(&static_pattern.val.ipv4.addr.s_addr, elt->node.key, 4); memcpy(&static_pattern.val.ipv4.addr.s_addr, elt->node.key, 4);
@ -1087,6 +1092,7 @@ int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
/* copy the pointer to sample associated to this node */ /* copy the pointer to sample associated to this node */
node->smp = pat->smp; node->smp = pat->smp;
node->ref = pat->ref;
/* FIXME: insert <addr>/<mask> into the tree here */ /* FIXME: insert <addr>/<mask> into the tree here */
memcpy(node->node.key, &pat->val.ipv4.addr, 4); /* network byte order */ memcpy(node->node.key, &pat->val.ipv4.addr, 4); /* network byte order */
@ -1112,6 +1118,7 @@ int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
/* copy the pointer to sample associated to this node */ /* copy the pointer to sample associated to this node */
node->smp = pat->smp; node->smp = pat->smp;
node->ref = pat->ref;
/* FIXME: insert <addr>/<mask> into the tree here */ /* FIXME: insert <addr>/<mask> into the tree here */
memcpy(node->node.key, &pat->val.ipv6.addr, 16); /* network byte order */ memcpy(node->node.key, &pat->val.ipv6.addr, 16); /* network byte order */
@ -1154,6 +1161,7 @@ int pat_idx_tree_str(struct pattern_expr *expr, struct pattern *pat, char **err)
/* copy the pointer to sample associated to this node */ /* copy the pointer to sample associated to this node */
node->smp = pat->smp; node->smp = pat->smp;
node->ref = pat->ref;
/* copy the string */ /* copy the string */
memcpy(node->node.key, pat->ptr.str, len); memcpy(node->node.key, pat->ptr.str, len);
@ -1819,6 +1827,7 @@ int pat_ref_push(struct pat_ref_elt *elt, struct pattern_expr *expr,
memset(&pattern, 0, sizeof(pattern)); memset(&pattern, 0, sizeof(pattern));
pattern.flags = patflags; pattern.flags = patflags;
pattern.smp = smp; pattern.smp = smp;
pattern.ref = elt;
/* parse pattern */ /* parse pattern */
if (!expr->pat_head->parse(elt->pattern, &pattern, err)) { if (!expr->pat_head->parse(elt->pattern, &pattern, err)) {
@ -2125,6 +2134,7 @@ struct pattern *pattern_exec_match(struct pattern_head *head, struct sample *smp
if (!head->match) { if (!head->match) {
if (fill) { if (fill) {
static_pattern.smp = NULL; static_pattern.smp = NULL;
static_pattern.ref = NULL;
static_pattern.flags = 0; static_pattern.flags = 0;
static_pattern.type = SMP_T_UINT; static_pattern.type = SMP_T_UINT;
static_pattern.val.i = 1; static_pattern.val.i = 1;