welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add periodic RA sends

Browse source 
The RFC indeed say that we should send them periodically.  We were
previously only sending them along LCP echo replies, but echo requests
are typically sent only when there is no trafic, which RA need to be
sent even when there is trafic.
This commit is contained in:
Samuel Thibault 2023-12-03 22:32:07 +01:00
parent 3be9b1657a
commit 05772e2295
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
icmp.c
View file

@ -141,7 +141,7 @@ void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip)
p_nra->nd_ra_cksum = 0; // Checksum
p_nra->nd_ra_curhoplimit = 64; // Hop count
p_nra->nd_ra_flags_reserved = (ND_RA_FLAG_MANAGED|ND_RA_FLAG_OTHER); // Flags
p_nra->nd_ra_router_lifetime = 0xFFFF; // Lifetime
p_nra->nd_ra_router_lifetime = AdvDefaultLifetime; // Lifetime
p_nra->nd_ra_reachable = 0; // Reachable time
p_nra->nd_ra_retransmit = 0; // Retrans timer
// Option PI after RA message (rfc4861)

8
l2tpns.c
View file

@ -3833,6 +3833,14 @@ static void regular_cleanups(double period)
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
if (session[s].session_timeout)
{

5
l2tpns.h
View file

@ -56,6 +56,8 @@
#define ECHO_TIMEOUT 10 // Time between last packet sent and LCP ECHO generation
#define IDLE_ECHO_TIMEOUT 240 // Time between last packet seen and session shutdown
#define BUSY_WAIT_TIME 3000 // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
#define AdvDefaultLifetime 9000
#define RtrAdvInterval 1800
#define MP_BEGIN 0x80 // This value is used when (b)egin bit is set in MP header
#define MP_END 0x40 // This value is used when (e)nd bit is set in MP header
@ -434,6 +436,9 @@ typedef struct
// last LCP Echo
time_t last_echo;
// last unsolicited RA sent to user
time_t last_ra;
// Last Multilink frame sequence number received
uint32_t last_seq;

6
ppp.c
View file

@ -1103,9 +1103,6 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
if (config->debug > 3) dumplcp(q, l);
tunnelsend(b, l + (q - b), t); // send it
if (session[s].ppp.phase == Network && session[s].ppp.ipv6cp == Opened)
send_ipv6_ra(s, t, NULL); // send a RA
}
else if (*p == EchoReply)
{
@ -1498,8 +1495,9 @@ static void ipv6cp_open(sessionidt s, tunnelidt t)
route6set(s, session[s].ipv6address, 128, 1);
}
// Send an initial RA (TODO: Should we send these regularly?)
// Send an initial RA
send_ipv6_ra(s, t, NULL);
sess_local[s].last_ra = time_now;
}
// Process IPV6CP messages