commit c1306ea230c95ef0268d4d20a213911799982671
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 27 05:52:31 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Mar 27 16:25:10 2017 +0900
tree 894faae30ed272b2339548578f44cf5fd4ea5990
parent f91e8ed5c906483348b4f00eae234825821943b1

Use iptables-restore to set the incoming packet mark rule.

This speeds up network switching because one rule needs to be
added/removed per interface.

Bug: 28362720
Test: bullhead builds, boots
Test: netd_{unit,integration}_test pass
Test: watch -n1 "adb shell iptables -v -n -t mangle -L INPUT" while switching networks
Change-Id: Ie536db6a50d018c88bb03c5f069965e99e0d162e

server/IptablesBaseTest.h

diff --git a/server/IptablesBaseTest.h b/server/IptablesBaseTest.h
index b8ce1e2..a8a511f 100644
--- a/server/IptablesBaseTest.h
+++ b/server/IptablesBaseTest.h
@@ -32,6 +32,8 @@
     static int fakeExecIptablesRestore(IptablesTarget target, const std::string& commands);
     static int fakeExecIptablesRestoreWithOutput(IptablesTarget target, const std::string& commands,
                                                  std::string *output);
+    static int fakeExecIptablesRestoreCommand(IptablesTarget target, const std::string& table,
+                                              const std::string& commands, std::string *output);
     static FILE *fake_popen(const char *cmd, const char *type);
     void expectIptablesCommands(const std::vector<std::string>& expectedCmds);
     void expectIptablesCommands(const ExpectedIptablesCommands& expectedCmds);