cron2 has uploaded a new patch set (#5) to the change originally created by mrbff. ( http://gerrit.openvpn.net/c/openvpn/+/1222?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: route: handle default gateway (net_gateway) and nexthop towards VPN server separately ...................................................................... route: handle default gateway (net_gateway) and nexthop towards VPN server separately Right now there is the assumption that the gateway used for net_gateway is the same used to reach the VPN server. However, these two gateways may be different (i.e. when there is a specific hostroute for the VPN server using a different nexthop). For this reason we must adapt init_route_list() to fetch the two gateways separately. Github: fixes OpenVPN/openvpn#890 Change-Id: I16d90221d0a75193035253817ff195f6da9dc0b3 Signed-off-by: Marco Baffo <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1222 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34529.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/route.c M src/openvpn/route.h 2 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/22/1222/5 diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 7d988da..770300a 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -257,9 +257,9 @@ { if (rl) { - if (rl->rgi.flags & RGI_ADDR_DEFINED) + if (rl->ngi.flags & RGI_ADDR_DEFINED) { - *out = rl->rgi.gateway.addr; + *out = rl->ngi.gateway.addr; } else { @@ -624,10 +624,10 @@ rl->spec.flags |= RTSA_DEFAULT_METRIC; } - get_default_gateway(&rl->rgi, remote_host != IPV4_INVALID_ADDR ? remote_host : INADDR_ANY, ctx); - if (rl->rgi.flags & RGI_ADDR_DEFINED) + get_default_gateway(&rl->ngi, INADDR_ANY, ctx); + if (rl->ngi.flags & RGI_ADDR_DEFINED) { - setenv_route_addr(es, "net_gateway", rl->rgi.gateway.addr, -1); + setenv_route_addr(es, "net_gateway", rl->ngi.gateway.addr, -1); #if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) print_default_gateway(D_ROUTE, &rl->rgi, NULL); #endif @@ -637,6 +637,8 @@ dmsg(D_ROUTE, "ROUTE: default_gateway=UNDEF"); } + get_default_gateway(&rl->rgi, remote_host != IPV4_INVALID_ADDR ? remote_host : INADDR_ANY, ctx); + if (rl->spec.flags & RTSA_REMOTE_HOST) { rl->spec.remote_host_local = test_local_addr(remote_host, &rl->rgi); @@ -773,10 +775,10 @@ msg(D_ROUTE, "GDG6: remote_host_ipv6=%s", remote_host_ipv6 ? print_in6_addr(*remote_host_ipv6, 0, &gc) : "n/a"); - get_default_gateway_ipv6(&rl6->rgi6, remote_host_ipv6, ctx); - if (rl6->rgi6.flags & RGI_ADDR_DEFINED) + get_default_gateway_ipv6(&rl6->ngi6, NULL, ctx); + if (rl6->ngi6.flags & RGI_ADDR_DEFINED) { - setenv_str(es, "net_gateway_ipv6", print_in6_addr(rl6->rgi6.gateway.addr_ipv6, 0, &gc)); + setenv_str(es, "net_gateway_ipv6", print_in6_addr(rl6->ngi6.gateway.addr_ipv6, 0, &gc)); #if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) print_default_gateway(D_ROUTE, NULL, &rl6->rgi6); #endif @@ -786,6 +788,8 @@ dmsg(D_ROUTE, "ROUTE6: default_gateway=UNDEF"); } + get_default_gateway_ipv6(&rl6->rgi6, remote_host_ipv6, ctx); + if (is_route_parm_defined(remote_endpoint)) { if (inet_pton(AF_INET6, remote_endpoint, &rl6->remote_endpoint_ipv6) == 1) diff --git a/src/openvpn/route.h b/src/openvpn/route.h index 54fa137..3d19dbd 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -234,7 +234,8 @@ struct route_special_addr spec; struct route_gateway_info rgi; - unsigned int flags; /* RG_x flags */ + struct route_gateway_info ngi; /* net_gateway */ + unsigned int flags; /* RG_x flags */ struct route_ipv4 *routes; struct gc_arena gc; }; @@ -249,7 +250,8 @@ int default_metric; struct route_ipv6_gateway_info rgi6; - unsigned int flags; /* RG_x flags, see route_option_list */ + struct route_ipv6_gateway_info ngi6; /* net_gateway_ipv6 */ + unsigned int flags; /* RG_x flags, see route_option_list */ struct route_ipv6 *routes_ipv6; struct gc_arena gc; }; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1222?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I16d90221d0a75193035253817ff195f6da9dc0b3 Gerrit-Change-Number: 1222 Gerrit-PatchSet: 5 Gerrit-Owner: mrbff <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: flichtenheld <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
