commit 7d8eea24b18d6f1560bddf25d11ab228dedea408 Author: Nathan Freitas nathan@freitas.net Date: Thu Apr 9 09:10:14 2015 -0400

switch back to DNS on 10.0.0.1, update after VPN refresh --- src/org/torproject/android/service/TorService.java | 8 +++++++- src/org/torproject/android/vpn/OrbotVpnService.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index bb2a31d..fb1ac63 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1477,6 +1477,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Intent intent = new Intent(TorService.this, OrbotVpnService.class); intent.setAction("refresh"); startService(intent); + + updateConfiguration("DNSListenAddress","10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); + updateConfiguration("DisableNetwork","0", false); + + saveConfiguration(); + // conn.setConf("DisableNetwork", "0"); } @@ -2477,7 +2483,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon

if (mUseVPN) { - // updateConfiguration("DNSListenAddress","10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); + updateConfiguration("DNSListenAddress","10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); }

updateConfiguration("DisableNetwork","0", false); diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index cf3a9d1..bc06f43 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -241,7 +241,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { final String virtualIP = "10.0.0.2"; final String virtualNetMask = "255.255.255.0"; final String localSocks = "127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT; - final String localDNS = "127.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; + final String localDNS = "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; Builder builder = new Builder();