vici: Add option to query a specific pool

diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index 4e53d7cc9e6337ffe00935a1a7e9da4ff5b10aaf..be0eff5c58eace607909740f3485833c89b603c0 100644 (file)
--- a/src/libcharon/plugins/vici/README.md
+++ b/src/libcharon/plugins/vici/README.md
@@ -569,6 +569,7 @@ List the currently loaded pools.
 
        {
                leases = <set to yes to include leases>
+               name = <optional name of the pool to query>
        } => {
                <pool name>* = {
                        base = <virtual IP pool base address>

diff --git a/src/libcharon/plugins/vici/vici_attribute.c b/src/libcharon/plugins/vici/vici_attribute.c
index e0d9b4ae86df2ca85772c376636678977bfe036f..4e1fa97083e9971b8fad72b7a57f06b4fe9cb258 100644 (file)
--- a/src/libcharon/plugins/vici/vici_attribute.c
+++ b/src/libcharon/plugins/vici/vici_attribute.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2014-2015 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2014-2016 Tobias Brunner
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * Copyright (C) 2014 Martin Willi
  * Copyright (C) 2014 revosec AG
@@ -668,10 +668,11 @@ CALLBACK(get_pools, vici_message_t*,
        identification_t *uid;
        host_t *lease;
        bool list_leases, on;
-       char buf[32];
+       char buf[32], *filter;
        int i;
 
        list_leases = message->get_bool(message, FALSE, "leases");
+       filter = message->get_str(message, NULL, "name");
 
        builder = vici_builder_create();
 
@@ -679,6 +680,11 @@ CALLBACK(get_pools, vici_message_t*,
        enumerator = this->pools->create_enumerator(this->pools);
        while (enumerator->enumerate(enumerator, &name, &pool))
        {
+               if (filter && !streq(name, filter))
+               {
+                       continue;
+               }
+
                vips = pool->vips;
 
                builder->begin_section(builder, name);