Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/org/adblockplus/android/ProxyService.java

Issue 6006698351263744: Issue 1498 - Look for iptables on the system first (adblockplusandroid 1.2.1) (Closed)
Patch Set: Created Jan. 9, 2015, 6:46 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/org/adblockplus/android/ProxyService.java
===================================================================
--- a/src/org/adblockplus/android/ProxyService.java
+++ b/src/org/adblockplus/android/ProxyService.java
@@ -583,7 +583,12 @@
if (!RootTools.isAccessGiven())
throw new FileNotFoundException("No root access");
- File ipt = getFileStreamPath("iptables");
+ File ipt = new File("/system/bin/iptables");
Felix Dahlke 2015/01/09 18:51:59 It _seems_ like a good idea to always go for iptab
Wladimir Palant 2015/01/13 14:12:33 The concern was mostly that an unknown iptables ve
+ if (!ipt.exists())
+ {
+ Log.i(TAG, "iptables not found on the system, using embedded binary");
+ ipt = getFileStreamPath("iptables");
+ }
if (!ipt.exists())
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld