[CLEANUP] group PR_O_BALANCE_* bits into a checkable value
In preparation for newer balance algorithms, group the
sparse PR_O_BALANCE_* values into layer4 and layer7-based
algorithms. This will ease addition of newer algorithms.
diff --git a/src/backend.c b/src/backend.c
index faf5db8..758b429 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -164,21 +164,23 @@
if (!(s->flags & SN_ASSIGNED)) {
if (s->be->options & PR_O_BALANCE) {
+ int len;
+
if (s->flags & SN_DIRECT) {
s->flags |= SN_ASSIGNED;
return SRV_STATUS_OK;
}
+
if (!s->be->srv_act && !s->be->srv_bck)
return SRV_STATUS_NOSRV;
- if (s->be->options & PR_O_BALANCE_RR) {
+ switch (s->be->options & PR_O_BALANCE) {
+ case PR_O_BALANCE_RR:
s->srv = get_server_rr_with_conns(s->be);
if (!s->srv)
return SRV_STATUS_FULL;
- }
- else if (s->be->options & PR_O_BALANCE_SH) {
- int len;
-
+ break;
+ case PR_O_BALANCE_SH:
if (s->cli_addr.ss_family == AF_INET)
len = 4;
else if (s->cli_addr.ss_family == AF_INET6)
@@ -189,15 +191,17 @@
s->srv = get_server_sh(s->be,
(void *)&((struct sockaddr_in *)&s->cli_addr)->sin_addr,
len);
- }
- else if (s->be->options & PR_O_BALANCE_UH) {
+ break;
+ case PR_O_BALANCE_UH:
/* URI hashing */
s->srv = get_server_uh(s->be,
s->txn.req.sol + s->txn.req.sl.rq.u,
s->txn.req.sl.rq.u_l);
- }
- else /* unknown balancing algorithm */
+ break;
+ default:
+ /* unknown balancing algorithm */
return SRV_STATUS_INTERNAL;
+ }
}
else if (!*(int *)&s->be->dispatch_addr.sin_addr &&
!(s->fe->options & PR_O_TRANSP)) {
diff --git a/src/cfgparse.c b/src/cfgparse.c
index e347cff..8e390d5 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2513,11 +2513,11 @@
Warning("parsing %s : monitor-uri will be ignored for %s '%s'.\n",
file, proxy_type_str(curproxy), curproxy->id);
}
- if (curproxy->options & PR_O_BALANCE_UH) {
+ if (curproxy->options & PR_O_BALANCE_L7) {
curproxy->options &= ~PR_O_BALANCE;
curproxy->options |= PR_O_BALANCE_RR;
- Warning("parsing %s : URI hash will be ignored for %s '%s'. Falling back to round robin.\n",
+ Warning("parsing %s : Layer 7 hash not possible for %s '%s'. Falling back to round robin.\n",
file, proxy_type_str(curproxy), curproxy->id);
}
}