From: "cron2 (Code Review)" Date: Wed, 29 Jan 2025 13:52:15 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: <1da31e4b673ef53623b9880ba07baf63d0c79ae3-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="G1CnyHECwwA="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: options: add IPv4 support to '--show-gateway ' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld , stipa Cc: openvpn-devel --G1CnyHECwwA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos, stipa. Hello flichtenheld, plaisthos, stipa, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/881?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: options: add IPv4 support to '--show-gateway ' ...................................................................... options: add IPv4 support to '--show-gateway ' This is an old debug option, which used to print "the default routes found" for IPv4 and IPv6, and optionally "a route to a particular IPv6 target" if passed an argument. With the work started in commit 0fcfc8381f60d we want this to handle IPv4 as well, mostly to be able to easily test per-platform get_default_gateway() implementations. The implementation is simplistic - if can be parsed as an IPv4 or IPv6 address, that particular protocol lookup will do "the host route" and the other one will stick to "the default route". NOTE: as of this commit, there is no backend functionality for IPv4, so it will not actually print anything interesting. This will be added in further platform dependent commits. v2: amend --help output Change-Id: Ic438c583a782035ecb9b5ea65702a768ae2585f5 Signed-off-by: Gert Doering --- M doc/man-sections/advanced-options.rst M src/openvpn/options.c 2 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/881/2 diff --git a/doc/man-sections/advanced-options.rst b/doc/man-sections/advan= ced-options.rst index d5a6b4f..e1115e4 100644 --- a/doc/man-sections/advanced-options.rst +++ b/doc/man-sections/advanced-options.rst @@ -9,13 +9,17 @@ :: --show-gateway + --show-gateway IPv4-target --show-gateway IPv6-target + For IPv4 it looks for a 0.0.0.0/0 route, or the specified IPv4 address + if the target can be parsed as an IPv4 address. For IPv6 this queries the route towards ::/128, or the specified IPv6 - target address if passed as argument. - For IPv4 on Linux, Windows, MacOS and BSD it looks for a 0.0.0.0/0 route. - If there are more specific routes, the result will not always be matching - the route of the IPv4 packets to the VPN gateway. + target address if the argument is an IPv6 address. + + Adding a target is helpful for diagnostics to see if OpenVPN will do + the right thing if there are more specific IPv4/IPv6 routes to a + VPN server. Advanced Expert Options diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 5a80e6b..00c6fce 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -788,7 +788,7 @@ "\n" "General Standalone Options:\n" #ifdef ENABLE_DEBUG - "--show-gateway : Show info about default gateway.\n" + "--show-gateway [address]: Show info about gateway [to v4/v6 address].= \n" #endif ; @@ -5858,16 +5858,22 @@ { struct route_gateway_info rgi; struct route_ipv6_gateway_info rgi6; - struct in6_addr remote =3D IN6ADDR_ANY_INIT; + in_addr_t remote_ipv4 =3D 0; + struct in6_addr remote_ipv6 =3D IN6ADDR_ANY_INIT; openvpn_net_ctx_t net_ctx; VERIFY_PERMISSION(OPT_P_GENERAL); if (p[1]) { - get_ipv6_addr(p[1], &remote, NULL, M_WARN); + /* try parsing the argument as a v4 or v6 address - if + * possible, the output will show the exact route there, and + * "the default route" for the other protocol + */ + remote_ipv4 =3D get_ip_addr(p[1], M_WARN, NULL); + get_ipv6_addr(p[1], &remote_ipv6, NULL, M_WARN); } net_ctx_init(NULL, &net_ctx); - get_default_gateway(&rgi, 0, &net_ctx); - get_default_gateway_ipv6(&rgi6, &remote, &net_ctx); + get_default_gateway(&rgi, remote_ipv4, &net_ctx); + get_default_gateway_ipv6(&rgi6, &remote_ipv6, &net_ctx); print_default_gateway(M_INFO, &rgi, &rgi6); openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */ } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/881?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: Ic438c583a782035ecb9b5ea65702a768ae2585f5 Gerrit-Change-Number: 881 Gerrit-PatchSet: 2 Gerrit-Owner: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --G1CnyHECwwA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, plaisthos, s= tipa.

cron2 uploaded patch set #2 to this change.

View Change

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

options: add IPv4 support to '--show-gate=
way <arg>'

