MEDIUM: pattern: rename "acl" prefix to "pat"
This patch just renames functions, types and enums. No code was changed.
A significant number of files were touched, especially the ACL arrays,
so it is likely that some external patches will not apply anymore.
One important thing is that we had to split ACL_PAT_* into two groups :
- ACL_TEST_{PASS|MISS|FAIL}
- PAT_{MATCH|UNMATCH}
A future patch will enforce enums on all these places to avoid confusion.
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 1a68cfd..92f1b68 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -904,11 +904,11 @@
partial = 0;
list_for_each_entry(rule, &s->be->tcp_req.inspect_rules, list) {
- int ret = ACL_PAT_PASS;
+ int ret = ACL_TEST_PASS;
if (rule->cond) {
ret = acl_exec_cond(rule->cond, s->be, s, &s->txn, SMP_OPT_DIR_REQ | partial);
- if (ret == ACL_PAT_MISS) {
+ if (ret == ACL_TEST_MISS) {
channel_dont_connect(req);
/* just set the request timeout once at the beginning of the request */
if (!tick_isset(req->analyse_exp) && s->be->tcp_req.inspect_delay)
@@ -1008,11 +1008,11 @@
partial = 0;
list_for_each_entry(rule, &s->be->tcp_rep.inspect_rules, list) {
- int ret = ACL_PAT_PASS;
+ int ret = ACL_TEST_PASS;
if (rule->cond) {
ret = acl_exec_cond(rule->cond, s->be, s, &s->txn, SMP_OPT_DIR_RES | partial);
- if (ret == ACL_PAT_MISS) {
+ if (ret == ACL_TEST_MISS) {
/* just set the analyser timeout once at the beginning of the response */
if (!tick_isset(rep->analyse_exp) && s->be->tcp_rep.inspect_delay)
rep->analyse_exp = tick_add(now_ms, s->be->tcp_rep.inspect_delay);
@@ -1078,7 +1078,7 @@
int ret;
list_for_each_entry(rule, &s->fe->tcp_req.l4_rules, list) {
- ret = ACL_PAT_PASS;
+ ret = ACL_TEST_PASS;
if (rule->cond) {
ret = acl_exec_cond(rule->cond, s->fe, s, NULL, SMP_OPT_DIR_REQ|SMP_OPT_FINAL);