Support RADIUS accounting when using IKEv1 with xauth-eap and eap-radius

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index 33449d55f75e2f14b7bfc185b6664c9a3a5e31fe..2d9a7555c57aa8dce5b3d40f7e0e6ed9c3a1b107 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -285,10 +285,18 @@ METHOD(listener_t, message_hook, bool,
 {
        /* start accounting here, virtual IP now is set */
        if (plain && ike_sa->get_state(ike_sa) == IKE_ESTABLISHED &&
-               message->get_exchange_type(message) == IKE_AUTH &&
                !incoming && !message->get_request(message))
        {
-               send_start(this, ike_sa);
+               if (ike_sa->get_version(ike_sa) == IKEV1 &&
+                       message->get_exchange_type(message) == TRANSACTION)
+               {
+                       send_start(this, ike_sa);
+               }
+               if (ike_sa->get_version(ike_sa) == IKEV2 &&
+                       message->get_exchange_type(message) == IKE_AUTH)
+               {
+                       send_start(this, ike_sa);
+               }
        }
        return TRUE;
 }