From 4ad3aa5a2b6838650ca98fd92994eab7108c1e8b Mon Sep 17 00:00:00 2001 From: Gianmarco De Gregori Date: Wed, 21 Feb 2024 12:18:14 +0100 Subject: [PATCH] Route: remove incorrect routes on exit Implemented a safeguard to verify the returned value from add_route3() when the default gateway is not a local remote host. Prior to this implementation, RT_DID_LOCAL flag was erroneously set even in case of add_route3() failure. This problem typically occurs when there's no default route and the --redirect-gateway def1 option is specified, and in case of reconnection makes it impossible for the client to reobtain the route to the server. This fix ensures OpenVPN accurately deletes the appropriate route on exit by properly handling add_route3() return value. Trac: #1457 Change-Id: I8a67b82eb4afdc8d82c5a879c18457b41e77cbe7 Signed-off-by: Gianmarco De Gregori Acked-by: Frank Lichtenheld Message-Id: <20240221111814.942965-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28290.html Signed-off-by: Gert Doering (cherry picked from commit 14d2db6cd41fb6414992869caf109972d7a8275e) --- src/openvpn/route.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index a5832ff5cae..66540dbda8c 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1053,7 +1053,10 @@ redirect_default_route_to_vpn(struct route_list *rl, const struct tuntap *tt, ret = add_route3(rl->spec.remote_host, IPV4_NETMASK_HOST, rl->rgi.gateway.addr, tt, flags | ROUTE_REF_GW, &rl->rgi, es, ctx); - rl->iflags |= RL_DID_LOCAL; + if (ret) + { + rl->iflags |= RL_DID_LOCAL; + } } else {