diff options
author | Taras Antoshchuk <tantoshchuk@google.com> | 2021-09-24 18:40:03 +0200 |
---|---|---|
committer | Taras Antoshchuk <tantoshchuk@google.com> | 2021-10-11 14:22:55 +0200 |
commit | 0cceda2d51211a6d7ee3338dd8d8e89b8bf95385 (patch) | |
tree | c23ac9f96967195c0db1ff23456157446fba4ca9 /server/RouteControllerTest.cpp | |
parent | 2b0b5ec491178708a0da8550088ba57ebe4a9a88 (diff) | |
download | netd-0cceda2d51211a6d7ee3338dd8d8e89b8bf95385.tar.gz |
Use route priority only for route cache invalidation
For routes cache invalidation we add and remove default throw routes
with low priority. Initial implementation set low priority for all
default throw routes, which didn't matter at the time, since throw
routes were not commonly used.
Now, throw routes are going to become more common (e.g. used in VPN
routing tables). This CL makes sure we only set low priority on
default throw routes if they are used for route cache invalidation.
Bug: 186082280
Test: atest NetdBinderTest
Change-Id: I4d457152c4177528ca9766a7909bc3ee51319a33
Diffstat (limited to 'server/RouteControllerTest.cpp')
-rw-r--r-- | server/RouteControllerTest.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/server/RouteControllerTest.cpp b/server/RouteControllerTest.cpp index e85a83c7..4d1da06f 100644 --- a/server/RouteControllerTest.cpp +++ b/server/RouteControllerTest.cpp @@ -80,23 +80,20 @@ TEST_F(RouteControllerTest, TestRouteFlush) { "Test table2 number too large"); EXPECT_EQ(0, modifyIpRoute(RTM_NEWROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", - "192.0.2.2/32", nullptr, 0 /* mtu */)); + "192.0.2.2/32", nullptr, 0 /* mtu */, 0 /* priority */)); EXPECT_EQ(0, modifyIpRoute(RTM_NEWROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", - "192.0.2.3/32", nullptr, 0 /* mtu */)); + "192.0.2.3/32", nullptr, 0 /* mtu */, 0 /* priority */)); EXPECT_EQ(0, modifyIpRoute(RTM_NEWROUTE, NETLINK_ROUTE_CREATE_FLAGS, table2, "lo", - "192.0.2.4/32", nullptr, 0 /* mtu */)); + "192.0.2.4/32", nullptr, 0 /* mtu */, 0 /* priority */)); EXPECT_EQ(0, flushRoutes(table1)); - EXPECT_EQ(-ESRCH, - modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", "192.0.2.2/32", - nullptr, 0 /* mtu */)); - EXPECT_EQ(-ESRCH, - modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", "192.0.2.3/32", - nullptr, 0 /* mtu */)); - EXPECT_EQ(0, - modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table2, "lo", "192.0.2.4/32", - nullptr, 0 /* mtu */)); + EXPECT_EQ(-ESRCH, modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", + "192.0.2.2/32", nullptr, 0 /* mtu */, 0 /* priority */)); + EXPECT_EQ(-ESRCH, modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table1, "lo", + "192.0.2.3/32", nullptr, 0 /* mtu */, 0 /* priority */)); + EXPECT_EQ(0, modifyIpRoute(RTM_DELROUTE, NETLINK_ROUTE_CREATE_FLAGS, table2, "lo", + "192.0.2.4/32", nullptr, 0 /* mtu */, 0 /* priority */)); } TEST_F(RouteControllerTest, TestModifyIncomingPacketMark) { |