commit 4604b4a4319fe749a812b7c32cfdd459b0f53f47
author Lorenzo Colitti <lorenzo@google.com> Thu Aug 24 19:21:50 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Aug 31 16:52:45 2017 +0900
tree 32039a750b079298a894220c1ff4d87e124ccb16
parent 0935339bb85483697070fc618ad1e820eb8e45aa

Rename natctrl_* iptables rules to tetherctrl_*

Bug: 32163131
Bug: 64995262
Test: bullhead builds and boots
Test: netd_{unit,integration}_test pass
Change-Id: Ifd20920713b2b5b9c22f4c829ef037bbac024505

server/TetherController.h

diff --git a/server/TetherController.h b/server/TetherController.h
index b0da5bf..e202f2b 100644
--- a/server/TetherController.h
+++ b/server/TetherController.h
@@ -138,11 +138,11 @@
                                     TetherStatsList& statsList, const std::string& iptOutput,
                                     std::string &extraProcessingInfo);
 
-    static constexpr const char* LOCAL_FORWARD               = "natctrl_FORWARD";
-    static constexpr const char* LOCAL_MANGLE_FORWARD        = "natctrl_mangle_FORWARD";
-    static constexpr const char* LOCAL_NAT_POSTROUTING       = "natctrl_nat_POSTROUTING";
-    static constexpr const char* LOCAL_RAW_PREROUTING        = "natctrl_raw_PREROUTING";
-    static constexpr const char* LOCAL_TETHER_COUNTERS_CHAIN = "natctrl_tether_counters";
+    static constexpr const char* LOCAL_FORWARD               = "tetherctrl_FORWARD";
+    static constexpr const char* LOCAL_MANGLE_FORWARD        = "tetherctrl_mangle_FORWARD";
+    static constexpr const char* LOCAL_NAT_POSTROUTING       = "tetherctrl_nat_POSTROUTING";
+    static constexpr const char* LOCAL_RAW_PREROUTING        = "tetherctrl_raw_PREROUTING";
+    static constexpr const char* LOCAL_TETHER_COUNTERS_CHAIN = "tetherctrl_counters";
 
 private:
     bool setIpFwdEnabled();