From 613f0df88b435f61c270bda71921f7c6aedae6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Bont=C3=A9?= Date: Thu, 3 Mar 2011 20:49:04 +0100 Subject: [PATCH] [BUG] stats: admin commands must check the proxy state As reported by Bryan Talbot, enabling and disabling a server in a disabled proxy causes a segfault. Changing the weight can also cause a similar segfault. --- src/dumpstats.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/dumpstats.c b/src/dumpstats.c index 980b28485..081e4cd37 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -639,6 +639,12 @@ int stats_sock_parse_request(struct stream_interface *si, char *line) return 1; } + if (px->state == PR_STSTOPPED) { + s->data_ctx.cli.msg = "Proxy is disabled.\n"; + si->st0 = STAT_CLI_PRINT; + return 1; + } + /* if the weight is terminated with '%', it is set relative to * the initial weight, otherwise it is absolute. */ @@ -749,6 +755,12 @@ int stats_sock_parse_request(struct stream_interface *si, char *line) return 1; } + if (px->state == PR_STSTOPPED) { + s->data_ctx.cli.msg = "Proxy is disabled.\n"; + si->st0 = STAT_CLI_PRINT; + return 1; + } + if (sv->state & SRV_MAINTAIN) { /* The server is really in maintenance, we can change the server state */ if (sv->tracked) { @@ -804,6 +816,12 @@ int stats_sock_parse_request(struct stream_interface *si, char *line) return 1; } + if (px->state == PR_STSTOPPED) { + s->data_ctx.cli.msg = "Proxy is disabled.\n"; + si->st0 = STAT_CLI_PRINT; + return 1; + } + if (! (sv->state & SRV_MAINTAIN)) { /* Not already in maintenance, we can change the server state */ sv->state |= SRV_MAINTAIN;