diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-12-09 11:04:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-09 11:04:38 +0000 |
| commit | 13a592453d95a63f64ca325931f645f9d9be1d68 (patch) | |
| tree | b0de56db31cfdec335e638e24f70a58f15d82efd /server/NetworkController.cpp | |
| parent | ca6500128983169494a3defdd3a6acaf2e3332c5 (diff) | |
| parent | 5851b0354406e28993ee18ff37364b70ec474a84 (diff) | |
Merge "[NETD-TC#9] Clean up dependency between InterfaceController and TrafficController."
Diffstat (limited to 'server/NetworkController.cpp')
| -rw-r--r-- | server/NetworkController.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp index 827aa4fa..fa6948c9 100644 --- a/server/NetworkController.cpp +++ b/server/NetworkController.cpp @@ -42,11 +42,13 @@ #include "UnreachableNetwork.h" #include "VirtualNetwork.h" #include "netdutils/DumpWriter.h" +#include "netdutils/Utils.h" #include "netid_client.h" #define DBG 0 using android::netdutils::DumpWriter; +using android::netdutils::getIfaceNames; namespace android::net { @@ -150,7 +152,7 @@ NetworkController::NetworkController() : // TODO: perhaps only remove the clsact on the interface which is added by // RouteController::addInterfaceToPhysicalNetwork. Currently, the netd only // attach the clsact to the interface for the physical network. - const auto& ifaces = InterfaceController::getIfaceNames(); + const auto& ifaces = getIfaceNames(); if (isOk(ifaces)) { for (const std::string& iface : ifaces.value()) { if (int ifIndex = if_nametoindex(iface.c_str())) { |