RA: announce after the actions which may be dropping the session

It's useless to announce RA just before dropping the session.
This commit is contained in:
Samuel Thibault 2024-01-18 10:13:00 +01:00
parent 1d19366e15
commit e6a933153d

View file

@ -3846,14 +3846,6 @@ static void regular_cleanups(double period)
s_actions++; s_actions++;
} }
// Send periodic RA
if (session[s].ppp.phase == Network && session[s].ppp.ipv6cp == Opened &&
(time_now - sess_local[s].last_ra >= RtrAdvInterval))
{
send_ipv6_ra(s, t, NULL);
sess_local[s].last_ra = time_now;
}
// Drop sessions who have reached session_timeout seconds // Drop sessions who have reached session_timeout seconds
if (session[s].session_timeout) if (session[s].session_timeout)
{ {
@ -3967,6 +3959,14 @@ static void regular_cleanups(double period)
cluster_send_session(s); cluster_send_session(s);
} }
// Send periodic RA
if (session[s].ppp.phase == Network && session[s].ppp.ipv6cp == Opened &&
(time_now - sess_local[s].last_ra >= RtrAdvInterval))
{
send_ipv6_ra(s, t, NULL);
sess_local[s].last_ra = time_now;
}
// RADIUS interim accounting // RADIUS interim accounting
if (config->radius_accounting && config->radius_interim > 0 if (config->radius_accounting && config->radius_interim > 0
&& session[s].ip && !session[s].walled_garden && session[s].ip && !session[s].walled_garden