From: Willy Tarreau <w@1wt.eu>
Date: Sat, 13 Apr 2013 07:22:25 +0000 (+0200)
Subject: BUG/MINOR: cli: "clear table" did not work anymore without a key
X-Git-Tag: v1.5-dev19~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e993239d7a650b5545a49c556b14f4a735778b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cli: "clear table" did not work anymore without a key

Will Glass-Husain reported this breakage which was caused by commit
dec9814e merged in 1.5-dev12, and which was incomplete, resulting in
both "clear table" and "show table" to do the same thing.

No backport is needed.
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 0c3c2aeeb9..8ee1eec5c3 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -3946,17 +3946,19 @@ static void cli_release_handler(struct stream_interface *si)
 	}
 }
 
-/* This function dumps all tables' states onto the stream interface's
- * read buffer. The xprt_ctx must have been zeroed first, and the flags
- * properly set. It returns 0 if the output buffer is full and it needs
- * to be called again, otherwise non-zero.
+/* This function is used to either dump tables states (when action is set
+ * to STAT_CLI_O_TAB) or clear tables (when action is STAT_CLI_O_CLR).
+ * The xprt_ctx must have been zeroed first, and the flags properly set.
+ * It returns 0 if the output buffer is full and it needs to be called
+ * again, otherwise non-zero.
  */
-static int stats_table_request(struct stream_interface *si, int show)
+static int stats_table_request(struct stream_interface *si, int action)
 {
 	struct session *s = si->conn->xprt_ctx;
 	struct ebmb_node *eb;
 	int dt;
 	int skip_entry;
+	int show = action == STAT_CLI_O_TAB;
 
 	/*
 	 * We have 3 possible states in si->conn->xprt_st :