upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

do not push route-ipv6 entries that are also in the iroute-ipv6 list

Browse source 
A server should push a route to a client only if there is no matching
iroute for the same client.

While this logic works fine for IPv4, there is no IPv6 counterpart.

Implement the same check for IPv6 routes and discard matching ones
from the push list.

Trac: #354
Cc: Gert Doering <gert@greenie.muc.de>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Heiko Hund <heiko@ist.eigentlich.net>
Message-Id: <20220628082024.19059-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24577.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2022-06-28 10:20:24 +02:00 committed by Gert Doering
parent 977e0650c1
commit 437812d4ea
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/openvpn/push.c
View file

@ -1054,7 +1054,7 @@ process_incoming_push_msg(struct context *c,
void
remove_iroutes_from_push_route_list(struct options *o)
{
if (o && o->push_list.head && o->iroutes)
if (o && o->push_list.head && (o->iroutes || o->iroutes_ipv6))
{
struct gc_arena gc = gc_new();
struct push_entry *e = o->push_list.head;
@ -1071,7 +1071,7 @@ remove_iroutes_from_push_route_list(struct options *o)
&& parse_line(e->option, p, SIZE(p), "[PUSH_ROUTE_REMOVE]", 1, D_ROUTE_DEBUG, &gc))
{
/* is the push item a route directive? */
if (p[0] && !strcmp(p[0], "route") && !p[3])
if (p[0] && !strcmp(p[0], "route") && !p[3] && o->iroutes)
{
/* get route parameters */
bool status1, status2;
@ -1094,6 +1094,30 @@ remove_iroutes_from_push_route_list(struct options *o)
}
}
}
else if (p[0] && !strcmp(p[0], "route-ipv6") && !p[2]
&& o->iroutes_ipv6)
{
/* get route parameters */
struct in6_addr network;
unsigned int netbits;
/* parse route-ipv6 arguments */
if (get_ipv6_addr(p[1], &network, &netbits, D_ROUTE_DEBUG))
{
struct iroute_ipv6 *ir;
/* does this route-ipv6 match an iroute-ipv6? */
for (ir = o->iroutes_ipv6; ir != NULL; ir = ir->next)
{
if (!memcmp(&network, &ir->network, sizeof(network))
&& netbits == ir->netbits)
{
enable = false;
break;
}
}
}
}
/* should we copy the push item? */
e->enable = enable;