commit 94b2ab92f6e886d24092781159714be75c9f3954
author Paul Jensen <pauljensen@google.com> Tue Aug 04 10:35:05 2015 -0400
committer Paul Jensen <pauljensen@google.com> Tue Aug 04 10:38:17 2015 -0400
tree 218abefc5cb70e571e1db204d167e80b4d3c4630
parent cea2d3455eb7c0d9ad1430607cbe98cc09251c1f

Make netd calls to iptables wait for xtables lock

Without this wait iptables commands can fail with various unpleasant
consequences like Log.wtf() or missing iptables rules.  The most
critical calls to iptables in NetdConstants.cpp already wait for the
lock.

Bug:22802665
Change-Id: I7d542c3d4f0e005618e368da674159b90d652c8a

server/oem_iptables_hook.cpp

diff --git a/server/oem_iptables_hook.cpp b/server/oem_iptables_hook.cpp
index 70260f3..7e4b3cb 100644
--- a/server/oem_iptables_hook.cpp
+++ b/server/oem_iptables_hook.cpp
@@ -37,6 +37,7 @@
 static bool oemCleanupHooks() {
     const char *cmd1[] = {
             IPTABLES_PATH,
+            "-w",
             "-F",
             "oem_out"
     };
@@ -44,6 +45,7 @@
 
     const char *cmd2[] = {
             IPTABLES_PATH,
+            "-w",
             "-F",
             "oem_fwd"
     };
@@ -51,6 +53,7 @@
 
     const char *cmd3[] = {
             IPTABLES_PATH,
+            "-w",
             "-t",
             "nat",
             "-F",