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

make sure Tor path link is cleanly setup and chmod'd

This commit is contained in:
Nathan Freitas 2014-01-15 00:33:51 -05:00
parent e55f724b00
commit 3b9d6c8eaa
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,22 +512,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst
else else
{ {
StringBuilder log = new StringBuilder();
String[] cmdDel = { SHELL_CMD_RM + ' ' + fileTorLink.getAbsolutePath() };
int errCode = TorServiceUtils.doShellCommand(cmdDel,log, false, true);
logNotice("link RM err=" + errCode + " out: " + log.toString());
if (fileTorLink.exists()) log = new StringBuilder();
{
StringBuilder log = new StringBuilder();
String[] cmdDel = { "rm " + fileTorLink.getAbsolutePath() };
int errCode = TorServiceUtils.doShellCommand(cmdDel,log, false, true);
logNotice("link RM err=" + errCode + " out: " + log.toString());
}
StringBuilder log = new StringBuilder();
String[] cmd = { SHELL_CMD_LINK + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() }; String[] cmd = { SHELL_CMD_LINK + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() };
int errCode = TorServiceUtils.doShellCommand(cmd,log, false, true); errCode = TorServiceUtils.doShellCommand(cmd,log, false, true);
logNotice("link LN err=" + errCode + " out: " + log.toString()); logNotice("link LN err=" + errCode + " out: " + log.toString());
enableBinExec(fileTorOrig); enableBinExec(fileTorOrig);
enableBinExec(fileTorLink);
enableBinExec(filePrivoxy); enableBinExec(filePrivoxy);
enableBinExec(fileObfsProxy); enableBinExec(fileObfsProxy);
enableBinExec(fileXtables); enableBinExec(fileXtables);