shunt-manager: Remove first match if no namespace given during uninstall

Also makes namespace mandatory.

diff --git a/src/libcharon/sa/shunt_manager.c b/src/libcharon/sa/shunt_manager.c
index 3a254cea5eaec49b38e6274eaab504b048dbc7d0..a83da0480fe97bbc20d805733680bc557b0fb99e 100644 (file)
--- a/src/libcharon/sa/shunt_manager.c
+++ b/src/libcharon/sa/shunt_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Tobias Brunner
+ * Copyright (C) 2015-2017 Tobias Brunner
  * Copyright (C) 2011-2016 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -198,6 +198,13 @@ METHOD(shunt_manager_t, install, bool,
        entry_t *entry;
        bool found = FALSE, success;
 
+       if (!ns)
+       {
+               DBG1(DBG_CFG, "missing namespace for shunt policy '%s'",
+                        cfg->get_name(cfg));
+               return FALSE;
+       }
+
        /* check if not already installed */
        this->lock->write_lock(this->lock);
        if (this->installing == INSTALL_DISABLED)
@@ -224,7 +231,7 @@ METHOD(shunt_manager_t, install, bool,
                return TRUE;
        }
        INIT(entry,
-               .ns = strdupnull(ns),
+               .ns = strdup(ns),
                .cfg = cfg->get_ref(cfg),
        );
        this->shunts->insert_last(this->shunts, entry);
@@ -369,7 +376,7 @@ METHOD(shunt_manager_t, uninstall, bool,
        enumerator = this->shunts->create_enumerator(this->shunts);
        while (enumerator->enumerate(enumerator, &entry))
        {
-               if (streq(ns, entry->ns) &&
+               if ((!ns || streq(ns, entry->ns)) &&
                        streq(name, entry->cfg->get_name(entry->cfg)))
                {
                        this->shunts->remove_at(this->shunts, enumerator);

diff --git a/src/libcharon/sa/shunt_manager.h b/src/libcharon/sa/shunt_manager.h
index f2b72103210b0c877a7d81b97b1ad5b2af5e42b5..3d9848c9312c251d55393879d1945120f31b8b1b 100644 (file)
--- a/src/libcharon/sa/shunt_manager.h
+++ b/src/libcharon/sa/shunt_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Tobias Brunner
+ * Copyright (C) 2015-2017 Tobias Brunner
  * Copyright (C) 2011 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -36,8 +36,7 @@ struct shunt_manager_t {
        /**
         * Install a policy as a shunt.
         *
-        * @param ns            optional namespace (e.g. name of a connection or
-        *                                      plugin), cloned
+        * @param ns            namespace (e.g. name of a connection or plugin), cloned
         * @param child         child configuration to install as a shunt
         * @return                      TRUE if installed successfully
         */
@@ -46,7 +45,10 @@ struct shunt_manager_t {
        /**
         * Uninstall a shunt policy.
         *
-        * @param ns            namespace (same as given during installation)
+        * If no namespace is given the first matching child configuration is
+        * removed.
+        *
+        * @param ns            namespace (same as given during installation) or NULL
         * @param name          name of child configuration to uninstall as a shunt
         * @return                      TRUE if uninstalled successfully
         */