This patch introduce "service.adb.listen_addrs", a new
string type property, while keeping the old properties.
The new property added in this patch is used to listen
on UNIX domain socket "localfilesystem".
"service.adb.listen_addrs" can be used to listen on
multiple addresses, such as tcp:5555 and tcp:5556.
It is separated by ',' (comma) character.
In the process of introducing the new socket type, the
method tcp_connect is removed and combined into
socket_spec_connect.
Without specifying using the new property, adb will
try to listen on both tcp and vsock (following the
previous implementation).
Some examples of the new property value are:
- "tcp:5555"
- "vsock:5555"
- "localfilesystem:/tmp/test"
- "tcp:5555,vsock:5555"
Bug: 133378083
Test: On master-arc-dev:
adb root;
setprop service.adb.listen_addrs localfilesystem:
<path_to_socket>;
adb connect localfilesystem:<path_to_socket>;
adb -s localfilesystem:<path_to_socket> shell;
inside Chrome OS.
Test: On aosp_bluefin:
setprop service.adb.listen_addr tcp:5555;
adb connect <IP>:5555; adb shell;
Test: On aosp_bluefin:
setprop service.adb.tcp.port 5555;
adb connect <IP>:5555; adb shell;
Test: On aosp_bluefin:
setprop service.adb.listen_addrs tcp:5555,tcp:6666;
adb connect <IP>:5555; adb shell;
adb connect <IP>:6666; adb shell;
Test: On aosp_bluefin:
./adb_test;
Test: On cuttlefish:
launch_cvd;
adb -s 127.0.0.1:6520 shell;
Test: Ran host tests:
./adb_test;
./adb_integration_test_adb;
./adb_integration_test_device;
Change-Id: I8289bf0ab3305cf23ce5695ffba46845d58ef6bb
154 lines
5.8 KiB
C++
154 lines
5.8 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "socket_spec.h"
|
|
|
|
#include <string>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <android-base/file.h>
|
|
#include <android-base/stringprintf.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_just_port) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_TRUE(parse_tcp_socket_spec("tcp:5037", &hostname, &port, &serial, &error));
|
|
EXPECT_EQ("", hostname);
|
|
EXPECT_EQ(5037, port);
|
|
EXPECT_EQ("", serial);
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_bad_ports) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:-1", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:65536", &hostname, &port, &serial, &error));
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_host_and_port) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_TRUE(parse_tcp_socket_spec("tcp:localhost:1234", &hostname, &port, &serial, &error));
|
|
EXPECT_EQ("localhost", hostname);
|
|
EXPECT_EQ(1234, port);
|
|
EXPECT_EQ("localhost:1234", serial);
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_host_no_port) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_TRUE(parse_tcp_socket_spec("tcp:localhost", &hostname, &port, &serial, &error));
|
|
EXPECT_EQ("localhost", hostname);
|
|
EXPECT_EQ(5555, port);
|
|
EXPECT_EQ("localhost:5555", serial);
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_host_bad_ports) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:-1", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:65536", &hostname, &port, &serial, &error));
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_ipv6_and_port) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_TRUE(parse_tcp_socket_spec("tcp:[::1]:1234", &hostname, &port, &serial, &error));
|
|
EXPECT_EQ("::1", hostname);
|
|
EXPECT_EQ(1234, port);
|
|
EXPECT_EQ("[::1]:1234", serial);
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_ipv6_no_port) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_TRUE(parse_tcp_socket_spec("tcp:::1", &hostname, &port, &serial, &error));
|
|
EXPECT_EQ("::1", hostname);
|
|
EXPECT_EQ(5555, port);
|
|
EXPECT_EQ("[::1]:5555", serial);
|
|
}
|
|
|
|
TEST(socket_spec, parse_tcp_socket_spec_ipv6_bad_ports) {
|
|
std::string hostname, error, serial;
|
|
int port;
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]:", &hostname, &port, &serial, &error));
|
|
EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]:-1", &hostname, &port, &serial, &error));
|
|
}
|
|
|
|
TEST(socket_spec, get_host_socket_spec_port) {
|
|
std::string error;
|
|
EXPECT_EQ(5555, get_host_socket_spec_port("tcp:5555", &error));
|
|
EXPECT_EQ(5555, get_host_socket_spec_port("tcp:localhost:5555", &error));
|
|
EXPECT_EQ(5555, get_host_socket_spec_port("tcp:[::1]:5555", &error));
|
|
EXPECT_EQ(5555, get_host_socket_spec_port("vsock:5555", &error));
|
|
}
|
|
|
|
TEST(socket_spec, get_host_socket_spec_port_no_port) {
|
|
std::string error;
|
|
EXPECT_EQ(5555, get_host_socket_spec_port("tcp:localhost", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("vsock:localhost", &error));
|
|
}
|
|
|
|
TEST(socket_spec, get_host_socket_spec_port_bad_ports) {
|
|
std::string error;
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("tcp:65536", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("tcp:-5", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("vsock:-5", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("vsock:5:5555", &error));
|
|
}
|
|
|
|
TEST(socket_spec, get_host_socket_spec_port_bad_string) {
|
|
std::string error;
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("tcpz:5555", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("vsockz:5555", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("abcd:5555", &error));
|
|
EXPECT_EQ(-1, get_host_socket_spec_port("abcd", &error));
|
|
}
|
|
|
|
TEST(socket_spec, socket_spec_listen_connect_tcp) {
|
|
std::string error, serial;
|
|
int port;
|
|
unique_fd server_fd, client_fd;
|
|
EXPECT_FALSE(socket_spec_connect(&client_fd, "tcp:localhost:7777", &port, &serial, &error));
|
|
server_fd.reset(socket_spec_listen("tcp:7777", &error, &port));
|
|
EXPECT_NE(server_fd.get(), -1);
|
|
EXPECT_TRUE(socket_spec_connect(&client_fd, "tcp:localhost:7777", &port, &serial, &error));
|
|
EXPECT_NE(client_fd.get(), -1);
|
|
}
|
|
|
|
TEST(socket_spec, socket_spec_listen_connect_localfilesystem) {
|
|
std::string error, serial;
|
|
int port;
|
|
unique_fd server_fd, client_fd;
|
|
TemporaryDir sock_dir;
|
|
|
|
// Only run this test if the created directory is writable.
|
|
int result = access(sock_dir.path, W_OK);
|
|
if (result == 0) {
|
|
std::string sock_addr =
|
|
android::base::StringPrintf("localfilesystem:%s/af_unix_socket", sock_dir.path);
|
|
EXPECT_FALSE(socket_spec_connect(&client_fd, sock_addr, &port, &serial, &error));
|
|
server_fd.reset(socket_spec_listen(sock_addr, &error, &port));
|
|
EXPECT_NE(server_fd.get(), -1);
|
|
EXPECT_TRUE(socket_spec_connect(&client_fd, sock_addr, &port, &serial, &error));
|
|
EXPECT_NE(client_fd.get(), -1);
|
|
}
|
|
}
|