eap-radius: Add option to not close IKE_SAs on timeouts during interim accouting...

Fixes #528.

diff --git a/conf/plugins/eap-radius.opt b/conf/plugins/eap-radius.opt
index 0edd3458c577c854164d03807eaa04a9a553136b..0df6a0d6ffa0a7c0873bf87e169183a252835d48 100644 (file)
--- a/conf/plugins/eap-radius.opt
+++ b/conf/plugins/eap-radius.opt
@@ -1,6 +1,10 @@
 charon.plugins.eap-radius.accounting = no
        Send RADIUS accounting information to RADIUS servers.
 
+charon.plugins.eap-radius.accounting_close_on_timeout = yes
+       Close the IKE_SA if there is a timeout during interim RADIUS accounting
+       updates.
+
 charon.plugins.eap-radius.accounting_requires_vip = no
        If enabled, accounting is disabled unless an IKE_SA has at least one
        virtual IP.

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index 8c780e78d793f843eb588aaae8eaab93381ff09c..5fb1bbb759ba5ba12c62b3393f4fc7ca9198ef63 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -410,7 +410,12 @@ static job_requeue_t send_interim(interim_data_t *data)
        {
                if (!send_message(this, message))
                {
-                       eap_radius_handle_timeout(data->id);
+                       if (lib->settings->get_bool(lib->settings,
+                                                       "%s.plugins.eap-radius.accounting_close_on_timeout",
+                                                       TRUE, lib->ns))
+                       {
+                               eap_radius_handle_timeout(data->id);
+                       }
                }
                message->destroy(message);
        }