summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2015-09-17 12:23:58 +0200
committerGert Doering <gert@greenie.muc.de>2015-09-17 20:05:27 +0200
commit1ff39cff4e644103607f0266cd4666dab18716c5 (patch)
tree7716d1c8c08136aad363e3593de876ed48726729
parent3ddb56433b1fa0f20565dfda13a647459c06251a (diff)
downloadopenvpn-1ff39cff4e644103607f0266cd4666dab18716c5.zip
openvpn-1ff39cff4e644103607f0266cd4666dab18716c5.tar.gz
openvpn-1ff39cff4e644103607f0266cd4666dab18716c5.tar.xz
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 <gert@greenie.muc.de> 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 <gert@greenie.muc.de>
-rw-r--r--src/openvpn/route.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index db4657e..ab8eb27 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
+ }
}
}