MAJOR: acl: remove the arg_mask from the ACL definition and use the sample fetch's
Now that ACLs solely rely on sample fetch functions, make them use the
same arg mask. All inconsistencies have been fixed separately prior to
this patch, so this patch almost only adds a new pointer indirection
and removes all references to ARG*() in the definitions.
The parsing is still performed by the ACL code though.
diff --git a/src/session.c b/src/session.c
index c0d8da5..0a2d0b2 100644
--- a/src/session.c
+++ b/src/session.c
@@ -3613,59 +3613,59 @@
* Please take care of keeping this list alphabetically sorted.
*/
static struct acl_kw_list acl_kws = {{ },{
- { "sc1_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, 0 },
- { "sc1_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, 0 },
- { "sc1_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc1_trackers", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, 0 },
- { "sc2_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, 0 },
- { "sc2_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "sc2_trackers", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, 0 },
- { "src_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "src_updt_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE, ARG1(1,TAB) },
- { "table_avl", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, ARG1(1,TAB) },
- { "table_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING, ARG1(1,TAB) },
+ { "sc1_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "sc1_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "sc1_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc1_trackers", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "sc2_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "sc2_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "sc2_trackers", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "src_bytes_in_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_bytes_out_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_clr_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_conn_cur", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_conn_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_get_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_http_err_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_http_err_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_http_req_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_http_req_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_inc_gpc0", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_kbytes_in", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_kbytes_out", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_sess_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_sess_rate", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "src_updt_conn_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_TCP4_VOLATILE },
+ { "table_avl", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
+ { "table_cnt", NULL, acl_parse_int, acl_match_int, ACL_USE_NOTHING },
{ /* END */ },
}};