jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User proper constants in our adb message processor

Browse source
This commit is contained in:
Simon Fels 2017-05-12 18:46:25 +02:00
commit 14d77e9cc4
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/anbox/qemu/adb_message_processor.cpp
View file

@ -27,10 +27,14 @@
namespace { namespace {
const unsigned short default_adb_client_port{5037}; const unsigned short default_adb_client_port{5037};
const unsigned short default_host_listen_port{6664}; const unsigned short default_host_listen_port{6664};
constexpr const char *loopback_address{"127.0.0.1"};
const std::string accept_command{"accept"}; const std::string accept_command{"accept"};
const std::string ok_command{"ok"}; const std::string ok_command{"ok"};
const std::string ko_command{"ko"}; const std::string ko_command{"ko"};
const std::string start_command{"start"}; const std::string start_command{"start"};
// This timeount should be too high to not cause a too long wait time for the
// user until we connect to the adb host instance after it appeared and not
// too short to not put unnecessary burden on the CPU.
const boost::posix_time::seconds default_adb_wait_time{1}; const boost::posix_time::seconds default_adb_wait_time{1};
static std::mutex active_instance; static std::mutex active_instance;
} }
@ -102,7 +106,7 @@ void AdbMessageProcessor::advance_state() {
void AdbMessageProcessor::wait_for_host_connection() { void AdbMessageProcessor::wait_for_host_connection() {
if (!host_connector_) { if (!host_connector_) {
host_connector_ = std::make_shared<network::TcpSocketConnector>( host_connector_ = std::make_shared<network::TcpSocketConnector>(
boost::asio::ip::address_v4::from_string("127.0.0.1"), boost::asio::ip::address_v4::from_string(loopback_address),
default_host_listen_port, runtime_, default_host_listen_port, runtime_,
std::make_shared< std::make_shared<
network::DelegateConnectionCreator<boost::asio::ip::tcp>>( network::DelegateConnectionCreator<boost::asio::ip::tcp>>(
@ -113,12 +117,9 @@ void AdbMessageProcessor::wait_for_host_connection() {
// Notify the adb host instance so that it knows on which port our // Notify the adb host instance so that it knows on which port our
// proxy is waiting for incoming connections. // proxy is waiting for incoming connections.
auto messenger = std::make_shared<network::TcpSocketMessenger>( auto messenger = std::make_shared<network::TcpSocketMessenger>(
boost::asio::ip::address_v4::from_string("127.0.0.1"), boost::asio::ip::address_v4::from_string(loopback_address), default_adb_client_port, runtime_);
default_adb_client_port, runtime_); auto message = utils::string_format("host:emulator:%d", default_host_listen_port);
auto message = auto handshake = utils::string_format("%04x%s", message.size(), message.c_str());
utils::string_format("host:emulator:%d", default_host_listen_port);
auto handshake =
utils::string_format("%04x%s", message.size(), message.c_str());
messenger->send(handshake.data(), handshake.size()); messenger->send(handshake.data(), handshake.size());
} catch (std::exception &) { } catch (std::exception &) {
// Try again later when the host adb service is maybe available // Try again later when the host adb service is maybe available