commit 5ca8e80c573b4bc6845d3ea10adc05806c4dec3f
author Rubin Xu <rubinxu@google.com> Fri Apr 05 11:50:32 2019 +0100
committer Rubin Xu <rubinxu@google.com> Thu Apr 11 16:01:10 2019 +0100
tree 4a78d9effd3b172c4578dcfad045cc35fbef77db
parent ec27ff2610dc4f3db5f5b40131737cb6d93b6552

Rename replaceUidsInMap, addMatch and removeMatch

Bug: 114231106
Test: system/netd/tests/runtests.sh
Change-Id: If9c3a53a5046597f95fcf289d06db1bcd0df209c

server/TrafficController.h

diff --git a/server/TrafficController.h b/server/TrafficController.h
index 454712b..cd4f88d 100644
--- a/server/TrafficController.h
+++ b/server/TrafficController.h
@@ -104,7 +104,7 @@
 
     void dump(netdutils::DumpWriter& dw, bool verbose);
 
-    netdutils::Status replaceUidsInMap(UidOwnerMatchType match, const std::vector<int32_t>& uids);
+    netdutils::Status replaceRulesInMap(UidOwnerMatchType match, const std::vector<int32_t>& uids);
 
     netdutils::Status addUidInterfaceRules(const int ifIndex, const std::vector<int32_t>& uids);
     netdutils::Status removeUidInterfaceRules(const std::vector<int32_t>& uids);
@@ -200,12 +200,11 @@
 
     std::unique_ptr<NetlinkListenerInterface> mSkDestroyListener;
 
-    netdutils::Status removeMatch(BpfMap<uint32_t, UidOwnerValue>& map, uint32_t uid,
-                                  UidOwnerMatchType match) REQUIRES(mOwnerMatchMutex);
+    netdutils::Status removeRule(BpfMap<uint32_t, UidOwnerValue>& map, uint32_t uid,
+                                 UidOwnerMatchType match) REQUIRES(mOwnerMatchMutex);
 
-    netdutils::Status addMatch(BpfMap<uint32_t, UidOwnerValue>& map, uint32_t uid,
-                               UidOwnerMatchType match, uint32_t iif = 0)
-            REQUIRES(mOwnerMatchMutex);
+    netdutils::Status addRule(BpfMap<uint32_t, UidOwnerValue>& map, uint32_t uid,
+                              UidOwnerMatchType match, uint32_t iif = 0) REQUIRES(mOwnerMatchMutex);
 
     bpf::BpfLevel mBpfLevel;