trap-manager: Remove unused find_reqid() method
authorTobias Brunner <tobias@strongswan.org>
Fri, 3 Nov 2017 10:51:36 +0000 (11:51 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 22 Feb 2018 10:31:05 +0000 (11:31 +0100)
It might actually have returned an incorrect result if there were child
configs for different peer configs sharing the same name.

src/libcharon/sa/trap_manager.c
src/libcharon/sa/trap_manager.h

index f558219..979f929 100644 (file)
@@ -411,31 +411,6 @@ METHOD(trap_manager_t, create_enumerator, enumerator_t*,
                                                                        (void*)this->lock->unlock);
 }
 
-METHOD(trap_manager_t, find_reqid, uint32_t,
-       private_trap_manager_t *this, child_cfg_t *child)
-{
-       enumerator_t *enumerator;
-       entry_t *entry;
-       uint32_t reqid = 0;
-
-       this->lock->read_lock(this->lock);
-       enumerator = this->traps->create_enumerator(this->traps);
-       while (enumerator->enumerate(enumerator, &entry))
-       {
-               if (streq(entry->name, child->get_name(child)))
-               {
-                       if (entry->child_sa)
-                       {
-                               reqid = entry->child_sa->get_reqid(entry->child_sa);
-                       }
-                       break;
-               }
-       }
-       enumerator->destroy(enumerator);
-       this->lock->unlock(this->lock);
-       return reqid;
-}
-
 METHOD(trap_manager_t, acquire, void,
        private_trap_manager_t *this, uint32_t reqid,
        traffic_selector_t *src, traffic_selector_t *dst)
@@ -691,7 +666,6 @@ trap_manager_t *trap_manager_create(void)
                        .install = _install,
                        .uninstall = _uninstall,
                        .create_enumerator = _create_enumerator,
-                       .find_reqid = _find_reqid,
                        .acquire = _acquire,
                        .flush = _flush,
                        .destroy = _destroy,
index 63bf17f..1b67ff8 100644 (file)
@@ -62,14 +62,6 @@ struct trap_manager_t {
        enumerator_t* (*create_enumerator)(trap_manager_t *this);
 
        /**
-        * Find the reqid of a child config installed as a trap.
-        *
-        * @param child         CHILD_SA config to get the reqid for
-        * @return                      reqid of trap, 0 if not found
-        */
-       uint32_t (*find_reqid)(trap_manager_t *this, child_cfg_t *child);
-
-       /**
         * Acquire an SA triggered by an installed trap.
         *
         * @param reqid         requid of the triggering CHILD_SA