From 469fc99188aacdad26e15949b1e17d2114f50561 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Fri, 4 Feb 2022 10:55:24 -0800 Subject: Enable different interface for fastboot for cf Bug: 209707539 Test: fastboot -s tcp:$local_link_addr%cvd-ebr getvar all Change-Id: If58b7d99156bb16b876239ad0b71e2317a24f790 --- recovery_ui/ethernet_device.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'recovery_ui/ethernet_device.cpp') diff --git a/recovery_ui/ethernet_device.cpp b/recovery_ui/ethernet_device.cpp index d79f41dec..0318db853 100644 --- a/recovery_ui/ethernet_device.cpp +++ b/recovery_ui/ethernet_device.cpp @@ -30,10 +30,12 @@ #include "recovery_ui/ethernet_device.h" #include "recovery_ui/ethernet_ui.h" -const std::string EthernetDevice::interface = "eth0"; +// Android TV defaults to eth0 for it's interface +EthernetDevice::EthernetDevice(EthernetRecoveryUI* ui) : EthernetDevice(ui, "eth0") {} -EthernetDevice::EthernetDevice(EthernetRecoveryUI* ui) - : Device(ui), ctl_sock_(socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) { +// Allow future users to define the interface as they prefer +EthernetDevice::EthernetDevice(EthernetRecoveryUI* ui, std::string interface) + : Device(ui), ctl_sock_(socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)), interface_(interface) { if (ctl_sock_ < 0) { PLOG(ERROR) << "Failed to open socket"; } @@ -63,7 +65,7 @@ int EthernetDevice::SetInterfaceFlags(const unsigned set, const unsigned clr) { } memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, interface.c_str(), IFNAMSIZ); + strncpy(ifr.ifr_name, interface_.c_str(), IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = 0; if (ioctl(ctl_sock_, SIOCGIFFLAGS, &ifr) < 0) { @@ -96,7 +98,7 @@ void EthernetDevice::SetTitleIPv6LinkLocalAddress(const bool interface_up) { std::unique_ptr guard{ ifaddr, freeifaddrs }; for (struct ifaddrs* ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family != AF_INET6 || interface != ifa->ifa_name) { + if (ifa->ifa_addr->sa_family != AF_INET6 || interface_ != ifa->ifa_name) { continue; } -- cgit v1.2.3