diff options
Diffstat (limited to 'server/InterfaceController.cpp')
| -rw-r--r-- | server/InterfaceController.cpp | 140 |
1 files changed, 85 insertions, 55 deletions
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp index 76f5e05d..3882bccf 100644 --- a/server/InterfaceController.cpp +++ b/server/InterfaceController.cpp @@ -27,16 +27,61 @@ #include "InterfaceController.h" #include "RouteController.h" -using android::base::ReadFileToString; using android::base::StringPrintf; using android::base::WriteStringToFile; +namespace { + const char ipv6_proc_path[] = "/proc/sys/net/ipv6/conf"; +const char ipv4_neigh_conf_dir[] = "/proc/sys/net/ipv4/neigh"; + +const char ipv6_neigh_conf_dir[] = "/proc/sys/net/ipv6/neigh"; + const char sys_net_path[] = "/sys/class/net"; const char wl_util_path[] = "/system/xbin/wlutil"; +bool isInterfaceName(const char *name) { + return strcmp(name, ".") && + strcmp(name, "..") && + strcmp(name, "default") && + strcmp(name, "all"); +} + +int writeValueToPath( + const char* dirname, const char* subdirname, const char* basename, + const char* value) { + std::string path(StringPrintf("%s/%s/%s", dirname, subdirname, basename)); + return WriteStringToFile(value, path) ? 0 : -1; +} + +void setOnAllInterfaces(const char* dirname, const char* basename, const char* value) { + // Set the default value, which is used by any interfaces that are created in the future. + writeValueToPath(dirname, "default", basename, value); + + // Set the value on all the interfaces that currently exist. + DIR* dir = opendir(dirname); + if (!dir) { + ALOGE("Can't list %s: %s", dirname, strerror(errno)); + return; + } + dirent* d; + while ((d = readdir(dir))) { + if ((d->d_type != DT_DIR) || !isInterfaceName(d->d_name)) { + continue; + } + writeValueToPath(dirname, d->d_name, basename, value); + } + closedir(dir); +} + +void setIPv6UseOutgoingInterfaceAddrsOnly(const char *value) { + setOnAllInterfaces(ipv6_proc_path, "use_oif_addrs_only", value); +} + +} // namespace + InterfaceController::InterfaceController() { // Initial IPv6 settings. // By default, accept_ra is set to 1 (accept RAs unless forwarding is on) on all interfaces. @@ -49,32 +94,38 @@ InterfaceController::InterfaceController() { // Enable optimistic DAD for IPv6 addresses on all interfaces. setIPv6OptimisticMode("1"); -} -InterfaceController::~InterfaceController() { + // Reduce the ARP/ND base reachable time from the default (30sec) to 15sec. + setBaseReachableTimeMs(15 * 1000); + + // When sending traffic via a given interface use only addresses configured + // on that interface as possible source addresses. + setIPv6UseOutgoingInterfaceAddrsOnly("1"); } -int InterfaceController::writeIPv6ProcPath(const char *interface, const char *setting, const char *value) { - if (!isIfaceName(interface)) { - errno = ENOENT; - return -1; - } - std::string path(StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting)); - return WriteStringToFile(value, path); +InterfaceController::~InterfaceController() { } int InterfaceController::setEnableIPv6(const char *interface, const int on) { - // When disable_ipv6 changes from 1 to 0, the kernel starts autoconf. - // When disable_ipv6 changes from 0 to 1, the kernel clears all autoconf - // addresses and routes and disables IPv6 on the interface. - const char *disable_ipv6 = on ? "0" : "1"; - return writeIPv6ProcPath(interface, "disable_ipv6", disable_ipv6); + if (!isIfaceName(interface)) { + errno = ENOENT; + return -1; + } + // When disable_ipv6 changes from 1 to 0, the kernel starts autoconf. + // When disable_ipv6 changes from 0 to 1, the kernel clears all autoconf + // addresses and routes and disables IPv6 on the interface. + const char *disable_ipv6 = on ? "0" : "1"; + return writeValueToPath(ipv6_proc_path, interface, "disable_ipv6", disable_ipv6); } int InterfaceController::setIPv6PrivacyExtensions(const char *interface, const int on) { - // 0: disable IPv6 privacy addresses - // 0: enable IPv6 privacy addresses and prefer them over non-privacy ones. - return writeIPv6ProcPath(interface, "use_tempaddr", on ? "2" : "0"); + if (!isIfaceName(interface)) { + errno = ENOENT; + return -1; + } + // 0: disable IPv6 privacy addresses + // 0: enable IPv6 privacy addresses and prefer them over non-privacy ones. + return writeValueToPath(ipv6_proc_path, interface, "use_tempaddr", on ? "2" : "0"); } // Enables or disables IPv6 ND offload. This is useful for 464xlat on wifi, IPv6 tethering, and @@ -100,34 +151,8 @@ int InterfaceController::setIPv6NdOffload(char* interface, const int on) { } } -int InterfaceController::isInterfaceName(const char *name) { - return strcmp(name, ".") && - strcmp(name, "..") && - strcmp(name, "default") && - strcmp(name, "all"); -} - -void InterfaceController::setOnAllInterfaces(const char* filename, const char* value) { - // Set the default value, which is used by any interfaces that are created in the future. - writeIPv6ProcPath("default", filename, value); - - // Set the value on all the interfaces that currently exist. - DIR* dir = opendir(ipv6_proc_path); - if (!dir) { - ALOGE("Can't list %s: %s", ipv6_proc_path, strerror(errno)); - return; - } - dirent* d; - while ((d = readdir(dir))) { - if (d->d_type == DT_DIR && isInterfaceName(d->d_name)) { - writeIPv6ProcPath(d->d_name, filename, value); - } - } - closedir(dir); -} - void InterfaceController::setAcceptRA(const char *value) { - setOnAllInterfaces("accept_ra", value); + setOnAllInterfaces(ipv6_proc_path, "accept_ra", value); } // |tableOrOffset| is interpreted as: @@ -137,21 +162,26 @@ 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(StringPrintf("%d", tableOrOffset)); - setOnAllInterfaces("accept_ra_rt_table", value.c_str()); + std::string value(StringPrintf("%d", tableOrOffset)); + setOnAllInterfaces(ipv6_proc_path, "accept_ra_rt_table", value.c_str()); } int InterfaceController::setMtu(const char *interface, const char *mtu) { - if (!isIfaceName(interface)) { - errno = ENOENT; - return -1; - } - std::string path(StringPrintf("%s/%s/mtu", sys_net_path, interface)); - return WriteStringToFile(mtu, path); + if (!isIfaceName(interface)) { + errno = ENOENT; + return -1; + } + return writeValueToPath(sys_net_path, interface, "mtu", mtu); +} + +void InterfaceController::setBaseReachableTimeMs(unsigned int millis) { + std::string value(StringPrintf("%u", millis)); + setOnAllInterfaces(ipv4_neigh_conf_dir, "base_reachable_time_ms", value.c_str()); + setOnAllInterfaces(ipv6_neigh_conf_dir, "base_reachable_time_ms", value.c_str()); } void InterfaceController::setIPv6OptimisticMode(const char *value) { - setOnAllInterfaces("optimistic_dad", value); - setOnAllInterfaces("use_optimistic", value); + setOnAllInterfaces(ipv6_proc_path, "optimistic_dad", value); + setOnAllInterfaces(ipv6_proc_path, "use_optimistic", value); } |