From: Willy Tarreau Date: Sun, 24 Mar 2013 00:34:58 +0000 (+0100) Subject: CLEANUP: acl: remove ACL hooks which were never used X-Git-Tag: v1.5-dev18~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a96bf5a5d9cf5b87b691a489cfb0ec41dc6a779;p=thirdparty%2Fhaproxy.git CLEANUP: acl: remove ACL hooks which were never used These hooks, which established the relation between ACL_USE_* and the location where the ACL were used, were never used because they were superseded with the sample capabilities. Remove them now. --- diff --git a/include/types/acl.h b/include/types/acl.h index bb5ad0d643..68c3d78d77 100644 --- a/include/types/acl.h +++ b/include/types/acl.h @@ -147,27 +147,6 @@ enum { ACL_USE_RTR_ANY = (ACL_USE_L6RTR_ANY | ACL_USE_L7RTR_ANY | ACL_USE_RTR_INTERNAL), }; -/* filtering hooks */ -enum { - /* hooks on the request path */ - ACL_HOOK_REQ_FE_TCP = 0, - ACL_HOOK_REQ_FE_TCP_CONTENT, - ACL_HOOK_REQ_FE_HTTP_IN, - ACL_HOOK_REQ_FE_SWITCH, - ACL_HOOK_REQ_BE_TCP_CONTENT, - ACL_HOOK_REQ_BE_HTTP_IN, - ACL_HOOK_REQ_BE_SWITCH, - ACL_HOOK_REQ_FE_HTTP_OUT, - ACL_HOOK_REQ_BE_HTTP_OUT, - /* hooks on the response path */ - ACL_HOOK_RTR_BE_TCP_CONTENT, - ACL_HOOK_RTR_BE_HTTP_IN, - ACL_HOOK_RTR_FE_TCP_CONTENT, - ACL_HOOK_RTR_FE_HTTP_IN, - ACL_HOOK_RTR_BE_HTTP_OUT, - ACL_HOOK_RTR_FE_HTTP_OUT, -}; - /* How to store a time range and the valid days in 29 bits */ struct acl_time { int dow:7; /* 1 bit per day of week: 0-6 */ diff --git a/src/acl.c b/src/acl.c index 2e23e30c39..2b3bbd5474 100644 --- a/src/acl.c +++ b/src/acl.c @@ -32,28 +32,6 @@ #include -/* The capabilities of filtering hooks describe the type of information - * available to each of them. - */ -const unsigned int filt_cap[] = { - [ACL_HOOK_REQ_FE_TCP] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY, - [ACL_HOOK_REQ_FE_TCP_CONTENT] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY, - [ACL_HOOK_REQ_FE_HTTP_IN] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_FE_SWITCH] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_BE_TCP_CONTENT] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_BE_HTTP_IN] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_BE_SWITCH] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_FE_HTTP_OUT] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - [ACL_HOOK_REQ_BE_HTTP_OUT] = ACL_USE_TCP4_ANY|ACL_USE_TCP6_ANY|ACL_USE_TCP_ANY|ACL_USE_L6REQ_ANY|ACL_USE_L7REQ_ANY|ACL_USE_HDR_ANY, - - [ACL_HOOK_RTR_BE_TCP_CONTENT] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY, - [ACL_HOOK_RTR_BE_HTTP_IN] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY|ACL_USE_L7RTR_ANY, - [ACL_HOOK_RTR_FE_TCP_CONTENT] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY|ACL_USE_L7RTR_ANY, - [ACL_HOOK_RTR_FE_HTTP_IN] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY|ACL_USE_L7RTR_ANY, - [ACL_HOOK_RTR_BE_HTTP_OUT] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY|ACL_USE_L7RTR_ANY, - [ACL_HOOK_RTR_FE_HTTP_OUT] = ACL_USE_REQ_PERMANENT|ACL_USE_REQ_CACHEABLE|ACL_USE_L6RTR_ANY|ACL_USE_L7RTR_ANY, -}; - /* List head of all known ACL keywords */ static struct acl_kw_list acl_keywords = { .list = LIST_HEAD_INIT(acl_keywords.list)