recovery_ui: ethernet: Show IPv4 addresses on title (903a004b) · Commits · e / os / android_bootable_recovery

recovery_ui/ethernet_device.cpp

+29 −21

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ EthernetDevice::EthernetDevice(EthernetRecoveryUI* ui, std::string interface)

		void EthernetDevice::PreRecovery() {
		SetInterfaceFlags(0, IFF_UP);
		SetTitleIPv6LinkLocalAddress(false);
		SetTitleIPAddress(false);
		}

		void EthernetDevice::PreFastboot() {
		@@ -54,7 +54,7 @@ void EthernetDevice::PreFastboot() {
		return;
		}

		SetTitleIPv6LinkLocalAddress(true);
		SetTitleIPAddress(true);
		}

		int EthernetDevice::SetInterfaceFlags(const unsigned set, const unsigned clr) {
		@@ -82,26 +82,35 @@ int EthernetDevice::SetInterfaceFlags(const unsigned set, const unsigned clr) {
		return 0;
		}

		void EthernetDevice::SetTitleIPv6LinkLocalAddress(const bool interface_up) {
		void EthernetDevice::SetTitleIPAddress(const bool interface_up) {
		auto recovery_ui = reinterpret_cast<EthernetRecoveryUI*>(GetUI());
		if (!interface_up) {
		recovery_ui->SetIPv6LinkLocalAddress();
		return;
		}

		// Cached IP Addresses needs to be cleared anyways, no matter if errored or not
		recovery_ui->ClearIPAddresses();

		if (!interface_up) return;

		struct ifaddrs* ifaddr;
		if (getifaddrs(&ifaddr) == -1) {
		PLOG(ERROR) << "Failed to get interface addresses";
		recovery_ui->SetIPv6LinkLocalAddress();
		return;
		}

		std::unique_ptr<struct ifaddrs, decltype(&freeifaddrs)> 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 (interface_ != ifa->ifa_name)
		continue;
		}

		if (ifa->ifa_addr->sa_family == AF_INET) {
		auto current_addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);

		char addrstr[INET_ADDRSTRLEN];
		inet_ntop(AF_INET, reinterpret_cast<const void*>(&current_addr->sin_addr), addrstr,
		INET_ADDRSTRLEN);
		LOG(INFO) << "Our IPv4 address is " << addrstr;
		recovery_ui->AddIPv4Address(addrstr);
		continue;
		} else if (ifa->ifa_addr->sa_family == AF_INET6) {
		auto current_addr = reinterpret_cast<struct sockaddr_in6*>(ifa->ifa_addr);
		if (!IN6_IS_ADDR_LINKLOCAL(&(current_addr->sin6_addr))) {
		continue;
		@@ -112,8 +121,7 @@ void EthernetDevice::SetTitleIPv6LinkLocalAddress(const bool interface_up) {
		INET6_ADDRSTRLEN);
		LOG(INFO) << "Our IPv6 link-local address is " << addrstr;
		recovery_ui->SetIPv6LinkLocalAddress(addrstr);
		return;
		continue;
		}
		}

		recovery_ui->SetIPv6LinkLocalAddress();
		}

recovery_ui/ethernet_ui.cpp

+15 −3

Original line number	Diff line number	Diff line
		@@ -22,11 +22,23 @@ void EthernetRecoveryUI::SetTitle(const std::vector<std::string>& lines) {
		ScreenRecoveryUI::SetTitle(lines);

		// Append IP address, if any
		if (!address_.empty()) {
		title_lines_.push_back("IPv6 link-local address - " + address_);
		for (auto it = ipv4_addresses_.begin(); it != ipv4_addresses_.end(); ++it) {
		title_lines_.push_back("IPv4 address - " + *it);
		}
		if (!ipv6_linklocal_address_.empty()) {
		title_lines_.push_back("IPv6 link-local address - " + ipv6_linklocal_address_);
		}
		}

		void EthernetRecoveryUI::AddIPv4Address(const std::string& address) {
		ipv4_addresses_.push_back(address);
		}

		void EthernetRecoveryUI::ClearIPAddresses() {
		ipv4_addresses_.clear();
		ipv6_linklocal_address_.clear();
		}

		void EthernetRecoveryUI::SetIPv6LinkLocalAddress(const std::string& address) {
		address_ = address;
		ipv6_linklocal_address_ = address;
		}

recovery_ui/include/recovery_ui/ethernet_device.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ class EthernetDevice : public Device {

		private:
		int SetInterfaceFlags(const unsigned set, const unsigned clr);
		void SetTitleIPv6LinkLocalAddress(const bool interface_up);
		void SetTitleIPAddress(const bool interface_up);

		android::base::unique_fd ctl_sock_;
		std::string interface_;

recovery_ui/include/recovery_ui/ethernet_ui.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -25,10 +25,13 @@ class EthernetRecoveryUI : public ScreenRecoveryUI {
		void SetTitle(const std::vector<std::string>& lines) override;

		// For EthernetDevice
		void AddIPv4Address(const std::string& address);
		void ClearIPAddresses();
		void SetIPv6LinkLocalAddress(const std::string& address = "");

		private:
		std::string address_;
		std::vector<std::string> ipv4_addresses_;
		std::string ipv6_linklocal_address_;
		};

		#endif // RECOVERY_ETHERNET_UI_H