From: "stipa (Code Review)" Date: Fri, 31 Jan 2025 13:31:08 +0000 In-Reply-To: References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="nDuM7LRL8tk="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: route.c: improve get_default_gateway() logic on Windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , cron2 , flichtenheld Cc: openvpn-devel --nDuM7LRL8tk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos, stipa. Hello cron2, flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=3Demail to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by cron2 Change subject: route.c: improve get_default_gateway() logic on Windows ...................................................................... route.c: improve get_default_gateway() logic on Windows When adding host route for IPv4, we use the default gateway. There are cases, however, when this does not work - for example when remote is not accessible via default gateway but via dedicated route. Factor out code to look for the best gateway to reach the host from get_default_gateway_ipv6() and generalize is for IPv4/6. Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb Signed-off-by: Lev Stipakov --- M src/openvpn/route.c M src/openvpn/route.h 2 files changed, 104 insertions(+), 50 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/3 diff --git a/src/openvpn/route.c b/src/openvpn/route.c index dd37fb9..023feaf 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -2732,40 +2732,108 @@ return ret; } +/** + * @brief Determines the best route to a destination for both IPv4 and IPv= 6. + * + * Uses `GetBestInterfaceEx` and `GetBestRoute2` to find the optimal route + * and network interface for the specified destination address. + * + * @param gc Pointer to struct gc_arena for internal string allocation. + * @param dest The destination IP address (IPv4 or IPv6). + * @param best_route Pointer to a `MIB_IPFORWARD_ROW2` structure to store = the best route. + * @return DWORD `NO_ERROR` on success, or an error code. + */ +static DWORD +get_best_route(struct gc_arena *gc, SOCKADDR_INET *dest, MIB_IPFORWARD_ROW= 2 *best_route) +{ + DWORD best_if_index; + DWORD status; + + CLEAR(*best_route); + + /* get the best interface index to reach dest */ + status =3D GetBestInterfaceEx((struct sockaddr *)dest, &best_if_index); + if (status !=3D NO_ERROR) + { + msg(D_ROUTE, "NOTE: GetBestInterfaceEx returned error: %s (code=3D= %u)", + strerror_win32(status, gc), + (unsigned int)status); + goto done; + } + + msg(D_ROUTE_DEBUG, "GetBestInterfaceEx() returned if=3D%d", (int)best_= if_index); + + /* get the routing information (such as NextHop) for the destination a= nd interface */ + NET_LUID luid; + CLEAR(luid); + SOCKADDR_INET best_src; + CLEAR(best_src); + status =3D GetBestRoute2(&luid, best_if_index, NULL, + dest, 0, best_route, &best_src); + if (status !=3D NO_ERROR) + { + msg(D_ROUTE, "NOTE: GetIpForwardEntry2 returned error: %s (code=3D= %u)", + strerror_win32(status, gc), + (unsigned int)status); + goto done; + } + +done: + return status; +} + void get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { - struct gc_arena gc =3D gc_new(); - - const IP_ADAPTER_INFO *adapters =3D get_adapter_info_list(&gc); - const MIB_IPFORWARDTABLE *routes =3D get_windows_routing_table(&gc); - const MIB_IPFORWARDROW *row =3D get_default_gateway_row(routes); - DWORD a_index; - const IP_ADAPTER_INFO *ai; - CLEAR(*rgi); - if (row) + struct gc_arena gc =3D gc_new(); + + /* convert in_addr_t into SOCKADDR_INET */ + SOCKADDR_INET sa; + CLEAR(sa); + sa.si_family =3D AF_INET; + sa.Ipv4.sin_addr.s_addr =3D htonl(dest); + + /* get the best route to the destination */ + MIB_IPFORWARD_ROW2 best_route; + CLEAR(best_route); + DWORD status =3D get_best_route(&gc, &sa, &best_route); + if (status !=3D NO_ERROR) { - rgi->gateway.addr =3D ntohl(row->dwForwardNextHop); - if (rgi->gateway.addr) + goto done; + } + + rgi->flags =3D RGI_ADDR_DEFINED; + rgi->gateway.addr =3D ntohl(best_route.NextHop.Ipv4.sin_addr.S_un.S_ad= dr); + + if (rgi->gateway.addr =3D=3D 0) + { + rgi->flags |=3D (RGI_ON_LINK | RGI_IFACE_DEFINED); + rgi->adapter_index =3D best_route.InterfaceIndex; + } + else + { + /* get netmask and adapter index */ + const IP_ADAPTER_INFO *adapters =3D get_adapter_info_list(&gc); + DWORD a_index =3D adapter_index_of_ip(adapters, rgi->gateway.addr,= NULL, &rgi->gateway.netmask); + if (a_index =3D=3D TUN_ADAPTER_INDEX_INVALID) { - rgi->flags |=3D RGI_ADDR_DEFINED; - a_index =3D adapter_index_of_ip(adapters, rgi->gateway.addr, N= ULL, &rgi->gateway.netmask); - if (a_index !=3D TUN_ADAPTER_INDEX_INVALID) - { - rgi->adapter_index =3D a_index; - rgi->flags |=3D (RGI_IFACE_DEFINED|RGI_NETMASK_DEFINED); - ai =3D get_adapter(adapters, a_index); - if (ai) - { - memcpy(rgi->hwaddr, ai->Address, 6); - rgi->flags |=3D RGI_HWADDR_DEFINED; - } - } + goto done; + } + rgi->adapter_index =3D a_index; + rgi->flags |=3D (RGI_IFACE_DEFINED | RGI_NETMASK_DEFINED); + + /* get MAC address */ + const IP_ADAPTER_INFO *ai =3D get_adapter(adapters, rgi->adapter_i= ndex); + if (ai) + { + memcpy(rgi->hwaddr, ai->Address, 6); + rgi->flags |=3D RGI_HWADDR_DEFINED; } } +done: gc_free(&gc); } @@ -2823,43 +2891,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *c= tx) { struct gc_arena gc =3D gc_new(); - MIB_IPFORWARD_ROW2 BestRoute; - SOCKADDR_INET DestinationAddress, BestSourceAddress; - DWORD BestIfIndex; - DWORD status; - NET_LUID InterfaceLuid; - CLEAR(*rgi6); - CLEAR(InterfaceLuid); /* cleared =3D not used for lookup= */ - CLEAR(DestinationAddress); + SOCKADDR_INET DestinationAddress; + CLEAR(DestinationAddress); DestinationAddress.si_family =3D AF_INET6; if (dest) { DestinationAddress.Ipv6.sin6_addr =3D *dest; } =20 - status =3D GetBestInterfaceEx( (struct sockaddr *)&DestinationAddress,= &BestIfIndex ); + MIB_IPFORWARD_ROW2 BestRoute; + CLEAR(BestRoute); + DWORD status =3D get_best_route(&gc, &DestinationAddress, &BestRoute); if (status !=3D NO_ERROR) { - msg(D_ROUTE, "NOTE: GetBestInterfaceEx returned error: %s (code=3D= %u)", - strerror_win32(status, &gc), - (unsigned int)status); - goto done; - } - - msg( D_ROUTE, "GetBestInterfaceEx() returned if=3D%d", (int) BestIfInd= ex ); - - status =3D GetBestRoute2( &InterfaceLuid, BestIfIndex, NULL, - &DestinationAddress, 0, - &BestRoute, &BestSourceAddress ); - - if (status !=3D NO_ERROR) - { - msg(D_ROUTE, "NOTE: GetIpForwardEntry2 returned error: %s (code=3D= %u)", - strerror_win32(status, &gc), - (unsigned int)status); goto done; } diff --git a/src/openvpn/route.h b/src/openvpn/route.h index 0bbedbb..98ea79e 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -334,6 +334,13 @@ bool is_special_addr(const char *addr_str); +/** + * @brief Retrieves the best gateway for a given destination based on the = routing table. + * + * @param rgi Pointer to a struct to store the gateway information. + * @param dest Destination IP address in host byte order. + * @param ctx Pointer to a platform-specific network context struct. + */ void get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t *ctx); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?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: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb Gerrit-Change-Number: 879 Gerrit-PatchSet: 3 Gerrit-Owner: stipa Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --nDuM7LRL8tk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

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

