eap-radius: Add method to explicitly clear unclaimed IPs

Instead of just enumerating them, removing and then destroying the entry
avoids having to keep the mutex locked.

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_provider.c b/src/libcharon/plugins/eap_radius/eap_radius_provider.c
index 8188bb764f02674c8f4aab9b38ce56750c8ebc4f..e8ebcf6b0d0dc7fe4680414efb68aa2d22148b08 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_provider.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_provider.c
@@ -1,4 +1,7 @@
 /*
+ * Copyright (C) 2018 Tobias Brunner
+ * HSR Hochschule fuer Technik Rapperswil
+ *
  * Copyright (C) 2013 Martin Willi
  * Copyright (C) 2013 revosec AG
  *
@@ -131,7 +134,7 @@ static entry_t* get_or_create_entry(hashtable_t *hashtable, uintptr_t id)
 }
 
 /**
- * Put an entry to hashtable, or destroy it ife empty
+ * Put an entry to hashtable, or destroy it if empty
  */
 static void put_or_destroy_entry(hashtable_t *hashtable, entry_t *entry)
 {
@@ -494,6 +497,24 @@ METHOD(eap_radius_provider_t, add_attribute, void,
        this->listener.mutex->unlock(this->listener.mutex);
 }
 
+METHOD(eap_radius_provider_t, clear_unclaimed, enumerator_t*,
+       private_eap_radius_provider_t *this, uint32_t id)
+{
+       entry_t *entry;
+
+       this->listener.mutex->lock(this->listener.mutex);
+       entry = this->listener.unclaimed->remove(this->listener.unclaimed,
+                                                                                        (void*)(uintptr_t)id);
+       this->listener.mutex->unlock(this->listener.mutex);
+       if (!entry)
+       {
+               return enumerator_create_empty();
+       }
+       return enumerator_create_cleaner(
+                                       entry->addrs->create_enumerator(entry->addrs),
+                                       (void*)destroy_entry, entry);
+}
+
 METHOD(eap_radius_provider_t, destroy, void,
        private_eap_radius_provider_t *this)
 {
@@ -523,6 +544,7 @@ eap_radius_provider_t *eap_radius_provider_create()
                                },
                                .add_framed_ip = _add_framed_ip,
                                .add_attribute = _add_attribute,
+                               .clear_unclaimed = _clear_unclaimed,
                                .destroy = _destroy,
                        },
                        .listener = {

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_provider.h b/src/libcharon/plugins/eap_radius/eap_radius_provider.h
index 80971bddb434041bbbaaa89200f0343614bbcc61..9f1121ca3aa5009a009ed31858f9b18de98a4bd3 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_provider.h
+++ b/src/libcharon/plugins/eap_radius/eap_radius_provider.h
@@ -1,4 +1,7 @@
 /*
+ * Copyright (C) 2018 Tobias Brunner
+ * HSR Hochschule fuer Technik Rapperswil
+ *
  * Copyright (C) 2013 Martin Willi
  * Copyright (C) 2013 revosec AG
  *
@@ -55,6 +58,14 @@ struct eap_radius_provider_t {
        void (*add_attribute)(eap_radius_provider_t *this, uint32_t id,
                                                  configuration_attribute_type_t type, chunk_t data);
 
+       /**
+        * Clears any unclaimed IP addresses and attributes for the given IKE_SA.
+        *
+        * @param id                    IKE_SA unique identifier
+        * @return                              enumerator over unclaimed IP addresses, if any
+        */
+       enumerator_t *(*clear_unclaimed)(eap_radius_provider_t *this, uint32_t id);
+
        /**
         * Destroy a eap_radius_provider_t.
         */