Issue 1498 - Look for iptables on the system first (adblockplusandroid 1.2.1)

src/org/adblockplus/android/ProxyService.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 565 matching lines @@
    * Initializes iptables executable.
    *
    * @throws FileNotFoundException
    *           If iptables initialization failed due to provided reasons.
    */
   private void initIptables() throws IOException, RootToolsException, TimeoutException, FileNotFoundException
   {
     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 iptables on the system, if it
exists. However, I never had anything to do with the iptables business in ABP
for Android, and I'd really like your opinion here, Wladimir. Do older Android
versions also have an iptables executable, one we couldn't use?

[Wladimir Palant, 2015/01/13 14:12:33]

The concern was mostly that an unknown iptables version might have different
parameters. However, that doesn't seem to be very likely.
The question is rather: do newer Android versions? Back when this code was
introduced, iptables was occasionally installed by the hardware vendor or
rooting toolkit - but it wasn't part of the regular Android setup.

+    if (!ipt.exists())
+    {
+      Log.i(TAG, "iptables not found on the system, using embedded binary");
+      ipt = getFileStreamPath("iptables");
+    }
 
     if (!ipt.exists())
     {
       Log.e(TAG, "No iptables excutable found");
       throw new FileNotFoundException("No iptables executable");
     }
 
     String path = ipt.getAbsolutePath();
 
     RootTools.sendShell("chmod 700 " + path, DEFAULT_TIMEOUT);
@@ skipping 327 matching lines @@
     @Override
     public void log(int level, Object obj, String message)
     {
       if (level <= logLevel)
       {
         Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
       }
     }
   }
 }