summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2018-11-16 03:10:26 -0800
committercyberta <cyberta@riseup.net>2018-11-16 03:10:26 -0800
commitf79557ea93465dd6e58bf85e32c336b468c44c34 (patch)
treea2dc2fd26c46cc39d9a7a52bdf1b2e76880af753 /app/src
parentc5d5be2d6dfb3cd98758cfbffebf80435428277d (diff)
parent1f5095b59c93b04120a2e10f0b083b4f6846ca68 (diff)
Merge branch 'master' into 'master'
block ipv6 addresses if void vpn is running See merge request leap/bitmask_android!83
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
index 76d5fb8e..a896197c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -16,12 +16,14 @@
*/
package se.leap.bitmaskclient.eip;
+import android.annotation.TargetApi;
import android.app.Notification;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.VpnService;
import android.os.Build;
import android.os.ParcelFileDescriptor;
+import android.system.OsConstants;
import android.util.Log;
import java.io.IOException;
@@ -122,14 +124,27 @@ public class VoidVpnService extends VpnService implements Observer, VpnNotificat
private Builder prepareBlockingVpnProfile() {
Builder builder = new Builder();
builder.setSession("Blocking until running");
- builder.addRoute("0.0.0.0", 1);
+ builder.addRoute("0.0.0.0", 0);
builder.addRoute("192.168.1.0", 24);
builder.addDnsServer("10.42.0.1");
builder.addAddress("10.42.0.8", 16);
+ builder.addRoute("::",0);
+ builder.addAddress("fc00::", 7);
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ allowAllAFFamilies(builder);
+ }
+
return builder;
}
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ private void allowAllAFFamilies(Builder builder) {
+ builder.allowFamily(OsConstants.AF_INET);
+ builder.allowFamily(OsConstants.AF_INET6);
+ }
+
private void establishBlockingVpn() {
try {
VpnStatus.logInfo(getString(R.string.void_vpn_establish));