From: "cron2 (Code Review)" Date: Wed, 29 Jan 2025 17:02:31 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="rLYSHNNhZuQ="; 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 --rLYSHNNhZuQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, 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 (#3). 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 v3: uncrustify (#ifdef block too long, comments at #endif required now) Change-Id: Ic438c583a782035ecb9b5ea65702a768ae2585f5 Signed-off-by: Gert Doering --- M doc/man-sections/advanced-options.rst M src/openvpn/options.c 2 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/881/3 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..218d8a6 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,20 +5858,26 @@ { 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 */ } -#endif +#endif /* if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) */ else if (streq(p[0], "echo") || streq(p[0], "parameter")) { struct buffer string =3D alloc_buf_gc(OPTION_PARM_SIZE, &gc); -- 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: 3 Gerrit-Owner: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --rLYSHNNhZuQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, plaisthos, stipa.

cron2 uploaded patch set #3 to this change.

View Change

git pull ssh://gerrit.openvpn.ne=
t:29418/openvpn refs/changes/81/881/3
diff --git a/doc/man-sections=
/advanced-options.rst b/doc/man-sections/advanced-options.rst
index d5a6b4f..e1115e4 100644
--- a/doc/man-sections/adv= anced-options.rst
+++ b/doc/man-sections/advanced-options.r= st
@@ -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 sp= ecified IPv4 address
= + if the target can be parsed as an IPv4 address.
For I= Pv6 this queries the route towards ::/128, or the specified IPv6
= - target address if passed as ar= gument.
- 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 mor= e specific IPv4/IPv6 routes to a

+ VPN server.


Advanced Expert Options
diff --git a/src/openvpn/optio= ns.c b/src/openvpn/options.c
index 5a80e6b..218d8a6 100644<= /span>
--- a/src/openvpn/options.c
+++ b/src/openv= pn/options.c
@@ -788,7 +788,7 @@
"= ;\n"
"General Standalone Options:\n"

#ifdef ENABLE_DEBUG
- "--show-gateway : Show info about default gateway.\n&= quot;
+ "--sh= ow-gateway [address]: Show info about gateway [to v4/v6 address].\n"
#endif
;

@@ -5858,20 +5858,26 @@

{
st= ruct route_gateway_info rgi;
struct route_ipv6_gat= eway_info rgi6;
- = struct in6_addr remote =3D IN6ADDR_ANY_INIT;
+ in_addr_t remote_ipv4 =3D 0;
<= span style=3D"color: hsl(120, 100%, 40%);">+ struct in6_addr remote_= ipv6 =3D IN6ADDR_ANY_INIT;
openvpn_net_ctx_t net_c= tx;
VERIFY_PERMISSION(OPT_P_GENERAL);
if (p[1])
{
- get_ipv6_addr(p[1], &remote, NU= LL, 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 othe= r protocol
+ = */
+ r= emote_ipv4 =3D get_ip_addr(p[1], M_WARN, NULL);
+ get_ipv6_addr(p[1], &remote_ipv= 6, NULL, M_WARN);
}
net_c= tx_init(NULL, &net_ctx);
- get_default_gateway(&rgi, 0, &net_ctx);
- get_default_gateway_ipv6(&= amp;rgi6, &remote, &net_ctx);
+ get_default_gateway(&rgi, remote_ipv4, &n= et_ctx);
+ get= _default_gateway_ipv6(&rgi6, &remote_ipv6, &net_ctx); print_default_gateway(M_INFO, &rgi, &rgi6);<= br> openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */<= /span>
}
= -#endif
+#endif /* if= defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) */
else if (streq(p[0], "echo") || streq(p[0], "parameter= "))

{
struct buffer stri= ng =3D alloc_buf_gc(OPTION_PARM_SIZE, &gc);

=

To view, visit change 881. To unsubscribe, or for help writing mail fil= ters, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic438c583a782035ecb9b5ea6570= 2a768ae2585f5
Gerrit-Change-Number: 881
Gerrit-PatchSet: 3
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: stipa <lstipakov@...1663...= .>
Gerrit-MessageType: newpatchset
--rLYSHNNhZuQ=--