Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4a48573 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '5224-main-local_network' into 'e_16.4.1-RC-2' 

orbotservice: exclude local routes from route

See merge request !5
parents 41cb2aa6 c14fe798

src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java

+5 −2
Original line number Diff line number Diff line
@@ -275,8 +275,11 @@ public class OrbotVpnManager implements Handler.Callback { 


                    builder.setSession(vpnName);



                    //route all traffic through VPN (we might offer country specific exclude lists in the future)

                    builder.addRoute(defaultRoute, 0);

                    for (String route : mService.getApplicationContext().getResources()

                            .getStringArray(R.array.all_routes_except_excluded)) {

                        String[] splitRoute = route.split("/");

                        builder.addRoute(splitRoute[0], Integer.parseInt(splitRoute[1]));

                    }



                    builder.addDnsServer(dummyDNS);

                    builder.addRoute(dummyDNS, 32);

src/main/res/values/arrays.xml

0 → 100644
+133 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <string-array name="all_routes_except_excluded">

        <item>0.0.0.0/5</item>

        <item>8.0.0.0/7</item>

        <item>11.0.0.0/8</item>

        <item>12.0.0.0/6</item>

        <item>16.0.0.0/4</item>

        <item>32.0.0.0/3</item>

        <item>64.0.0.0/7</item>

        <item>66.0.0.0/10</item>

        <item>66.64.0.0/12</item>

        <item>66.80.0.0/13</item>

        <item>66.88.0.0/14</item>

        <item>66.92.0.0/15</item>

        <item>66.94.0.0/23</item>

        <item>66.94.3.0/24</item>

        <item>66.94.4.0/23</item>

        <item>66.94.12.0/22</item>

        <item>66.94.16.0/20</item>

        <item>66.94.32.0/19</item>

        <item>66.94.64.0/18</item>

        <item>66.94.128.0/17</item>

        <item>66.95.0.0/16</item>

        <item>66.96.0.0/11</item>

        <item>66.128.0.0/11</item>

        <item>66.160.0.0/13</item>

        <item>66.168.0.0/14</item>

        <item>66.172.0.0/15</item>

        <item>66.175.0.0/16</item>

        <item>66.176.0.0/12</item>

        <item>66.192.0.0/10</item>

        <item>67.0.0.0/8</item>

        <item>68.0.0.0/8</item>

        <item>69.0.0.0/10</item>

        <item>69.64.0.0/12</item>

        <item>69.80.0.0/15</item>

        <item>69.84.0.0/14</item>

        <item>69.88.0.0/13</item>

        <item>69.104.0.0/13</item>

        <item>69.112.0.0/12</item>

        <item>69.128.0.0/9</item>

        <item>70.0.0.0/9</item>

        <item>70.128.0.0/10</item>

        <item>70.224.0.0/11</item>

        <item>71.0.0.0/8</item>

        <item>72.128.0.0/9</item>

        <item>73.0.0.0/8</item>

        <item>74.0.0.0/8</item>

        <item>75.0.0.0/9</item>

        <item>76.0.0.0/6</item>

        <item>80.0.0.0/4</item>

        <item>96.0.0.0/8</item>

        <item>97.64.0.0/10</item>

        <item>98.0.0.0/7</item>

        <item>100.0.0.0/6</item>

        <item>104.0.0.0/5</item>

        <item>112.0.0.0/4</item>

        <item>128.0.0.0/3</item>

        <item>160.0.0.0/5</item>

        <item>168.0.0.0/8</item>

        <item>169.0.0.0/9</item>

        <item>169.128.0.0/10</item>

        <item>169.192.0.0/11</item>

        <item>169.224.0.0/12</item>

        <item>169.240.0.0/13</item>

        <item>169.248.0.0/14</item>

        <item>169.252.0.0/15</item>

        <item>169.255.0.0/16</item>

        <item>170.0.0.0/7</item>

        <item>172.0.0.0/12</item>

        <item>172.32.0.0/11</item>

        <item>172.64.0.0/10</item>

        <item>172.128.0.0/9</item>

        <item>173.0.0.0/8</item>

        <item>174.0.0.0/9</item>

        <item>174.128.0.0/10</item>

        <item>175.0.0.0/8</item>

        <item>176.0.0.0/4</item>

        <item>192.0.0.0/9</item>

        <item>192.128.0.0/11</item>

        <item>192.160.0.0/13</item>

        <item>192.169.0.0/16</item>

        <item>192.170.0.0/15</item>

        <item>192.172.0.0/14</item>

        <item>192.176.0.0/12</item>

        <item>192.192.0.0/10</item>

        <item>193.0.0.0/8</item>

        <item>194.0.0.0/7</item>

        <item>196.0.0.0/6</item>

        <item>200.0.0.0/5</item>

        <item>208.0.0.0/11</item>

        <item>208.32.0.0/12</item>

        <item>208.48.0.0/14</item>

        <item>208.52.0.0/15</item>

        <item>208.55.0.0/16</item>

        <item>208.56.0.0/13</item>

        <item>208.64.0.0/10</item>

        <item>208.128.0.0/9</item>

        <item>209.0.0.0/8</item>

        <item>210.0.0.0/7</item>

        <item>212.0.0.0/6</item>

        <item>216.0.0.0/5</item>

        <item>240.0.0.0/5</item>

        <item>248.0.0.0/6</item>

        <item>252.0.0.0/7</item>

        <item>254.0.0.0/8</item>

        <item>255.0.0.0/9</item>

        <item>255.128.0.0/10</item>

        <item>255.192.0.0/11</item>

        <item>255.224.0.0/12</item>

        <item>255.240.0.0/13</item>

        <item>255.248.0.0/14</item>

        <item>255.252.0.0/15</item>

        <item>255.254.0.0/16</item>

        <item>255.255.0.0/17</item>

        <item>255.255.128.0/18</item>

        <item>255.255.192.0/19</item>

        <item>255.255.224.0/20</item>

        <item>255.255.240.0/21</item>

        <item>255.255.248.0/22</item>

        <item>255.255.252.0/23</item>

        <item>255.255.254.0/24</item>

        <item>255.255.255.0/25</item>

        <item>255.255.255.128/26</item>

        <item>255.255.255.192/27</item>

        <item>255.255.255.224/28</item>

        <item>255.255.255.240/29</item>

        <item>255.255.255.248/30</item>

        <item>255.255.255.252/31</item>

        <item>255.255.255.254/32</item>

    </string-array>

</resources>
 
 No newline at end of file