commit 4ab468577647d1ee73810b89d2287eaa5546fecb
author Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Thu Jan 12 16:15:06 2012 -0600
committer JP Abgrall <jpa@google.com> Wed Jan 18 12:08:18 2012 -0800
tree 13987824a6eefa7df17a4a30546ca5171553cf1c
parent 9e5e0ce62e88ddf9a09798eda51b0c270d354c8e

Add back hook for inserting OEM specific iptables rules.

The functionality was lost during merge in ICS branch.
This patch is adding back OEM iptables hook in netd.

Bug:5862460
Change-Id: I9444b8c53e8b84fea2002c2c1d9ba42e45ae5f0c

NatController.cpp

diff --git a/NatController.cpp b/NatController.cpp
index ed1b095..7f1bc60 100644
--- a/NatController.cpp
+++ b/NatController.cpp
@@ -29,6 +29,7 @@
 
 #include "NatController.h"
 #include "SecondaryTableController.h"
+#include "oem_iptables_hook.h"
 
 extern "C" int system_nosh(const char *command);
 
@@ -82,6 +83,8 @@
     runCmd(IP_PATH, "route flush cache");
 
     natCount = 0;
+
+    setupOemIptablesHook();
     return 0;
 }
 
@@ -263,13 +266,8 @@
     }
 
     if (--natCount <= 0) {
-        char bootmode[PROPERTY_VALUE_MAX] = {0};
-        property_get("ro.bootmode", bootmode, "unknown");
-        if (0 != strcmp("bp-tools", bootmode)) {
-            // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
-            setDefaults();
-        }
-        natCount = 0;
+        // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
+        setDefaults();
     }
     return 0;
 }