MEDIUM: acl: remove unused tests for missing args when args are mandatory
A number of ACL fetch methods use mandatory arguments (eg: proxy names) so
it's pointless to test for the presence of this argument now.
diff --git a/src/backend.c b/src/backend.c
index b0d7c39..742e87e 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1378,7 +1378,7 @@
/************************************************************************/
/* set temp integer to the number of enabled servers on the proxy.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1386,8 +1386,7 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
+ px = expr->args->data.prx;
if (px->srv_act)
temp_pattern.data.integer = px->srv_act;
@@ -1420,7 +1419,7 @@
}
/* set temp integer to the number of enabled servers on the proxy.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1430,16 +1429,12 @@
struct server *iterator;
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
temp_pattern.data.integer = 0;
- iterator = px->srv;
- while (iterator) {
- if ((iterator->state & SRV_RUNNING) == 0) {
- iterator = iterator->next;
+
+ for (iterator = expr->args->data.prx->srv; iterator; iterator = iterator->next) {
+ if ((iterator->state & SRV_RUNNING) == 0)
continue;
- }
+
if (iterator->maxconn == 0 || iterator->maxqueue == 0) {
/* configuration is stupid */
temp_pattern.data.integer = -1;
@@ -1448,7 +1443,6 @@
temp_pattern.data.integer += (iterator->maxconn - iterator->cur_sess)
+ (iterator->maxqueue - iterator->nbpend);
- iterator = iterator->next;
}
return 1;
@@ -1480,7 +1474,7 @@
}
/* set temp integer to the number of connections per second reaching the backend.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1488,15 +1482,12 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
- temp_pattern.data.integer = read_freq_ctr(&px->be_sess_per_sec);
+ temp_pattern.data.integer = read_freq_ctr(&expr->args->data.prx->be_sess_per_sec);
return 1;
}
/* set temp integer to the number of concurrent connections on the backend.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1504,15 +1495,12 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
- temp_pattern.data.integer = px->beconn;
+ temp_pattern.data.integer = expr->args->data.prx->beconn;
return 1;
}
/* set temp integer to the total number of queued connections on the backend.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1520,10 +1508,7 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
- temp_pattern.data.integer = px->totpend;
+ temp_pattern.data.integer = expr->args->data.prx->totpend;
return 1;
}
@@ -1532,7 +1517,7 @@
* server, we return twice the total, just as if we had half a running server.
* This is more or less correct anyway, since we expect the last server to come
* back soon.
- * Accepts either 0 or 1 argument. Argument is a backend, other types will lead to
+ * Accepts exactly 1 argument. Argument is a backend, other types will lead to
* undefined behaviour.
*/
static int
@@ -1542,8 +1527,7 @@
int nbsrv;
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
+ px = expr->args->data.prx;
if (px->srv_act)
nbsrv = px->srv_act;
@@ -1568,9 +1552,7 @@
acl_fetch_srv_conn(struct proxy *px, struct session *l4, void *l7, int dir,
struct acl_expr *expr, struct acl_test *test)
{
- struct server *srv = expr->args->data.srv;
-
- temp_pattern.data.integer = srv->cur_sess;
+ temp_pattern.data.integer = expr->args->data.srv->cur_sess;
return 1;
}
diff --git a/src/frontend.c b/src/frontend.c
index 9f8c323..685b172 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -508,7 +508,7 @@
}
/* set temp integer to the number of connections per second reaching the frontend.
- * Accepts either 0 or 1 argument. Argument is a frontend, other types will cause
+ * Accepts exactly 1 argument. Argument is a frontend, other types will cause
* an undefined behaviour.
*/
static int
@@ -516,15 +516,12 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
- temp_pattern.data.integer = read_freq_ctr(&px->fe_sess_per_sec);
+ temp_pattern.data.integer = read_freq_ctr(&expr->args->data.prx->fe_sess_per_sec);
return 1;
}
/* set temp integer to the number of concurrent connections on the frontend
- * Accepts either 0 or 1 argument. Argument is a frontend, other types will cause
+ * Accepts exactly 1 argument. Argument is a frontend, other types will cause
* an undefined behaviour.
*/
static int
@@ -532,10 +529,7 @@
struct acl_expr *expr, struct acl_test *test)
{
test->flags = ACL_TEST_F_VOL_TEST;
- if (expr->args)
- px = expr->args->data.prx;
-
- temp_pattern.data.integer = px->feconn;
+ temp_pattern.data.integer = expr->args->data.prx->feconn;
return 1;
}
diff --git a/src/session.c b/src/session.c
index 9997014..e6a23a6 100644
--- a/src/session.c
+++ b/src/session.c
@@ -2347,7 +2347,7 @@
/* set temp integer to the General Purpose Counter 0 value from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_get_gpc0(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2359,9 +2359,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_get_gpc0(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2408,7 +2406,7 @@
/* Increment the General Purpose Counter 0 value from the session's source
* address in the table pointed to by expr, and return it into temp integer.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_inc_gpc0(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2420,9 +2418,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_inc_gpc0(&px->table, test, stktable_update_key(&px->table, key));
}
@@ -2470,7 +2466,7 @@
/* Clear the General Purpose Counter 0 value from the session's source address
* in the table pointed to by expr, and return its previous value into temp integer.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_clr_gpc0(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2482,9 +2478,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_clr_gpc0(&px->table, test, stktable_update_key(&px->table, key));
}
@@ -2527,7 +2521,7 @@
/* set temp integer to the cumulated number of connections from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_conn_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2539,9 +2533,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_conn_cnt(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2589,7 +2581,7 @@
/* set temp integer to the connection rate from the session's source address in the
* table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_conn_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2601,15 +2593,13 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_conn_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
/* set temp integer to the number of connections from the session's source address
* in the table pointed to by expr, after updating it.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_updt_conn_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2623,8 +2613,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
+ px = expr->args->data.prx;
if ((ts = stktable_update_key(&px->table, key)) == NULL)
/* entry does not exist and could not be created */
@@ -2679,7 +2668,7 @@
/* set temp integer to the number of concurrent connections from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_conn_cur(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2691,9 +2680,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_conn_cur(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2736,7 +2723,7 @@
/* set temp integer to the cumulated number of session from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_sess_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2748,9 +2735,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_sess_cnt(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2798,7 +2783,7 @@
/* set temp integer to the session rate from the session's source address in the
* table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_sess_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2810,9 +2795,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_sess_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2855,7 +2838,7 @@
/* set temp integer to the cumulated number of session from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_http_req_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2867,9 +2850,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_http_req_cnt(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2917,7 +2898,7 @@
/* set temp integer to the session rate from the session's source address in the
* table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_http_req_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2929,9 +2910,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_http_req_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -2974,7 +2953,7 @@
/* set temp integer to the cumulated number of session from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_http_err_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -2986,9 +2965,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_http_err_cnt(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -3036,7 +3013,7 @@
/* set temp integer to the session rate from the session's source address in the
* table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_http_err_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -3048,9 +3025,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_http_err_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -3098,7 +3073,7 @@
/* set temp integer to the number of kbytes received from the session's source
* address in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_kbytes_in(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -3110,9 +3085,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_kbytes_in(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -3162,7 +3135,7 @@
/* set temp integer to the bytes rate from clients from the session's source address
* in the table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_bytes_in_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -3174,9 +3147,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_bytes_in_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -3224,7 +3195,7 @@
/* set temp integer to the number of kbytes sent to the session's source address in
* the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_kbytes_out(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -3236,9 +3207,7 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_kbytes_out(&px->table, test, stktable_lookup_key(&px->table, key));
}
@@ -3288,7 +3257,7 @@
/* set temp integer to the bytes rate to client from the session's source address in
* the table pointed to by expr, over the configured period.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_src_bytes_out_rate(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -3300,37 +3269,30 @@
if (!key)
return 0;
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
return acl_fetch_bytes_out_rate(&px->table, test, stktable_lookup_key(&px->table, key));
}
/* set temp integer to the number of used entries in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_table_cnt(struct proxy *px, struct session *l4, void *l7, int dir,
struct acl_expr *expr, struct acl_test *test)
{
- if (expr->args)
- px = expr->args->data.prx;
-
test->flags = ACL_TEST_F_VOL_TEST;
- temp_pattern.data.integer = px->table.current;
+ temp_pattern.data.integer = expr->args->data.prx->table.current;
return 1;
}
/* set temp integer to the number of free entries in the table pointed to by expr.
- * Accepts 0 or 1 argument of type table.
+ * Accepts exactly 1 argument of type table.
*/
static int
acl_fetch_table_avl(struct proxy *px, struct session *l4, void *l7, int dir,
struct acl_expr *expr, struct acl_test *test)
{
- if (expr->args)
- px = expr->args->data.prx;
-
+ px = expr->args->data.prx;
test->flags = ACL_TEST_F_VOL_TEST;
temp_pattern.data.integer = px->table.size - px->table.current;
return 1;