Minor fixes in RouteController.
- Remove the definition of fib_rule_uid_range, since it's now in
the UAPI headers.
- Fix the comment on PRIO_THROW, which is inaccurate.
Test: bullhead builds, boots
Test: netd_{unit,integration}_test pass
Change-Id: I52ced26c4ea21925140d6ed86991e50cff7bd46a
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 26e8407..8e3a4a9 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -81,24 +81,12 @@
const char* const ROUTE_TABLE_NAME_LOCAL = "local";
const char* const ROUTE_TABLE_NAME_MAIN = "main";
-// None of our routes specify priority, which causes them to have the default
-// priority. For throw routes, we use a fixed priority of 100000. This is
-// because we use throw routes either for maximum-length routes (/32 for IPv4,
-// /128 for IPv6), which we never create with any other priority, or for
-// purposely-low-priority default routes that should never match if there is
-// any other route in the table.
+// None of our regular routes specify priority, which causes them to have the default priority.
+// For default throw routes, we use a fixed priority of 100000.
uint32_t PRIO_THROW = 100000;
const char* const RouteController::LOCAL_MANGLE_INPUT = "routectrl_mangle_INPUT";
-// These values are upstream, but not yet in our headers.
-// TODO: delete these definitions when updating the headers.
-const uint16_t FRA_UID_RANGE = 20;
-struct fib_rule_uid_range {
- __u32 start;
- __u32 end;
-};
-
const uint8_t AF_FAMILIES[] = {AF_INET, AF_INET6};
const uid_t UID_ROOT = 0;