commit 458f318280c3b98d84958c63899c949c71612b1a
author JP Abgrall <jpa@google.com> Tue Apr 24 21:30:43 2012 -0700
committer JP Abgrall <jpa@google.com> Tue Apr 24 21:30:43 2012 -0700
tree e233b9437cb2fb2ac80a9d11f28641e603905f02
parent 73be1adb3b1a63185b97ecc9c61ae75a7994ee86

netd: NatController: don't setup iptables hooks in constructor.

iptables top-level chain updates should happen within CommandListener()
when it invokes the various modules' setupIptablesHooks().
And remove the extra DROP rule.


Change-Id: I33d2cfbd5444516f855ff85152c472352944cc77

NatController.cpp

diff --git a/NatController.cpp b/NatController.cpp
index db96ed3..77c4874 100644
--- a/NatController.cpp
+++ b/NatController.cpp
@@ -37,9 +37,6 @@
 
 NatController::NatController(SecondaryTableController *ctrl) {
     secondaryTableCtrl = ctrl;
-
-    setupIptablesHooks();
-    setDefaults();
 }
 
 NatController::~NatController() {
@@ -88,6 +85,7 @@
     if (runCmd(IPTABLES_PATH, "-t nat -A POSTROUTING -j natctrl_nat_POSTROUTING"))
         return -1;
 
+    setDefaults();
     return 0;
 }
 
@@ -232,10 +230,6 @@
         return -1;
     }
 
-    snprintf(cmd, sizeof(cmd), "-%s natctrl_FORWARD -j DROP", (add ? "A" : "D"),
-            intIface, extIface);
-    runCmd(IPTABLES_PATH, cmd);
-
     return 0;
 }