From: Simon Horman <horms@verge.net.au>
Date: Wed, 15 Jun 2011 06:18:50 +0000 (+0900)
Subject: [MINOR] Allow showing and clearing by key of ipv6 stick tables
X-Git-Tag: v1.5-dev8~213
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5b89f64959d7ae71d43778d20952f9bd59ba9a6;p=thirdparty%2Fhaproxy.git

[MINOR] Allow showing and clearing by key of ipv6 stick tables
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 9bf9900381..a946e75d5d 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -9336,7 +9336,7 @@ clear table <table> [ data.<type> <operator> <value> ] | [ key <key> ]
     - gt : match entries whose data is greater than this value
 
   When the key form is used the entry <key> is removed.  The key must be of the
-  same type as the table, which currently is limited to IPv4.
+  same type as the table, which currently is limited to IPv4 and IPv6.
 
   Example :
         $ echo "show table http_proxy" | socat stdio /tmp/sock1
@@ -9562,7 +9562,7 @@ show table <name> [ data.<type> <operator> <value> ] | [ key <key> ]
 
 
   When the key form is used the entry <key> is shown.  The key must be of the
-  same type as the table, which currently is limited to IPv4.
+  same type as the table, which currently is limited to IPv4 and IPv6.
 
   Example :
         $ echo "show table http_proxy" | socat stdio /tmp/sock1
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 8cd82ad8c4..0d5396c0e7 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -511,6 +511,7 @@ static void stats_sock_table_key_request(struct stream_interface *si, char **arg
 	struct proxy *px = si->applet.ctx.table.target;
 	struct stksess *ts;
 	unsigned int ip_key;
+	unsigned char ip6_key[sizeof(struct in6_addr)];
 
 	si->applet.st0 = STAT_CLI_OUTPUT;
 
@@ -520,15 +521,20 @@ static void stats_sock_table_key_request(struct stream_interface *si, char **arg
 		return;
 	}
 
-	if (px->table.type == STKTABLE_TYPE_IP) {
+	switch (px->table.type) {
+	case STKTABLE_TYPE_IP:
 		ip_key = htonl(inetaddr_host(args[4]));
 		static_table_key.key = (void *)&ip_key;
-	}
-	else {
+		break;
+	case STKTABLE_TYPE_IPV6:
+		inet_pton(AF_INET6, args[4], ip6_key);
+		static_table_key.key = &ip6_key;
+		break;
+	default:
 		if (show)
-			si->applet.ctx.cli.msg = "Showing keys from non-ip tables is not supported\n";
+			si->applet.ctx.cli.msg = "Showing keys from tables of type other than ip and ipv6 is not supported\n";
 		else
-			si->applet.ctx.cli.msg = "Removing keys from non-ip tables is not supported\n";
+			si->applet.ctx.cli.msg = "Removing keys from ip tables of type other than ip and ipv6 is not supported\n";
 		si->applet.st0 = STAT_CLI_PRINT;
 		return;
 	}