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

fix variable name to obfsclient

This commit is contained in:
Nathan Freitas 2014-04-24 12:35:52 -04:00
parent 2f7a9dd052
commit a4d8669cc2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
private File fileTor; private File fileTor;
private File filePrivoxy; private File filePrivoxy;
private File fileObfsProxy; private File fileObfsclient;
private File fileXtables; private File fileXtables;
private File fileTorRc; private File fileTorRc;
@ -494,10 +494,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
shell.add(killCommand); shell.add(killCommand);
} }
while ((procId = TorServiceUtils.findProcessId(fileObfsProxy.getAbsolutePath())) != -1) while ((procId = TorServiceUtils.findProcessId(fileObfsclient.getAbsolutePath())) != -1)
{ {
logNotice("Found ObfsProxy PID=" + procId + " - killing now..."); logNotice("Found fileObfsclient PID=" + procId + " - killing now...");
SimpleCommand killCommand = new SimpleCommand("toolbox kill " + procId); SimpleCommand killCommand = new SimpleCommand("toolbox kill " + procId);
shell.add(killCommand); shell.add(killCommand);
@ -532,7 +532,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY);
fileObfsProxy = new File(appBinHome, OBFSCLIENT_ASSET_KEY); fileObfsclient = new File(appBinHome, OBFSCLIENT_ASSET_KEY);
fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); fileTorRc = new File(appBinHome, TORRC_ASSET_KEY);
@ -626,7 +626,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
enableBinExec(fileTor); enableBinExec(fileTor);
enableBinExec(filePrivoxy); enableBinExec(filePrivoxy);
enableBinExec(fileObfsProxy); enableBinExec(fileObfsclient);
enableBinExec(fileXtables); enableBinExec(fileXtables);
updateSettings (); updateSettings ();
@ -1726,7 +1726,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
if (obfsBridges) if (obfsBridges)
{ {
mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec " + fileObfsProxy.getAbsolutePath() + " --managed", false); mBinder.updateConfiguration("ClientTransportPlugin","obfsclient exec " + fileObfsclient.getAbsolutePath() + " --managed", false);
} }
mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false);