Hi, as agreed on IRC, this is postponed for the time being, to see if a way can be found to handle this without more #if(n)def ANDROID in route.c (like, via options.c)
gert
On Fri, Mar 21, 2014 at 02:18:42PM +0100, Arne Schwabe wrote:
> Routing loops are avoided using the VPNService API
> ---
> src/openvpn/route.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/src/openvpn/route.c b/src/openvpn/route.c
> index 13eed5f..eb5fb46 100644
> --- a/src/openvpn/route.c
> +++ b/src/openvpn/route.c
> @@ -530,8 +530,10 @@ add_block_local (struct route_list *rl)
> {
> size_t i;
>
> +#ifndef TARGET_ANDROID
> /* add bypass for gateway addr */
> add_bypass_address (&rl->spec.bypass, rl->rgi.gateway.addr);
> +#endif
>
> /* block access to local subnet */
> add_block_local_item (rl, &rl->rgi.gateway, rl->spec.remote_endpoint);
> @@ -822,6 +824,7 @@ redirect_default_route_to_vpn (struct route_list *rl,
> const struct tuntap *tt, u
> }
> else
> {
> +#ifndef TARGET_ANDROID
> bool local = BOOL_CAST(rl->flags & RG_LOCAL);
> if (rl->flags & RG_AUTO_LOCAL) {
> const int tla = rl->spec.remote_host_local;
> @@ -854,6 +857,7 @@ redirect_default_route_to_vpn (struct route_list *rl,
> const struct tuntap *tt, u
> dmsg (D_ROUTE, "ROUTE remote_host protocol differs from
> tunneled");
> }
> }
> +#endif
>
> /* route DHCP/DNS server traffic through original default gateway */
> add_bypass_routes (&rl->spec.bypass, rl->rgi.gateway.addr, tt, flags,
> &rl->rgi, es);
> --
> 1.8.5.2 (Apple Git-48)
>
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/13534_NeoTech
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
pgpUco7D0wwUg.pgp
Description: PGP signature
