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

Merge branch 'fixiptables' of https://github.com/Unpublished/orbot into Unpublished-fixiptables

This commit is contained in:
Nathan Freitas 2017-01-13 22:13:10 -05:00
parent ff61d66bcf 639bc3241e
commit 970710d03c
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
orbotservice/src/main/java/org/torproject/android/service/transproxy/TorTransProxy.java
View File

@ -103,28 +103,21 @@ public class TorTransProxy implements TorServiceConstants {
private String findSystemIPTables () private String findSystemIPTables ()
{ {
if (mSysIptables != null)
{ //if the user wants us to use the built-in iptables, then we have to find it
return mSysIptables; File fileIpt = new File("/system/xbin/iptables");
}
if (fileIpt.exists())
mSysIptables = fileIpt.getAbsolutePath();
else else
{ {
//if the user wants us to use the built-in iptables, then we have to find it fileIpt = new File("/system/bin/iptables");
File fileIpt = new File("/system/xbin/iptables");
if (fileIpt.exists()) if (fileIpt.exists())
mSysIptables = fileIpt.getAbsolutePath(); mSysIptables = fileIpt.getAbsolutePath();
else
{
fileIpt = new File("/system/bin/iptables");
if (fileIpt.exists())
mSysIptables = fileIpt.getAbsolutePath();
}
} }
return mSysIptables; return mSysIptables;
} }