stipa uploaded patch set #3 to this change.

View Change

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

route.c: improve get_default_gateway() logic on Wind=
ows

When adding host route for IPv4, we use the default gateway. The= re are
cases, however, when this does not work - for example when remote=
is not accessible via default gateway but via dedicated route.

F= actor out code to look for the best gateway to reach the host from
get_d= efault_gateway_ipv6() and generalize is for IPv4/6.

Change-Id: I6c7e= 1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Signed-off-by: Lev Stipakov <lev= @...515...>
---
M src/openvpn/route.c
M src/openvpn/route.h
= 2 files changed, 104 insertions(+), 50 deletions(-)

git pull ssh:=
//gerrit.openvpn.net:29418/openvpn refs/changes/79/879/3
diff --git=
 a/src/openvpn/route.c b/src/openvpn/route.c
index dd37fb9.= .023feaf 100644
--- a/src/openvpn/route.c
+= ++ b/src/openvpn/route.c
@@ -2732,40 +2732,108 @@ return ret;
}

+/**
+ * @brief Determines the best route to a destinati= on for both IPv4 and IPv6.
+ *
+ * Uses `G= etBestInterfaceEx` and `GetBestRoute2` to find the optimal route
= + * and network interface for t= he specified destination address.
+ *
+ * = @param gc Pointer to struct gc_arena for internal string allocation.=
+ * @param dest The destina= tion IP address (IPv4 or IPv6).
+ * @param best_route Pointer to a `MIB_IPFORWARD_ROW2` structur= e to store the best route.
+ * @return DWORD `NO_ERROR` on success, or an error code.
= + */
+static DWORD
+get_best_route(struct gc_arena *gc, SOCKADDR_INET *de= st, MIB_IPFORWARD_ROW2 *best_route)
+{
+ = DWORD best_if_index;
= +
+ CLEAR(*best_ro= ute);
+
+ /* get the best interface ind= ex to reach dest */
+= status =3D GetBestInterfaceEx((struct sockaddr *)dest, &best_if_ind= ex);
+ if (status = !=3D NO_ERROR)
+ {=
+ msg(D_ROUTE= , "NOTE: GetBestInterfaceEx returned error: %s (code=3D%u)",

+ strerror_win= 32(status, gc),
+ = (unsigned int)status);
+ goto done;
+ }
+
+ msg(D_ROUTE_DEBUG, = "GetBestInterfaceEx() returned if=3D%d", (int)best_if_index);
+
+ /* get the routing information (such = as NextHop) for the destination and interface */
+ NET_LUID luid;
+ CLEAR(luid);
+ SOCKADDR_INET best_src;
+ CLEAR(best_src);
+ status =3D GetBestRoute2(&luid, = best_if_index, NULL,
= + dest, 0, best_route, &best_src);
= + if (status !=3D NO_ERROR)<= /span>
+ {
+ msg(D_ROUTE, "NOTE: G= etIpForwardEntry2 returned error: %s (code=3D%u)",

+ strerror_win32(status, gc),=
+ (unsign= ed int)status);
+ = goto done;
+ }=
+
+done:
+ return status;
+}
+
void
get_default_gateway(struct rout= e_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t *ctx)
{

- struct gc_are= na gc =3D gc_new();
-
- const IP_ADAPTER_IN= FO *adapters =3D get_adapter_info_list(&gc);
- const MIB_IPFORWARDTABLE *routes =3D get_win= dows_routing_table(&gc);
- const MIB_IPFORWARDROW *row =3D get_default_gateway_row(routes);=
- DWORD a_index;
- const IP_ADAPTER_INF= O *ai;
-
CLEAR(*rgi);


- if (row)
+ struct gc_arena gc =3D gc_new();
+
+ /* convert in_addr_t into SOCKADDR_INET */
+ SOCKADDR_INET sa;
+ CLEAR(sa);
+ sa.si_family =3D AF_INET;
+ sa.Ipv4.sin_addr.s_addr =3D ht= onl(dest);

++ /* get the best route to= the destination */
+= MIB_IPFORWARD_ROW2 best_route;
+ CLEAR(best_route);
+ DWORD status =3D get_best_route(&gc, &sa, &am= p;best_route);
+ i= f (status !=3D NO_ERROR)
{
- rgi->gateway.addr =3D ntohl(row->dw= ForwardNextHop);
- = if (rgi->gateway.addr)
+ goto done;
+ }
+
+ rgi->flags =3D RGI= _ADDR_DEFINED;
+ r= gi->gateway.addr =3D ntohl(best_route.NextHop.Ipv4.sin_addr.S_un.S_addr)= ;
+
+ if (rgi->gateway.addr =3D=3D 0= )
+ {
+ rgi->flags |=3D (RGI_= ON_LINK | RGI_IFACE_DEFINED);

+ rgi->adapter_index =3D best_route.InterfaceIndex;
+ }
+ else
+ {
+ /* get netmask and adapter index */
+ const IP_ADAPTER_INFO *adapters= =3D get_adapter_info_list(&gc);
+ DWORD a_index =3D adapter_index_of_ip(adapters, rg= i->gateway.addr, NULL, &rgi->gateway.netmask);
+ if (a_index =3D=3D TUN_ADAPTER= _INDEX_INVALID)
{
- rgi->flags |=3D RGI_ADDR_DEFINED;
- a_index =3D ada= pter_index_of_ip(adapters, rgi->gateway.addr, NULL, &rgi->gateway= .netmask);
- = if (a_index !=3D TUN_ADAPTER_INDEX_INVALID)
- {
- rgi->adapter_index =3D a_index;- rgi->flags |= =3D (RGI_IFACE_DEFINED|RGI_NETMASK_DEFINED);
- ai =3D get_adapter(adapters, a_index= );
- if = (ai)
- {=
- m= emcpy(rgi->hwaddr, ai->Address, 6);
- rgi->flags |=3D RGI_HWADDR_DEFIN= ED;
- }<= /span>
- }+ goto done;
+ }
+ rgi->adapter_index =3D a= _index;

+ rgi-= >flags |=3D (RGI_IFACE_DEFINED | RGI_NETMASK_DEFINED);
+
+ /* get MAC address */
+ const IP_ADAPTER_INFO *ai =3D get_adap= ter(adapters, rgi->adapter_index);
+ if (ai)
+ {
+ memcpy(rgi->hwaddr, ai->Address, 6);
+ rgi->flags |=3D RGI_H= WADDR_DEFINED;
}
}
=
+done:=
gc_free(&gc);
}

