From: "cron2 (Code Review)"
Date: Wed, 27 Aug 2025 19:03:21 +0000
In-Reply-To:
References:
Reply-To: gert@...1296..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="lxRbgqCdGn8="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: Introduce env
variables to communicate desired gateway redirection to...
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Cc: plaisthos , flichtenheld , openvpn-devel
--lxRbgqCdGn8=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11=
56?usp=3Demail )
Change subject: Introduce env variables to communicate desired gateway redi=
rection to NM.
......................................................................
Introduce env variables to communicate desired gateway redirection to NM.
When run under Network Manager control, OpenVPN is not allowed to
control routing. Instead, NM uses the OpenVPN-set environment variables
("route_network_1" etc) to set up routes as requested. This method never
worked properly for "redirect-gateway", as the information was not made
available in environment variables.
Introduce new env vars:
route_redirect_gateway_ipv4
route_redirect_gateway_ipv6
to communicate desired state:
=3D no gateway redirection desired
1 =3D "redirect-gateway for that protocol in question"
2 =3D "include block-local to redirect the local LAN as well"
We intentionally do not expose all the IPv4 flags ("local", "def1", ...)
as this is really internal OpenVPN historical cruft.
Change-Id: I1e623b4a836f7216750867243299c7e4d0bd32d0
Signed-off-by: Gert Doering
Acked-by: Arne Schwabe
Message-Id: <20250826184046.21434-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32=
686.html
Signed-off-by: Gert Doering
---
M doc/man-sections/script-options.rst
M src/openvpn/options.c
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/doc/man-sections/script-options.rst b/doc/man-sections/script-=
options.rst
index bd5ecd4..670cd33 100644
--- a/doc/man-sections/script-options.rst
+++ b/doc/man-sections/script-options.rst
@@ -874,6 +874,14 @@
translations will be recorded rather than their names as denoted on the
command line or configuration file.
+:code:`route_redirect_gateway_ipv4`
+
+:code:`route_redirect_gateway_ipv6`
+ Set to `1` if the corresponding default gateway should be redirected
+ into the tunnel, and to `2` if also the local LAN segment should be
+ blocked (`block-local`). Not set otherwise. Set prior to **--up** sc=
ript
+ execution.
+
:code:`script_context`
Set to "init" or "restart" prior to up/down script execution. For more
information, see documentation for ``--up``.
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 0b16c5a..648d526 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5720,6 +5720,8 @@
{
options->routes_ipv6->flags =3D 0;
}
+ env_set_del(es, "route_redirect_gateway_ipv4");
+ env_set_del(es, "route_redirect_gateway_ipv6");
}
else if (streq(p[0], "dns") && !p[1])
{
@@ -6039,6 +6041,8 @@
{
options->routes_ipv6->flags =3D 0;
}
+ env_set_del(es, "route_redirect_gateway_ipv4");
+ env_set_del(es, "route_redirect_gateway_ipv6");
*update_options_found |=3D OPT_P_U_REDIR_GATEWAY;
}
}
@@ -7661,6 +7665,16 @@
goto err;
}
}
+ if (options->routes->flags & RG_REROUTE_GW)
+ {
+ setenv_int(es, "route_redirect_gateway_ipv4",
+ options->routes->flags & RG_BLOCK_LOCAL ? 2 : 1);
+ }
+ if (options->routes_ipv6 && (options->routes_ipv6->flags & RG_RERO=
UTE_GW))
+ {
+ setenv_int(es, "route_redirect_gateway_ipv6",
+ options->routes->flags & RG_BLOCK_LOCAL ? 2 : 1);
+ }
#ifdef _WIN32
/* we need this here to handle pushed --redirect-gateway */
remap_redirect_gateway_flags(options);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1156?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1e623b4a836f7216750867243299c7e4d0bd32d0
Gerrit-Change-Number: 1156
Gerrit-PatchSet: 2
Gerrit-Owner: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-MessageType: merged
--lxRbgqCdGn8=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Introduce env variables to communicate desire=
d gateway redirection to NM.
When run under Network Manager control,=
OpenVPN is not allowed to control routing. Instead, NM uses the OpenVP=
N-set environment variables ("route_network_1" etc) to set up =
routes as requested. This method never worked properly for "redire=
ct-gateway", as the information was not made available in environme=
nt variables.
to communicate desired state:<=
br> <not set> =3D no gateway redirection desired 1 =3D "=
redirect-gateway for that protocol in question" 2 =3D "includ=
e block-local to redirect the local LAN as well"
We intentional=
ly do not expose all the IPv4 flags ("local", "def1", .=
..) as this is really internal OpenVPN historical cruft.
Change-I=
d: I1e623b4a836f7216750867243299c7e4d0bd32d0 Signed-off-by: Gert Doering=
<gert@...1296...> Acked-by: Arne Schwabe <arne-openvpn@...1830...=
...> Message-Id: <20250826184046.21434-1-gert@...1296...> UR=
L: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg3268=
6.html Signed-off-by: Gert Doering <gert@...1296...> --- M d=
oc/man-sections/script-options.rst M src/openvpn/options.c 2 files ch=
anged, 22 insertions(+), 0 deletions(-)
diff --git a/doc/man-sections/script-options.rst b/doc/man-sections/scri=
pt-options.rst index bd5ecd4..670cd33 100644 --- a/doc/man-sections/script-options.rst +++ b/doc/man-s=
ections/script-options.rst @@ -874,6 +874,14 @@ <=
span> translations will be recorded rather than their names as denoted =
on the command line or configuration file. <=
span> +:code:`route_=
redirect_gateway_ipv4` + +:code:`route_red=
irect_gateway_ipv6` +=
Set to `1` if the corresponding default gateway should be redirected + into the tunnel, a=
nd to `2` if also the local LAN segment should be + blocked (`block-local`). Not set otherwi=
se. Set prior to **--up** script + execution. + :code:`script_context` Set =
to "init" or "restart" prior to up/down script executio=
n. For more information, see documentation for ``--up`=
`. diff --git a/src/openvpn/options.c b/src/openvpn/options=
.c index 0b16c5a..648d526 100644 --- a/src/=
openvpn/options.c +++ b/src/openvpn/options.c @@ -5720,6 +5720,8 @@ { =
options->routes_ipv6->flags =3D 0; }=
span> + env_set_del(e=
s, "route_redirect_gateway_ipv4"); + env_set_del(es, "route_redirect_gatew=
ay_ipv6"); } else if (streq(=
p[0], "dns") && !p[1]) { <=
span>@@ -6039,6 +6041,8 @@ { =
options->routes_ipv6->flags =3D 0; =
} + =
env_set_del(es, "route_redirect_gateway_ipv4"); + env_set_del(es, &quo=
t;route_redirect_gateway_ipv6"); *update_=
options_found |=3D OPT_P_U_REDIR_GATEWAY; }=
} @@ -7661,6 +7665,16 @@ =
goto err; } =
} + if (o=
ptions->routes->flags & RG_REROUTE_GW) + { + setenv_int(es, "route_redirect_gateway_=
ipv4", + =
options->routes->flags & RG_BLOCK_LOCAL ? 2 : 1);<=
/span> + } =
+ if (options->routes=
_ipv6 && (options->routes_ipv6->flags & RG_REROUTE_GW))=
span> + { <=
span style=3D"color: hsl(120, 100%, 40%);">+ setenv_int(es, &quo=
t;route_redirect_gateway_ipv6", + options->routes->flags & =
RG_BLOCK_LOCAL ? 2 : 1); + } #ifdef _WIN32 /* w=
e need this here to handle pushed --redirect-gateway */ =
remap_redirect_gateway_flags(options);
To view, visit change 1156. To unsubscribe, or for help writing mail filt=
ers, visit settings.
=
<=
meta itemprop=3D"name" content=3D"View Change"/>