commit 422aa0792d8a214e4d67806a5e2d66ebe7091bc1
author Willy Tarreau <w@1wt.eu> Fri Apr 20 20:49:27 2012 +0200
committer Willy Tarreau <w@1wt.eu> Tue May 08 20:57:14 2012 +0200
tree 88a1b2fc601e0ebf9b044b778736a53dcfa790fd
parent 16c31b00dcb24b54f9533fc4a4bf5b7be6c9c2be

MEDIUM: pattern: add new sample types to replace pattern types

The new sample types are necessary for the acl-pattern convergence.
These types are boolean and signed int. Some types were renamed for
less ambiguity (ip->ipv4, integer->uint).

src/backend.c

diff --git a/src/backend.c b/src/backend.c
index 742e87e..291201e 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1389,11 +1389,11 @@
 	px = expr->args->data.prx;
 
 	if (px->srv_act)
-		temp_pattern.data.integer = px->srv_act;
+		temp_pattern.data.uint = px->srv_act;
 	else if (px->lbprm.fbck)
-		temp_pattern.data.integer = 1;
+		temp_pattern.data.uint = 1;
 	else
-		temp_pattern.data.integer = px->srv_bck;
+		temp_pattern.data.uint = px->srv_bck;
 
 	return 1;
 }
@@ -1429,7 +1429,7 @@
 	struct server *iterator;
 
 	test->flags = ACL_TEST_F_VOL_TEST;
-	temp_pattern.data.integer = 0;
+	temp_pattern.data.uint = 0;
 
 	for (iterator = expr->args->data.prx->srv; iterator; iterator = iterator->next) {
 		if ((iterator->state & SRV_RUNNING) == 0)
@@ -1437,12 +1437,12 @@
 
 		if (iterator->maxconn == 0 || iterator->maxqueue == 0) {
 			/* configuration is stupid */
-			temp_pattern.data.integer = -1;
+			temp_pattern.data.uint = -1;  /* FIXME: stupid value! */
 			return 1;
 		}
 
-		temp_pattern.data.integer += (iterator->maxconn - iterator->cur_sess)
-		                          +  (iterator->maxqueue - iterator->nbpend);
+		temp_pattern.data.uint += (iterator->maxconn - iterator->cur_sess)
+		                       +  (iterator->maxqueue - iterator->nbpend);
 	}
 
 	return 1;
@@ -1454,7 +1454,7 @@
                 struct acl_expr *expr, struct acl_test *test) {
 
 	test->flags = ACL_TEST_F_READ_ONLY;
-	temp_pattern.data.integer = l4->be->uuid;
+	temp_pattern.data.uint = l4->be->uuid;
 
 	return 1;
 }
@@ -1468,7 +1468,7 @@
 		return 0;
 
 	test->flags = ACL_TEST_F_READ_ONLY;
-	temp_pattern.data.integer = target_srv(&l4->target)->puid;
+	temp_pattern.data.uint = target_srv(&l4->target)->puid;
 
 	return 1;
 }
@@ -1482,7 +1482,7 @@
                        struct acl_expr *expr, struct acl_test *test)
 {
 	test->flags = ACL_TEST_F_VOL_TEST;
-	temp_pattern.data.integer = read_freq_ctr(&expr->args->data.prx->be_sess_per_sec);
+	temp_pattern.data.uint = read_freq_ctr(&expr->args->data.prx->be_sess_per_sec);
 	return 1;
 }
 
@@ -1495,7 +1495,7 @@
 		  struct acl_expr *expr, struct acl_test *test)
 {
 	test->flags = ACL_TEST_F_VOL_TEST;
-	temp_pattern.data.integer = expr->args->data.prx->beconn;
+	temp_pattern.data.uint = expr->args->data.prx->beconn;
 	return 1;
 }
 
@@ -1508,7 +1508,7 @@
 		   struct acl_expr *expr, struct acl_test *test)
 {
 	test->flags = ACL_TEST_F_VOL_TEST;
-	temp_pattern.data.integer = expr->args->data.prx->totpend;
+	temp_pattern.data.uint = expr->args->data.prx->totpend;
 	return 1;
 }
 
@@ -1537,9 +1537,9 @@
 		nbsrv = px->srv_bck;
 
 	if (nbsrv > 0)
-		temp_pattern.data.integer = (px->totpend + nbsrv - 1) / nbsrv;
+		temp_pattern.data.uint = (px->totpend + nbsrv - 1) / nbsrv;
 	else
-		temp_pattern.data.integer = px->totpend * 2;
+		temp_pattern.data.uint = px->totpend * 2;
 
 	return 1;
 }
@@ -1552,7 +1552,7 @@
 acl_fetch_srv_conn(struct proxy *px, struct session *l4, void *l7, int dir,
 		  struct acl_expr *expr, struct acl_test *test)
 {
-	temp_pattern.data.integer = expr->args->data.srv->cur_sess;
+	temp_pattern.data.uint = expr->args->data.srv->cur_sess;
 	return 1;
 }