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

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 9bf9900381bda49b66a2c6d5afe5af34f51c0e6a..a946e75d5df9162f0190ceb3ed4155fb2f838673 100644 (file)
--- 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 8cd82ad8c40b19bb18e9011b4d4e8c1abc296f99..0d5396c0e78e4e50402e5f24a5792b547d3fa2df 100644 (file)
--- 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;
        }