tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol.

Browse source 
The fastbootd over ethernet was implemented with IPv6 link-local
address. An IPv6 address may include many ':'. It will break this fuzzy
test. This new solution uses "tcp:" prefix to identify the fastboot
protocol, like the host fastboot command.

BUG: 157887327
Test: fuzzy_fastboot --serial=tcp:fe80::230:1bff:feba:8128%wlan0 \
      --gtest_filter=*Logical*
Bug: http://b/166279510

Change-Id: I8fe7e6e3ade94a26e05a31ac20ed9ab3839dd342
Merged-In: I971fd9e25741e18bf7f5907d562556b09db1d624
This commit is contained in:
sirius.wang 2020-07-17 11:28:06 +08:00 committed by Elliott Hughes
parent b085db746a
commit 767fe1515a
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fastboot/fuzzy_fastboot/fixtures.cpp
View file

@ -45,6 +45,7 @@
#include <vector>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <gtest/gtest.h>
#include "fastboot_driver.h"
@ -76,8 +77,7 @@ int FastBootTest::MatchFastboot(usb_ifc_info* info, const std::string& local_ser
}
bool FastBootTest::IsFastbootOverTcp() {
// serial contains ":" is treated as host ip and port number
return (device_serial.find(":") != std::string::npos);
return android::base::StartsWith(device_serial, "tcp:");
}
bool FastBootTest::UsbStillAvailible() {
@ -182,19 +182,14 @@ void FastBootTest::TearDownSerial() {
}
void FastBootTest::ConnectTcpFastbootDevice() {
std::size_t found = device_serial.find(":");
if (found != std::string::npos) {
for (int i = 0; i < MAX_TCP_TRIES && !transport; i++) {
std::string error;
std::unique_ptr<Transport> tcp(
tcp::Connect(device_serial.substr(0, found), tcp::kDefaultPort, &error)
.release());
if (tcp)
transport =
std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));
if (transport != nullptr) break;
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
for (int i = 0; i < MAX_TCP_TRIES && !transport; i++) {
std::string error;
std::unique_ptr<Transport> tcp(
tcp::Connect(device_serial.substr(4), tcp::kDefaultPort, &error).release());
if (tcp)
transport = std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));
if (transport != nullptr) break;
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
}