From 285cbb121707c51b2c9842ccbacfa114539e8adb Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Thu, 31 Mar 2016 08:56:19 +0200
Subject: [PATCH] Revert "Only add routes when needed"

This reverts commit c8cec0839ed30d972efb193fc06c062c564351c1.

Refs #395
---
 app/app.iml                                   | 40 +++++------
 .../eu/faircode/netguard/ServiceSinkhole.java | 71 +++++++++----------
 2 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 1ee7df9e..abb7fbad 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -41,12 +41,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
@@ -54,6 +48,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
@@ -61,13 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/all/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
@@ -75,6 +68,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -96,13 +96,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -110,6 +103,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/renderscript" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
index 3c910b3a..ed245b74 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
@@ -969,54 +969,47 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
                 builder.addDnsServer(dns);
             }
 
-        // Routing
+        // Exclude IP ranges
+        List<IPUtil.CIDR> listExclude = new ArrayList<>();
+        listExclude.add(new IPUtil.CIDR("127.0.0.0", 8)); // localhost
+        if (tethering) {
+            // USB Tethering 192.168.42.x
+            // Wi-Fi Tethering 192.168.43.x
+            listExclude.add(new IPUtil.CIDR("192.168.42.0", 23));
+        }
         Configuration config = getResources().getConfiguration();
-        if (tethering || (config.mcc == 310 && config.mnc == 260)) {
-            // Exclude IP ranges
-            List<IPUtil.CIDR> listExclude = new ArrayList<>();
-            listExclude.add(new IPUtil.CIDR("127.0.0.0", 8)); // localhost
+        if (config.mcc == 310 && config.mnc == 260) {
+            // T-Mobile Wi-Fi calling
+            listExclude.add(new IPUtil.CIDR("66.94.2.0", 24));
+            listExclude.add(new IPUtil.CIDR("66.94.6.0", 23));
+            listExclude.add(new IPUtil.CIDR("66.94.8.0", 22));
+            listExclude.add(new IPUtil.CIDR("208.54.0.0", 16));
+        }
+        listExclude.add(new IPUtil.CIDR("224.0.0.0", 3)); // broadcast
 
-            if (tethering) {
-                // USB Tethering 192.168.42.x
-                // Wi-Fi Tethering 192.168.43.x
-                listExclude.add(new IPUtil.CIDR("192.168.42.0", 23));
-            }
+        Collections.sort(listExclude);
 
-            if (config.mcc == 310 && config.mnc == 260) {
-                // T-Mobile Wi-Fi calling
-                listExclude.add(new IPUtil.CIDR("66.94.2.0", 24));
-                listExclude.add(new IPUtil.CIDR("66.94.6.0", 23));
-                listExclude.add(new IPUtil.CIDR("66.94.8.0", 22));
-                listExclude.add(new IPUtil.CIDR("208.54.0.0", 16));
-            }
-
-            listExclude.add(new IPUtil.CIDR("224.0.0.0", 3)); // broadcast
-
-            Collections.sort(listExclude);
-
-            try {
-                InetAddress start = InetAddress.getByName("0.0.0.0");
-                for (IPUtil.CIDR exclude : listExclude) {
-                    Log.i(TAG, "Exclude " + exclude.getStart().getHostAddress() + "..." + exclude.getEnd().getHostAddress());
-                    for (IPUtil.CIDR include : IPUtil.toCIDR(start, IPUtil.minus1(exclude.getStart())))
-                        try {
-                            builder.addRoute(include.address, include.prefix);
-                        } catch (Throwable ex) {
-                            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
-                        }
-                    start = IPUtil.plus1(exclude.getEnd());
-                }
-                for (IPUtil.CIDR include : IPUtil.toCIDR("224.0.0.0", "255.255.255.255"))
+        try {
+            InetAddress start = InetAddress.getByName("0.0.0.0");
+            for (IPUtil.CIDR exclude : listExclude) {
+                Log.i(TAG, "Exclude " + exclude.getStart().getHostAddress() + "..." + exclude.getEnd().getHostAddress());
+                for (IPUtil.CIDR include : IPUtil.toCIDR(start, IPUtil.minus1(exclude.getStart())))
                     try {
                         builder.addRoute(include.address, include.prefix);
                     } catch (Throwable ex) {
                         Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
                     }
-            } catch (UnknownHostException ex) {
-                Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                start = IPUtil.plus1(exclude.getEnd());
             }
-        } else
-            builder.addRoute("0.0.0.0", 0);
+            for (IPUtil.CIDR include : IPUtil.toCIDR("224.0.0.0", "255.255.255.255"))
+                try {
+                    builder.addRoute(include.address, include.prefix);
+                } catch (Throwable ex) {
+                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                }
+        } catch (UnknownHostException ex) {
+            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+        }
 
         builder.addRoute("0:0:0:0:0:0:0:0", 0);