dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't stop tor when service onStartCommand() is called again

This commit is contained in:
Nathan Freitas 2014-06-11 20:24:32 -04:00
parent fc6392932f
commit 42e069800a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/torproject/android/service/TorService.java
View File

@ -553,8 +553,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
logNotice("checking binary version: " + version); logNotice("checking binary version: " + version);
stopTor();
TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome);
@ -676,14 +674,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst
} }
logMessage ("Transparent Proxying: updating Tor settings...");
mBinder.updateConfiguration("TransPort","9040",false);
mBinder.updateConfiguration("DNSPort","5400",false);
mBinder.updateConfiguration("VirtualAddrNetwork","10.192.0.0/10",false);
mBinder.updateConfiguration("AutomapHostsOnResolve","1",false);
mBinder.saveConfiguration();
logMessage ("Transparent Proxying: enabling...");
//TODO: Find a nice place for the next (commented) line //TODO: Find a nice place for the next (commented) line
//TorTransProxy.setDNSProxying(); //TorTransProxy.setDNSProxying();
int code = 0; // Default state is "okay" int code = 0; // Default state is "okay"
logMessage ("Transparent Proxying: clearing existing rules...");
//clear rules first //clear rules first
mTransProxy.clearTransparentProxyingAll(this); mTransProxy.clearTransparentProxyingAll(this);