From: Martin Willi <martin@revosec.ch>
Date: Mon, 6 Feb 2012 09:26:24 +0000 (+0100)
Subject: Update usage for all children in RADIUS accounting just before sending Stop
X-Git-Tag: 4.6.2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32dc2b0243a1ef34be2bb2d6da21e856fd36cecc;p=thirdparty%2Fstrongswan.git

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 da9d91c3ab..831f972c51 100644
--- 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);
 	}