Update usage for all children in RADIUS accounting just before sending Stop

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index da9d91c3abd5d7cd7a18630dc783e4a2223a58b7..831f972c5147a3581617e5f4d8bd6271c0b233c8 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -237,6 +237,17 @@ METHOD(listener_t, ike_updown, bool,
 {
        if (!up)
        {
+               enumerator_t *enumerator;
+               child_sa_t *child_sa;
+
+               /* update usage for all children just before sending stop */
+               enumerator = ike_sa->create_child_sa_enumerator(ike_sa);
+               while (enumerator->enumerate(enumerator, &child_sa))
+               {
+                       update_usage(this, ike_sa, child_sa);
+               }
+               enumerator->destroy(enumerator);
+
                send_stop(this, ike_sa);
        }
        return TRUE;
@@ -269,7 +280,7 @@ METHOD(listener_t, child_updown, bool,
        private_eap_radius_accounting_t *this, ike_sa_t *ike_sa,
        child_sa_t *child_sa, bool up)
 {
-       if (!up)
+       if (!up && ike_sa->get_state(ike_sa) == IKE_ESTABLISHED)
        {
                update_usage(this, ike_sa, child_sa);
        }