commit 75d7590ff70535de133c11016fbf2e1aa92ff250
author Maciej Żenczykowski <maze@google.com> Wed May 27 23:03:41 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Wed May 27 23:28:36 2020 +0000
tree 30dddab6455306fbcd07234521a507f62c820f83
parent 16723c37e53bd8ea1c7b6dd9f9fe8df0edf6791d

BandwidthController - don't collect egress interface stats from clatd

While we're at it we also add some hopefully useful comments.

Test: atest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If20ff6949fd86591d882b63d012978db53737c7c
Merged-In: If20ff6949fd86591d882b63d012978db53737c7c

server/BandwidthControllerTest.cpp

diff --git a/server/BandwidthControllerTest.cpp b/server/BandwidthControllerTest.cpp
index 0966b7f..ebc72d8 100644
--- a/server/BandwidthControllerTest.cpp
+++ b/server/BandwidthControllerTest.cpp
@@ -76,9 +76,9 @@
         "*mangle\n"
         "-A bw_mangle_POSTROUTING -o ipsec+ -j RETURN\n"
         "-A bw_mangle_POSTROUTING -m policy --pol ipsec --dir out -j RETURN\n"
-        "-A bw_mangle_POSTROUTING -m owner --socket-exists\n"
         "-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x100000\n"
-        "\n"
+        "-A bw_mangle_POSTROUTING -m owner --owner-uid clat -j RETURN\n"
+        "-A bw_mangle_POSTROUTING -m owner --socket-exists\n"
         "COMMIT\n";
 
 const std::string ACCOUNT_RULES_WITH_BPF =
@@ -109,8 +109,8 @@
         "*mangle\n"
         "-A bw_mangle_POSTROUTING -o ipsec+ -j RETURN\n"
         "-A bw_mangle_POSTROUTING -m policy --pol ipsec --dir out -j RETURN\n"
-        "\n"
-        "-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x100000\n" +
+        "-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x100000\n"
+        "-A bw_mangle_POSTROUTING -m owner --owner-uid clat -j RETURN\n" +
         StringPrintf("-A bw_mangle_POSTROUTING -m bpf --object-pinned %s\n",
                      XT_BPF_EGRESS_PROG_PATH) +
         "COMMIT\n";