diff options
author | Dan Albert <danalbert@google.com> | 2015-03-16 10:05:59 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2015-03-16 10:28:34 -0700 |
commit | f503e130eb9b3592dc1d2755fd169d73df0e79d0 (patch) | |
tree | 6ca19120267ce67ed67265dab49feac7e81825bc /server/InterfaceController.cpp | |
parent | afd4037d7d7802d2ecc0494901ac17134a27aa1f (diff) | |
download | android_system_netd-f503e130eb9b3592dc1d2755fd169d73df0e79d0.tar.gz android_system_netd-f503e130eb9b3592dc1d2755fd169d73df0e79d0.tar.bz2 android_system_netd-f503e130eb9b3592dc1d2755fd169d73df0e79d0.zip |
Revert "Revert "Update for libbase.""
This reverts commit 4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
Change-Id: Idd2947bbdaef267ffd68179b4d3fe267870b9de4
Diffstat (limited to 'server/InterfaceController.cpp')
-rw-r--r-- | server/InterfaceController.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp index 6855bdf7..ea7afb2e 100644 --- a/server/InterfaceController.cpp +++ b/server/InterfaceController.cpp @@ -19,14 +19,17 @@ #include <malloc.h> #define LOG_TAG "InterfaceController" +#include <base/file.h> +#include <base/stringprintf.h> #include <cutils/log.h> #include <logwrap/logwrap.h> -#include <utils/file.h> -#include <utils/stringprintf.h> #include "InterfaceController.h" #include "RouteController.h" +using android::base::StringPrintf; +using android::base::WriteStringToFile; + const char ipv6_proc_path[] = "/proc/sys/net/ipv6/conf"; const char sys_net_path[] = "/sys/class/net"; @@ -55,8 +58,8 @@ int InterfaceController::writeIPv6ProcPath(const char *interface, const char *se errno = ENOENT; return -1; } - std::string path(android::StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting)); - return android::WriteStringToFile(value, path); + std::string path(StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting)); + return WriteStringToFile(value, path); } int InterfaceController::setEnableIPv6(const char *interface, const int on) { @@ -133,7 +136,7 @@ void InterfaceController::setAcceptRA(const char *value) { // ID to get the table. If it's set to -1000, routes from interface ID 5 will go into // table 1005, etc. void InterfaceController::setAcceptRARouteTable(int tableOrOffset) { - std::string value(android::StringPrintf("%d", tableOrOffset)); + std::string value(StringPrintf("%d", tableOrOffset)); setOnAllInterfaces("accept_ra_rt_table", value.c_str()); } @@ -143,8 +146,8 @@ int InterfaceController::setMtu(const char *interface, const char *mtu) errno = ENOENT; return -1; } - std::string path(android::StringPrintf("%s/%s/mtu", sys_net_path, interface)); - return android::WriteStringToFile(mtu, path); + std::string path(StringPrintf("%s/%s/mtu", sys_net_path, interface)); + return WriteStringToFile(mtu, path); } void InterfaceController::setIPv6OptimisticMode(const char *value) { |