From: Arne Schwabe Date: Thu, 17 Sep 2015 10:23:58 +0000 (+0200) Subject: Do not install a host route for the VPN on Android X-Git-Tag: v2.4_alpha1~247 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ff39cff4e644103607f0266cd4666dab18716c5;p=thirdparty%2Fopenvpn.git Do not install a host route for the VPN on Android Routing loops are avoided using the VPNService API protect API Acked-by: Gert Doering Message-Id: <1442485438-15704-1-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/10135 Signed-off-by: Gert Doering --- diff --git a/src/openvpn/route.c b/src/openvpn/route.c index db4657e27..ab8eb27f6 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -768,6 +768,11 @@ init_route_ipv6_list (struct route_ipv6_list *rl6, r6->next = rl6->routes_ipv6; rl6->routes_ipv6 = r6; +#ifndef TARGET_ANDROID + /* On Android the VPNService protect function call will take of + * avoiding routing loops, so ignore this part and let + * need_remote_ipv6_route always evaluate to false + */ if ( remote_host_ipv6 && route_ipv6_match_host( r6, remote_host_ipv6 ) ) { @@ -776,7 +781,8 @@ init_route_ipv6_list (struct route_ipv6_list *rl6, print_in6_addr (r6->network, 0, &gc), r6->netbits, print_in6_addr (*remote_host_ipv6, 0, &gc)); } - } +#endif + } } }