This is an old debug option, which used to prin= t "the default routes found"
for IPv4 and IPv6, and optionally= "a route to a particular IPv6 target"
if passed an argument.<= br>
With the work started in commit 0fcfc8381f60d we want this to handle=
IPv4 as well, mostly to be able to easily test per-platform
get_defa= ult_gateway() implementations.

The implementation is simplistic - if= <arg> can be parsed as an IPv4 or
IPv6 address, that particular p= rotocol lookup will do "the host route"
and the other one will= stick to "the default route".

NOTE: as of this commit, th= ere is no backend functionality for IPv4, so
it will not actually print = anything interesting. This will be added in
further platform dependent = commits.

v2: amend --help output

Change-Id: Ic438c583a782035e= cb9b5ea65702a768ae2585f5
Signed-off-by: Gert Doering <gert@...1296...= >
---
M doc/man-sections/advanced-options.rst
M src/openvpn/opt= ions.c
2 files changed, 19 insertions(+), 9 deletions(-)

git p= ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/881/2
di=
ff --git a/doc/man-sections/advanced-options.rst b/doc/man-sections/advance=
d-options.rst
index d5a6b4f..e1115e4 100644
--- a/doc/man-sections/advanced-options.rst
+++ b/doc/man-= sections/advanced-options.rst
@@ -9,13 +9,17 @@
<= span> ::

--show-gateway+ --show-gateway IPv4-targ= et
--show-gateway IPv6-target

+ For IPv4 it looks for a= 0.0.0.0/0 route, or the specified IPv4 address
+ if the target can be parsed as an IPv4 addres= s.
For IPv6 this queries the route towards ::/128, or th= e specified IPv6
- tar= get address if passed as argument.
- For IPv4 on Linux, Windows, MacOS and BSD it looks for a 0.0= .0.0/0 route.
- If the= re are more specific routes, the result will not always be matching<= br>- the route of the IPv4 packe= ts to the VPN gateway.
+
+ Adding a target is helpful for diagnostics to see if Ope= nVPN will do
+ the r= ight thing if there are more specific IPv4/IPv6 routes to a
+ VPN server.


Advanced Expert Options
dif= f --git a/src/openvpn/options.c b/src/openvpn/options.c
ind= ex 5a80e6b..00c6fce 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -788,7 +788,7 @@=
"\n"
"General Sta= ndalone Options:\n"
#ifdef ENABLE_DEBUG
- "--show-gateway : Show inf= o about default gateway.\n"

+ "--show-gateway [address]: Show info about gateway [t= o v4/v6 address].\n"
#endif
;=

@@ -5858,16 +5858,22 @@
{<= /span>
struct route_gateway_info rgi;
= struct route_ipv6_gateway_info rgi6;
- struct in6_addr remote =3D IN6ADDR_ANY_INIT;
+ in_addr_t rem= ote_ipv4 =3D 0;
+ = struct in6_addr remote_ipv6 =3D IN6ADDR_ANY_INIT;
= openvpn_net_ctx_t net_ctx;
VERIFY_PERMISSION(O= PT_P_GENERAL);
if (p[1])
= {
- get_ipv6= _addr(p[1], &remote, NULL, M_WARN);
+ /* try parsing the argument as a v4 or v6 a= ddress - if
+ = * possible, the output will show the exact route there, and
= + * "the defau= lt route" for the other protocol
+ */
+ remote_ipv4 =3D get_ip_addr(p[1], M_WARN, NULL);<= /span>
+ get_ipv6= _addr(p[1], &remote_ipv6, NULL, M_WARN);
}
net_ctx_init(NULL, &net_ctx);
- get_default_gateway(&rgi, 0, = &net_ctx);
- = get_default_gateway_ipv6(&rgi6, &remote, &net_ctx);
= + get_default_gateway(&a= mp;rgi, remote_ipv4, &net_ctx);
+ get_default_gateway_ipv6(&rgi6, &remote_ipv= 6, &net_ctx);
print_default_gateway(M_INFO, &a= mp;rgi, &rgi6);
openvpn_exit(OPENVPN_EXIT_STAT= US_GOOD); /* exit point */
}

To view, visit change 881. To unsubscribe, or for help writing mail f= ilters, visit settings.<= /p>

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic438c583a782035ecb9b5ea6570= 2a768ae2585f5
Gerrit-Change-Number: 881
Gerrit-PatchSet: 2
Gerrit-Owner: cron2 <gert@...1296...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: stipa <lstipakov@...1663...= .>
Gerrit-MessageType: newpatchset
--G1CnyHECwwA=--