@@ -2823,43 +2891,22 @@
= const struct in6_addr *dest, openvpn_net_ctx_t *ctx)
{
struct gc_arena gc =3D gc_new();
- MIB_IPFORWARD_ROW2 BestRoute;- SOCKADDR_INET DestinationAd= dress, BestSourceAddress;
- DWORD BestIfIndex;
- DWORD status;
= - NET_LUID InterfaceLuid;
-
CLEAR(*rgi6);
- CLEAR(InterfaceLuid); /* cleared =3D= not used for lookup */
- CLEAR(DestinationAddress);

+ SOCKADDR_INET DestinationAddress;=
+ CLEAR(DestinationAddre= ss);
DestinationAddress.si_family =3D AF_INET6;=
if (dest)
{
De= stinationAddress.Ipv6.sin6_addr =3D *dest;
}
- status = =3D GetBestInterfaceEx( (struct sockaddr *)&DestinationAddress, &Be= stIfIndex );
+ MIB= _IPFORWARD_ROW2 BestRoute;
+ CLEAR(BestRoute);
+ DWORD status =3D get_best_route(&gc, &DestinationAddre= ss, &BestRoute);

if (status !=3D= NO_ERROR)
{
- msg(D_ROUTE, "NOTE: GetBestInterfaceEx returned er= ror: %s (code=3D%u)",
- strerror_win32(status, &gc),
- (unsigned int)status);
- goto done;

- }

-
= - msg( D_ROUTE, "GetBestInterfaceEx() returned if=3D%d", (int)= BestIfIndex );
-
- status =3D GetBestRoute= 2( &InterfaceLuid, BestIfIndex, NULL,
- &DestinationAddress, 0,=
- = &BestRoute, &BestSourceAddress );
-
- if (status !=3D NO_ERROR)
- {
- = msg(D_ROUTE, "NOTE: GetIpForwardEntry2 returned error: %s (code= =3D%u)",
- = strerror_win32(status, &gc),
- (unsigned int)status);
= goto done;
}

diff --= git a/src/openvpn/route.h b/src/openvpn/route.h
index 0bbed= bb..98ea79e 100644
--- a/src/openvpn/route.h
+++ b/src/openvpn/route.h

@@ -334,6 +334,13 @@
=
bool is_special_addr(const char *addr_str);=

+/**
+ * @brief Retrieves the = best gateway for a given destination based on the routing table.
= + *
+ * @param rgi Pointer to a struct to store the= gateway information.
+ * @param dest Destination IP address in host byte order.
+ * @param ctx Pointer to a platfor= m-specific network context struct.

+ */
void get_default_gateway(struct route_g= ateway_info *rgi,
in_addr_t dest,=
openvpn_net_ctx_t *ctx);<= br>

To view, visit change 879. To unsubscribe, or for h= elp writing mail filters, visit settings.

<= /div>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb= 2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
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
--nDuM7LRL8tk=--