commit e408f886c538af6b90bb5d9fa5350ec09731f561
author Maciej Żenczykowski <maze@google.com> Thu May 28 03:22:23 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Thu May 28 03:54:07 2020 +0000
tree c6b1d8591b32e81bb5a95cefa1d3561beea29f43
parent 75d7590ff70535de133c11016fbf2e1aa92ff250

BandwidthController - fix typo: owner-uid --> uid-owner

Test: rules actually load
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I67ea962bb0ebd9b3b3ced23010e4fd8dfc8d6931
Merged-In: I67ea962bb0ebd9b3b3ced23010e4fd8dfc8d6931

server/BandwidthController.cpp

diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index cbf42b3..d746027 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -271,7 +271,7 @@
             StringPrintf("-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x%x", uidBillingMask),
             // Packets from the clat daemon have already been counted on egress through the
             // stacked v4-* interface.
-            "-A bw_mangle_POSTROUTING -m owner --owner-uid clat -j RETURN",
+            "-A bw_mangle_POSTROUTING -m owner --uid-owner clat -j RETURN",
             // This is egress interface accounting: we account 464xlat traffic only on
             // the clat interface (as offloaded packets never hit base interface's ip6tables)
             // and later sum base and stacked with overhead (+20B/pkt) in higher layers

server/BandwidthControllerTest.cpp

diff --git a/server/BandwidthControllerTest.cpp b/server/BandwidthControllerTest.cpp
index ebc72d8..20a57dd 100644
--- a/server/BandwidthControllerTest.cpp
+++ b/server/BandwidthControllerTest.cpp
@@ -77,7 +77,7 @@
         "-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 -j MARK --set-mark 0x0/0x100000\n"
-        "-A bw_mangle_POSTROUTING -m owner --owner-uid clat -j RETURN\n"
+        "-A bw_mangle_POSTROUTING -m owner --uid-owner clat -j RETURN\n"
         "-A bw_mangle_POSTROUTING -m owner --socket-exists\n"
         "COMMIT\n";
 
@@ -110,7 +110,7 @@
         "-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 -j MARK --set-mark 0x0/0x100000\n"
-        "-A bw_mangle_POSTROUTING -m owner --owner-uid clat -j RETURN\n" +
+        "-A bw_mangle_POSTROUTING -m owner --uid-owner clat -j RETURN\n" +
         StringPrintf("-A bw_mangle_POSTROUTING -m bpf --object-pinned %s\n",
                      XT_BPF_EGRESS_PROG_PATH) +
         "COMMIT\n";