Change in openvpn[master]: route.c: improve get_default_gateway() logic on Windows
A message that is not in the archive (sent off-list or not yet received): gerrit.1738070271000.I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
to review the following change.
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.
---
M src/openvpn/route.c
1 file changed, 91 insertions(+), 52 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/1
src/openvpn/route.c +91 -52
@@ -2732,40 +2732,100 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) - { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } - } + goto done; } + rgi->flags =RGI_ADDR_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + +/* get netmask and adapter index */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +DWORD a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); +if (a_index ==TUN_ADAPTER_INDEX_INVALID ) + { + goto done; + } + rgi->adapter_index = a_index; + rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); + +/* get MAC address */ +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + } + +done:gc_free (&gc); }
@@ -2823,43 +2883,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
to look at the new patch set (#2).
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.
---
M src/openvpn/route.c
M src/openvpn/route.h
2 files changed, 98 insertions(+), 52 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/2
src/openvpn/route.c +91 -52
@@ -2732,40 +2732,100 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) - { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } - } + goto done; } + rgi->flags =RGI_ADDR_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + +/* get netmask and adapter index */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +DWORD a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); +if (a_index ==TUN_ADAPTER_INDEX_INVALID ) + { + goto done; + } + rgi->adapter_index = a_index; + rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); + +/* get MAC address */ +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + } + +done:gc_free (&gc); }
@@ -2823,43 +2883,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
Change subject: route.c: improve get_default_gateway() logic on Windows
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
Patchset:
PS2:
Initial testing looks generally promising, but I miss getting the ON_LINK flag for gateway addresses that are on a locally connected subnet. Most easily tested with 127.0.0.1 ;-) - the generic code knows how to do that, and windows code does that for IPv6 (try --show-gateway ::1)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Fri, 31 Jan 2025 10:30:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
Change subject: route.c: improve get_default_gateway() logic on Windows
......................................................................
Patch Set 2:
(2 comments)
File src/openvpn/route.c:
http://gerrit.openvpn.net/c/openvpn/+/879/comment/a12cf014_08dcec58 :
PS2, Line 2812: DWORD a_index = adapter_index_of_ip(adapters, rgi->gateway.addr, NULL, &rgi->gateway.netmask);
This fails for ON_LINK targets, where gateway.addr == 0.0.0.0.
The IPv6 code uses BestRoute.InterfaceIndex, because Windows nicely hands this to us anyway.
http://gerrit.openvpn.net/c/openvpn/+/879/comment/879c7db7_bf0b726d :
PS2, Line 2827:
the IPv6 part sets the RGI_ON_LINK flag when the BestRoute.Nexthop points to an empty IPv6 address. Testing with v4 seems to be similar, so for an onlink-prefix (same IPv4 subnet as on the LAN interface, or just 127.0.0.1 to trigger on-link I=1) I get "ROUTE_GATEWAY 0.0.0.0" - but no ON_LINK for v4, yet.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Fri, 31 Jan 2025 10:56:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
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=email
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.
---
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
src/openvpn/route.c +97 -50
@@ -2732,40 +2732,108 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + +if (rgi->gateway.addr ==0 ) + { + rgi->flags |= (RGI_ON_LINK |RGI_IFACE_DEFINED ); + rgi->adapter_index = best_route.InterfaceIndex; + } +else + { +/* get netmask and adapter index */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +DWORD a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); +if (a_index ==TUN_ADAPTER_INDEX_INVALID ) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } + goto done; + } + rgi->adapter_index = a_index; + rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); + +/* get MAC address */ +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; } } +done:gc_free (&gc); }
@@ -2823,43 +2891,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, flichtenheld, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
Change subject: route.c: improve get_default_gateway() logic on Windows
......................................................................
Patch Set 3:
(2 comments)
File src/openvpn/route.c:
http://gerrit.openvpn.net/c/openvpn/+/879/comment/a0e6aa22_44e519ff :
PS2, Line 2812: DWORD a_index = adapter_index_of_ip(adapters, rgi->gateway.addr, NULL, &rgi->gateway.netmask);
Quoted 1 line
This fails for
ON_LINKtargets, wheregateway.addr == 0.0.0.0. […]
Done
http://gerrit.openvpn.net/c/openvpn/+/879/comment/b7f7fe7b_1e60f462 :
PS2, Line 2827:
Quoted 1 line
the IPv6 part sets the
RGI_ON_LINKflag when the `BestRoute. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 31 Jan 2025 13:32:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
to look at the new patch set (#4).
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.
---
M src/openvpn/route.c
M src/openvpn/route.h
2 files changed, 101 insertions(+), 48 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/4
src/openvpn/route.c +94 -48
@@ -2732,40 +2732,107 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED |RGI_IFACE_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + rgi->adapter_index = best_route.InterfaceIndex; + +if (rgi->gateway.addr ==0 ) + { + rgi->flags |=RGI_ON_LINK ; + } +else + { +/* get netmask and MAC address */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + +/* get netmask */ +in_addr_t nm =inet_addr (ai->IpAddressList.IpMask.String); +if (nm !=INADDR_NONE ) { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } + rgi->gateway.netmask =ntohl (nm); + rgi->flags |=RGI_NETMASK_DEFINED ; } } } +done:gc_free (&gc); }
@@ -2823,43 +2890,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 4
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
to look at the new patch set (#5).
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.
---
M src/openvpn/route.c
M src/openvpn/route.h
2 files changed, 101 insertions(+), 50 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/5
src/openvpn/route.c +94 -50
@@ -2732,40 +2732,105 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED |RGI_IFACE_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + rgi->adapter_index = best_route.InterfaceIndex; + +if (rgi->gateway.addr ==INADDR_ANY ) + { + rgi->flags |=RGI_ON_LINK ; + } + +/* get netmask and MAC address */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + +/* get netmask for non-onlink routes */ +in_addr_t nm =inet_addr (ai->IpAddressList.IpMask.String); +if (!(rgi->flags &RGI_ON_LINK ) && (nm !=INADDR_NONE )) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } + rgi->gateway.netmask =ntohl (nm); + rgi->flags |=RGI_NETMASK_DEFINED ; } } +done:gc_free (&gc); }
@@ -2823,43 +2888,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 5
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
Change subject: route.c: improve get_default_gateway() logic on Windows
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/879?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 5
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Fri, 31 Jan 2025 15:41:11 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v5 1/1 route.c: improve get_default_gateway() logic on Windows
In reply to a message not in the archiveFrom: Lev Stipakov <[email protected]...>
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.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/879
This mail reflects revision 5 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/route.c +94 -50
@@ -2732,40 +2732,105 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED |RGI_IFACE_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + rgi->adapter_index = best_route.InterfaceIndex; + +if (rgi->gateway.addr ==INADDR_ANY ) + { + rgi->flags |=RGI_ON_LINK ; + } + +/* get netmask and MAC address */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + +/* get netmask for non-onlink routes */ +in_addr_t nm =inet_addr (ai->IpAddressList.IpMask.String); +if (!(rgi->flags &RGI_ON_LINK ) && (nm !=INADDR_NONE )) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } + rgi->gateway.netmask =ntohl (nm); + rgi->flags |=RGI_NETMASK_DEFINED ; } } +done:gc_free (&gc); }
@@ -2823,43 +2888,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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);
[Openvpn-devel] [PATCH applied] Re: route.c: improve get_default_gateway() logic on Windows
Tested a local windows build with this with various nasty questions ("--show-gateway 127.0.0.1", ON_LINK and not, etc) and v5 now gets us the expected results for all my and Lev's tests. Plus, the code is much more efficient on a system with many routes than "get all the tables from Windows, and walk through them ourselves" - just ask Windows.
The patch looks a bit larger because it reuses the IPv6 logic, extracting the common parts into get_best_route().
Your patch has been applied to the master branch.
commit 1f6b6b5b589bfb519b09b1b4e99086d64a2c8fc4
Author: Lev Stipakov Date: Fri Jan 31 16:41:35 2025 +0100
route.c: improve get_default_gateway() logic on Windows
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30769.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#6) to the change originally created by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30769.html
---
M src/openvpn/route.c
M src/openvpn/route.h
2 files changed, 101 insertions(+), 50 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/879/6
src/openvpn/route.c +94 -50
@@ -2732,40 +2732,105 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED |RGI_IFACE_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + rgi->adapter_index = best_route.InterfaceIndex; + +if (rgi->gateway.addr ==INADDR_ANY ) + { + rgi->flags |=RGI_ON_LINK ; + } + +/* get netmask and MAC address */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + +/* get netmask for non-onlink routes */ +in_addr_t nm =inet_addr (ai->IpAddressList.IpMask.String); +if (!(rgi->flags &RGI_ON_LINK ) && (nm !=INADDR_NONE )) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } + rgi->gateway.netmask =ntohl (nm); + rgi->flags |=RGI_NETMASK_DEFINED ; } } +done:gc_free (&gc); }
@@ -2823,43 +2888,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 6
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/879?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30769.html
---
M src/openvpn/route.c
M src/openvpn/route.h
2 files changed, 101 insertions(+), 50 deletions(-)
src/openvpn/route.c +94 -50
@@ -2732,40 +2732,105 @@return ret; } +/** +* @brief Determines the best route to a destination for both IPv4 and IPv6. +* +* 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_ROW2 *best_route) +{ +DWORD best_if_index; +DWORD status; + +CLEAR (*best_route); + +/* get the best interface index to reach dest */ + status =GetBestInterfaceEx ((struct sockaddr *)dest, &best_if_index); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , +strerror_win32 (status, gc), + (unsigned int )status); + goto done; + } + +msg (D_ROUTE_DEBUG ,"GetBestInterfaceEx() returned if=%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 =GetBestRoute2 (&luid, best_if_index,NULL , + dest,0 , best_route, &best_src); +if (status !=NO_ERROR ) + { +msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%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,openvpn_net_ctx_t *ctx) { -struct gc_arena gc =gc_new (); - -const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); -const MIB_IPFORWARDTABLE *routes =get_windows_routing_table (&gc); -const MIB_IPFORWARDROW *row =get_default_gateway_row (routes); -DWORD a_index; -const IP_ADAPTER_INFO *ai; -CLEAR (*rgi); -if (row) +struct gc_arena gc =gc_new (); + +/* convert in_addr_t into SOCKADDR_INET */ +SOCKADDR_INET sa; +CLEAR (sa); + sa.si_family =AF_INET ; + sa.Ipv4.sin_addr.s_addr =htonl (dest); + +/* get the best route to the destination */ +MIB_IPFORWARD_ROW2 best_route; +CLEAR (best_route); +DWORD status =get_best_route (&gc, &sa, &best_route); +if (status !=NO_ERROR ) { - rgi->gateway.addr =ntohl (row->dwForwardNextHop); -if (rgi->gateway.addr) + goto done; + } + + rgi->flags =RGI_ADDR_DEFINED |RGI_IFACE_DEFINED ; + rgi->gateway.addr =ntohl (best_route.NextHop.Ipv4.sin_addr.S_un.S_addr); + rgi->adapter_index = best_route.InterfaceIndex; + +if (rgi->gateway.addr ==INADDR_ANY ) + { + rgi->flags |=RGI_ON_LINK ; + } + +/* get netmask and MAC address */ +const IP_ADAPTER_INFO *adapters =get_adapter_info_list (&gc); +const IP_ADAPTER_INFO *ai =get_adapter (adapters, rgi->adapter_index); +if (ai) + { +memcpy (rgi->hwaddr, ai->Address,6 ); + rgi->flags |=RGI_HWADDR_DEFINED ; + +/* get netmask for non-onlink routes */ +in_addr_t nm =inet_addr (ai->IpAddressList.IpMask.String); +if (!(rgi->flags &RGI_ON_LINK ) && (nm !=INADDR_NONE )) { - rgi->flags |=RGI_ADDR_DEFINED ; - a_index =adapter_index_of_ip (adapters, rgi->gateway.addr,NULL , &rgi->gateway.netmask); -if (a_index !=TUN_ADAPTER_INDEX_INVALID ) - { - rgi->adapter_index = a_index; - rgi->flags |= (RGI_IFACE_DEFINED |RGI_NETMASK_DEFINED ); - ai =get_adapter (adapters, a_index); -if (ai) - { -memcpy (rgi->hwaddr, ai->Address,6 ); - rgi->flags |=RGI_HWADDR_DEFINED ; - } - } + rgi->gateway.netmask =ntohl (nm); + rgi->flags |=RGI_NETMASK_DEFINED ; } } +done:gc_free (&gc); }
@@ -2823,43 +2888,22 @@ const struct in6_addr *dest, openvpn_net_ctx_t *ctx) { struct gc_arena gc = gc_new(); -MIB_IPFORWARD_ROW2 BestRoute; -SOCKADDR_INET DestinationAddress, BestSourceAddress; -DWORD BestIfIndex; -DWORD status; -NET_LUID InterfaceLuid; -CLEAR (*rgi6); -CLEAR (InterfaceLuid);/* cleared = not used for lookup */ -CLEAR (DestinationAddress); +SOCKADDR_INET DestinationAddress; +CLEAR (DestinationAddress); DestinationAddress.si_family =AF_INET6 ;if (dest) { DestinationAddress.Ipv6.sin6_addr = *dest; } - status =GetBestInterfaceEx ( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); +MIB_IPFORWARD_ROW2 BestRoute; +CLEAR (BestRoute); +DWORD status =get_best_route (&gc, &DestinationAddress, &BestRoute);if (status !=NO_ERROR ) { -msg (D_ROUTE ,"NOTE: GetBestInterfaceEx returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); - goto done; - } - -msg (D_ROUTE ,"GetBestInterfaceEx() returned if=%d" , (int ) BestIfIndex ); - - status =GetBestRoute2 ( &InterfaceLuid, BestIfIndex,NULL , - &DestinationAddress,0 , - &BestRoute, &BestSourceAddress ); - -if (status !=NO_ERROR ) - { -msg (D_ROUTE ,"NOTE: GetIpForwardEntry2 returned error: %s (code=%u)" , -strerror_win32 (status, &gc), - (unsigned int )status); goto done; }
src/openvpn/route.h +7 -0
@@ -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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6c7e1cef637fe9fb3f3bc6ff4fb2c65599cd86fb
Gerrit-Change-Number: 879
Gerrit-PatchSet: 6
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged