diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-08-24 19:21:50 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2017-08-31 16:52:45 +0900 |
| commit | 4604b4a4319fe749a812b7c32cfdd459b0f53f47 (patch) | |
| tree | 32039a750b079298a894220c1ff4d87e124ccb16 /server/ControllersTest.cpp | |
| parent | 0935339bb85483697070fc618ad1e820eb8e45aa (diff) | |
Rename natctrl_* iptables rules to tetherctrl_*
Bug: 32163131
Bug: 64995262
Test: bullhead builds and boots
Test: netd_{unit,integration}_test pass
Change-Id: Ifd20920713b2b5b9c22f4c829ef037bbac024505
Diffstat (limited to 'server/ControllersTest.cpp')
| -rw-r--r-- | server/ControllersTest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server/ControllersTest.cpp b/server/ControllersTest.cpp index 3ca5d81e..0c565948 100644 --- a/server/ControllersTest.cpp +++ b/server/ControllersTest.cpp @@ -55,12 +55,12 @@ TEST_F(ControllersTest, TestFindExistingChildChains) { "-P PREROUTING ACCEPT\n" "-A PREROUTING -j bw_raw_PREROUTING\n" "-A PREROUTING -j idletimer_raw_PREROUTING\n" - "-A PREROUTING -j natctrl_raw_PREROUTING\n" + "-A PREROUTING -j tetherctrl_raw_PREROUTING\n" ); std::set<std::string> expectedChains = { "bw_raw_PREROUTING", "idletimer_raw_PREROUTING", - "natctrl_raw_PREROUTING", + "tetherctrl_raw_PREROUTING", }; std::set<std::string> actual = findExistingChildChains(V6, "raw", "PREROUTING"); EXPECT_THAT(expectedChains, ContainerEq(actual)); @@ -88,8 +88,8 @@ TEST_F(ControllersTest, TestInitIptablesRules) { "-A FORWARD -j fw_FORWARD\n" ":bw_FORWARD -\n" "-A FORWARD -j bw_FORWARD\n" - ":natctrl_FORWARD -\n" - "-A FORWARD -j natctrl_FORWARD\n" + ":tetherctrl_FORWARD -\n" + "-A FORWARD -j tetherctrl_FORWARD\n" "COMMIT\n" }, { V4V6, "*raw\n" @@ -99,15 +99,15 @@ TEST_F(ControllersTest, TestInitIptablesRules) { "-A PREROUTING -j bw_raw_PREROUTING\n" ":idletimer_raw_PREROUTING -\n" "-A PREROUTING -j idletimer_raw_PREROUTING\n" - ":natctrl_raw_PREROUTING -\n" - "-A PREROUTING -j natctrl_raw_PREROUTING\n" + ":tetherctrl_raw_PREROUTING -\n" + "-A PREROUTING -j tetherctrl_raw_PREROUTING\n" "COMMIT\n" }, { V4V6, "*mangle\n" ":FORWARD -\n" "-F FORWARD\n" - ":natctrl_mangle_FORWARD -\n" - "-A FORWARD -j natctrl_mangle_FORWARD\n" + ":tetherctrl_mangle_FORWARD -\n" + "-A FORWARD -j tetherctrl_mangle_FORWARD\n" "COMMIT\n" }, { V4V6, "*mangle\n" @@ -129,8 +129,8 @@ TEST_F(ControllersTest, TestInitIptablesRules) { { V4, "*nat\n" ":POSTROUTING -\n" "-F POSTROUTING\n" - ":natctrl_nat_POSTROUTING -\n" - "-A POSTROUTING -j natctrl_nat_POSTROUTING\n" + ":tetherctrl_nat_POSTROUTING -\n" + "-A POSTROUTING -j tetherctrl_nat_POSTROUTING\n" "COMMIT\n" }, { V4, "*filter\n" |