RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-11 14:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: acl: Extract the pattern matching function

Browse Source 
The map feature will need to match acl patterns. This patch extracts
the matching function from the global ACL function "acl_exec_cond".

The code was only moved to its own function, no functional changes were made.
This commit is contained in:
Thierry FOURNIER 2013-11-22 18:03:42 +01:00 committed by Willy Tarreau
parent 3a103c5a6b
commit 29d47b87c4
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/proto/acl.h
View File

@ -138,6 +138,11 @@ int acl_find_targets(struct proxy *p);
*/
struct acl *find_acl_by_name(const char *name, struct list *head);
/* This function execute the match part of the acl.
* it return ACL_PAT_FAIL, ACL_PAT_MISS or ACL_PAT_PASS
*/
inline int acl_exec_match(struct acl_expr *expr, struct sample *smp);
/*
* Registers the ACL keyword list <kwl> as a list of valid keywords for next
* parsing sessions.

66
src/acl.c
View File

@ -1834,6 +1834,44 @@ struct acl_cond *build_acl_cond(const char *file, int line, struct proxy *px, co
return cond;
}
/* This function execute the match part of the acl.
* it return ACL_PAT_FAIL, ACL_PAT_MISS or ACL_PAT_PASS
*/
inline int acl_exec_match(struct acl_expr *expr, struct sample *smp)
{
int acl_res = ACL_PAT_FAIL;
struct acl_pattern *pattern;
if (expr->match == acl_match_nothing) {
if (smp->data.uint)
acl_res |= ACL_PAT_PASS;
else
acl_res |= ACL_PAT_FAIL;
}
else if (!expr->match) {
/* just check for existence */
acl_res |= ACL_PAT_PASS;
}
else {
if (!eb_is_empty(&expr->pattern_tree)) {
/* a tree is present, let's check what type it is */
if (expr->match == acl_match_str)
acl_res |= acl_lookup_str(smp, expr) ? ACL_PAT_PASS : ACL_PAT_FAIL;
else if (expr->match == acl_match_ip)
acl_res |= acl_lookup_ip(smp, expr) ? ACL_PAT_PASS : ACL_PAT_FAIL;
}
/* call the match() function for all tests on this value */
list_for_each_entry(pattern, &expr->patterns, list) {
if (acl_res == ACL_PAT_PASS)
break;
acl_res |= expr->match(smp, pattern);
}
}
return acl_res;
}
/* Execute condition <cond> and return either ACL_PAT_FAIL, ACL_PAT_MISS or
* ACL_PAT_PASS depending on the test results. ACL_PAT_MISS may only be
* returned if <opt> does not contain SMP_OPT_FINAL, indicating that incomplete
@ -1855,7 +1893,6 @@ int acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct session *l4, v
struct acl_term *term;
struct acl_expr *expr;
struct acl *acl;
struct acl_pattern *pattern;
struct sample smp;
int acl_res, suite_res, cond_res;
@ -1900,32 +1937,7 @@ int acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct session *l4, v
continue;
}
if (expr->match == acl_match_nothing) {
if (smp.data.uint)
acl_res |= ACL_PAT_PASS;
else
acl_res |= ACL_PAT_FAIL;
}
else if (!expr->match) {
/* just check for existence */
acl_res |= ACL_PAT_PASS;
}
else {
if (!eb_is_empty(&expr->pattern_tree)) {
/* a tree is present, let's check what type it is */
if (expr->match == acl_match_str)
acl_res |= acl_lookup_str(&smp, expr) ? ACL_PAT_PASS : ACL_PAT_FAIL;
else if (expr->match == acl_match_ip)
acl_res |= acl_lookup_ip(&smp, expr) ? ACL_PAT_PASS : ACL_PAT_FAIL;
}
/* call the match() function for all tests on this value */
list_for_each_entry(pattern, &expr->patterns, list) {
if (acl_res == ACL_PAT_PASS)
break;
acl_res |= expr->match(&smp, pattern);
}
}
acl_res |= acl_exec_match(expr, &smp);
/*
* OK now acl_res holds the result of this expression
* as one of ACL_PAT_FAIL, ACL_PAT_MISS or ACL_PAT_PASS.