Merge "WakeupController - improve iptables command legibility"

2 files changed, 17 insertions, 13 deletions

diff --git a/server/WakeupController.cpp b/server/WakeupController.cpp
index eb36291c..be9c9e06 100644
--- a/server/WakeupController.cpp
+++ b/server/WakeupController.cpp
@@ -205,14 +205,14 @@ Status WakeupController::execIptables(const std::string& action, const std::stri
                                       const std::string& prefix, uint32_t mark, uint32_t mask) {
     // NFLOG messages to batch before releasing to userspace
     constexpr int kBatch = 8;
-    // Max log message rate in packets/second
-    constexpr int kRateLimit = 10;
     const char kFormat[] =
-        "*mangle\n%s %s -i %s -j NFLOG --nflog-prefix %s --nflog-group %d --nflog-threshold %d"
-        " -m mark --mark 0x%08x/0x%08x -m limit --limit %d/s\nCOMMIT\n";
-    const auto cmd = StringPrintf(
-            kFormat, action.c_str(), WakeupController::LOCAL_MANGLE_INPUT, ifName.c_str(),
-            prefix.c_str(), NetlinkManager::NFLOG_WAKEUP_GROUP, kBatch, mark, mask, kRateLimit);
+        "*mangle\n"
+        "%s %s -i %s -m mark --mark 0x%08x/0x%08x -m limit --limit 10/s"
+        " -j NFLOG --nflog-prefix %s --nflog-group %d --nflog-threshold %d\n"
+        "COMMIT\n";
+    const auto cmd = StringPrintf(kFormat,
+            action.c_str(), WakeupController::LOCAL_MANGLE_INPUT, ifName.c_str(), mark, mask,
+            prefix.c_str(), NetlinkManager::NFLOG_WAKEUP_GROUP, kBatch);
 
     std::string out;
     auto rv = mIptables->execute(V4V6, cmd, &out);
diff --git a/server/WakeupControllerTest.cpp b/server/WakeupControllerTest.cpp
index ff99b987..6ef49005 100644
--- a/server/WakeupControllerTest.cpp
+++ b/server/WakeupControllerTest.cpp
@@ -287,9 +287,11 @@ TEST_F(WakeupControllerTest, addInterface) {
     const uint32_t kMark = 0x12345678;
     const uint32_t kMask = 0x0F0F0F0F;
     const char kExpected[] =
-        "*mangle\n-A wakeupctrl_mangle_INPUT -i test:prefix"
-        " -j NFLOG --nflog-prefix wlan8 --nflog-group 3 --nflog-threshold 8"
-        " -m mark --mark 0x12345678/0x0f0f0f0f -m limit --limit 10/s\nCOMMIT\n";
+        "*mangle\n"
+        "-A wakeupctrl_mangle_INPUT -i test:prefix"
+        " -m mark --mark 0x12345678/0x0f0f0f0f -m limit --limit 10/s"
+        " -j NFLOG --nflog-prefix wlan8 --nflog-group 3 --nflog-threshold 8\n"
+        "COMMIT\n";
     EXPECT_CALL(mIptables, execute(V4V6, kExpected, _)).WillOnce(Return(0));
     EXPECT_OK(mController.addInterface(kPrefix, kIfName, kMark, kMask));
 }
@@ -300,9 +302,11 @@ TEST_F(WakeupControllerTest, delInterface) {
     const uint32_t kMark = 0x12345678;
     const uint32_t kMask = 0xF0F0F0F0;
     const char kExpected[] =
-        "*mangle\n-D wakeupctrl_mangle_INPUT -i test:prefix"
-        " -j NFLOG --nflog-prefix wlan8 --nflog-group 3 --nflog-threshold 8"
-        " -m mark --mark 0x12345678/0xf0f0f0f0 -m limit --limit 10/s\nCOMMIT\n";
+        "*mangle\n"
+        "-D wakeupctrl_mangle_INPUT -i test:prefix"
+        " -m mark --mark 0x12345678/0xf0f0f0f0 -m limit --limit 10/s"
+        " -j NFLOG --nflog-prefix wlan8 --nflog-group 3 --nflog-threshold 8\n"
+        "COMMIT\n";
     EXPECT_CALL(mIptables, execute(V4V6, kExpected, _)).WillOnce(Return(0));
     EXPECT_OK(mController.delInterface(kPrefix, kIfName, kMark, kMask));
 }