b3c14ec693
Make the host:kill service shutdown its socket on process exit, instead of immediately. Also, unify the two 'kill-server' implementations and hide _adb_connect. Bug: http://b/37104408 Test: adb kill-server; adb start-server Change-Id: I9475f5d084d5fb91d33e393f2fd4e34056613384
317 lines
9.3 KiB
C++
317 lines
9.3 KiB
C++
/*
|
|
* Copyright (C) 2015 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.
|
|
*/
|
|
|
|
#define TRACE_TAG ADB
|
|
|
|
#include "sysdeps.h"
|
|
#include "adb_client.h"
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <condition_variable>
|
|
#include <mutex>
|
|
#include <string>
|
|
#include <thread>
|
|
#include <vector>
|
|
|
|
#include <android-base/stringprintf.h>
|
|
#include <android-base/strings.h>
|
|
#include <android-base/thread_annotations.h>
|
|
#include <cutils/sockets.h>
|
|
|
|
#include "adb_io.h"
|
|
#include "adb_utils.h"
|
|
#include "socket_spec.h"
|
|
#include "sysdeps/chrono.h"
|
|
|
|
static TransportType __adb_transport = kTransportAny;
|
|
static const char* __adb_serial = NULL;
|
|
|
|
static const char* __adb_server_socket_spec;
|
|
|
|
void adb_set_transport(TransportType type, const char* serial) {
|
|
__adb_transport = type;
|
|
__adb_serial = serial;
|
|
}
|
|
|
|
void adb_set_socket_spec(const char* socket_spec) {
|
|
if (__adb_server_socket_spec) {
|
|
LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec " << socket_spec << " (was " << __adb_server_socket_spec << ")";
|
|
}
|
|
__adb_server_socket_spec = socket_spec;
|
|
}
|
|
|
|
static int switch_socket_transport(int fd, std::string* error) {
|
|
std::string service;
|
|
if (__adb_serial) {
|
|
service += "host:transport:";
|
|
service += __adb_serial;
|
|
} else {
|
|
const char* transport_type = "???";
|
|
switch (__adb_transport) {
|
|
case kTransportUsb:
|
|
transport_type = "transport-usb";
|
|
break;
|
|
case kTransportLocal:
|
|
transport_type = "transport-local";
|
|
break;
|
|
case kTransportAny:
|
|
transport_type = "transport-any";
|
|
break;
|
|
case kTransportHost:
|
|
// no switch necessary
|
|
return 0;
|
|
}
|
|
service += "host:";
|
|
service += transport_type;
|
|
}
|
|
|
|
if (!SendProtocolString(fd, service)) {
|
|
*error = perror_str("write failure during connection");
|
|
adb_close(fd);
|
|
return -1;
|
|
}
|
|
D("Switch transport in progress");
|
|
|
|
if (!adb_status(fd, error)) {
|
|
adb_close(fd);
|
|
D("Switch transport failed: %s", error->c_str());
|
|
return -1;
|
|
}
|
|
D("Switch transport success");
|
|
return 0;
|
|
}
|
|
|
|
bool adb_status(int fd, std::string* error) {
|
|
char buf[5];
|
|
if (!ReadFdExactly(fd, buf, 4)) {
|
|
*error = perror_str("protocol fault (couldn't read status)");
|
|
return false;
|
|
}
|
|
|
|
if (!memcmp(buf, "OKAY", 4)) {
|
|
return true;
|
|
}
|
|
|
|
if (memcmp(buf, "FAIL", 4)) {
|
|
*error = android::base::StringPrintf("protocol fault (status %02x %02x %02x %02x?!)",
|
|
buf[0], buf[1], buf[2], buf[3]);
|
|
return false;
|
|
}
|
|
|
|
ReadProtocolString(fd, error, error);
|
|
return false;
|
|
}
|
|
|
|
static int _adb_connect(const std::string& service, std::string* error) {
|
|
D("_adb_connect: %s", service.c_str());
|
|
if (service.empty() || service.size() > MAX_PAYLOAD_V1) {
|
|
*error = android::base::StringPrintf("bad service name length (%zd)",
|
|
service.size());
|
|
return -1;
|
|
}
|
|
|
|
std::string reason;
|
|
int fd = socket_spec_connect(__adb_server_socket_spec, &reason);
|
|
if (fd < 0) {
|
|
*error = android::base::StringPrintf("cannot connect to daemon at %s: %s",
|
|
__adb_server_socket_spec, reason.c_str());
|
|
return -2;
|
|
}
|
|
|
|
if (memcmp(&service[0], "host", 4) != 0 && switch_socket_transport(fd, error)) {
|
|
return -1;
|
|
}
|
|
|
|
if (!SendProtocolString(fd, service)) {
|
|
*error = perror_str("write failure during connection");
|
|
adb_close(fd);
|
|
return -1;
|
|
}
|
|
|
|
if (!adb_status(fd, error)) {
|
|
adb_close(fd);
|
|
return -1;
|
|
}
|
|
|
|
D("_adb_connect: return fd %d", fd);
|
|
return fd;
|
|
}
|
|
|
|
bool adb_kill_server() {
|
|
D("adb_kill_server");
|
|
std::string reason;
|
|
int fd = socket_spec_connect(__adb_server_socket_spec, &reason);
|
|
if (fd < 0) {
|
|
fprintf(stderr, "cannot connect to daemon at %s: %s\n", __adb_server_socket_spec,
|
|
reason.c_str());
|
|
return true;
|
|
}
|
|
|
|
if (!SendProtocolString(fd, "host:kill")) {
|
|
fprintf(stderr, "error: write failure during connection: %s\n", strerror(errno));
|
|
return false;
|
|
}
|
|
|
|
ReadOrderlyShutdown(fd);
|
|
return true;
|
|
}
|
|
|
|
int adb_connect(const std::string& service, std::string* error) {
|
|
// first query the adb server's version
|
|
int fd = _adb_connect("host:version", error);
|
|
|
|
D("adb_connect: service %s", service.c_str());
|
|
if (fd == -2 && !is_local_socket_spec(__adb_server_socket_spec)) {
|
|
fprintf(stderr, "* cannot start server on remote host\n");
|
|
// error is the original network connection error
|
|
return fd;
|
|
} else if (fd == -2) {
|
|
fprintf(stderr, "* daemon not running; starting now at %s\n", __adb_server_socket_spec);
|
|
start_server:
|
|
if (launch_server(__adb_server_socket_spec)) {
|
|
fprintf(stderr, "* failed to start daemon\n");
|
|
// launch_server() has already printed detailed error info, so just
|
|
// return a generic error string about the overall adb_connect()
|
|
// that the caller requested.
|
|
*error = "cannot connect to daemon";
|
|
return -1;
|
|
} else {
|
|
fprintf(stderr, "* daemon started successfully\n");
|
|
}
|
|
// The server will wait until it detects all of its connected devices before acking.
|
|
// Fall through to _adb_connect.
|
|
} else {
|
|
// If a server is already running, check its version matches.
|
|
int version = ADB_SERVER_VERSION - 1;
|
|
|
|
// If we have a file descriptor, then parse version result.
|
|
if (fd >= 0) {
|
|
std::string version_string;
|
|
if (!ReadProtocolString(fd, &version_string, error)) {
|
|
adb_close(fd);
|
|
return -1;
|
|
}
|
|
|
|
ReadOrderlyShutdown(fd);
|
|
adb_close(fd);
|
|
|
|
if (sscanf(&version_string[0], "%04x", &version) != 1) {
|
|
*error = android::base::StringPrintf("cannot parse version string: %s",
|
|
version_string.c_str());
|
|
return -1;
|
|
}
|
|
} else {
|
|
// If fd is -1 check for "unknown host service" which would
|
|
// indicate a version of adb that does not support the
|
|
// version command, in which case we should fall-through to kill it.
|
|
if (*error != "unknown host service") {
|
|
return fd;
|
|
}
|
|
}
|
|
|
|
if (version != ADB_SERVER_VERSION) {
|
|
fprintf(stderr, "adb server version (%d) doesn't match this client (%d); killing...\n",
|
|
version, ADB_SERVER_VERSION);
|
|
adb_kill_server();
|
|
goto start_server;
|
|
}
|
|
}
|
|
|
|
// if the command is start-server, we are done.
|
|
if (service == "host:start-server") {
|
|
return 0;
|
|
}
|
|
|
|
fd = _adb_connect(service, error);
|
|
if (fd == -1) {
|
|
D("_adb_connect error: %s", error->c_str());
|
|
} else if(fd == -2) {
|
|
fprintf(stderr, "* daemon still not running\n");
|
|
}
|
|
D("adb_connect: return fd %d", fd);
|
|
|
|
return fd;
|
|
}
|
|
|
|
|
|
bool adb_command(const std::string& service) {
|
|
std::string error;
|
|
int fd = adb_connect(service, &error);
|
|
if (fd < 0) {
|
|
fprintf(stderr, "error: %s\n", error.c_str());
|
|
return false;
|
|
}
|
|
|
|
if (!adb_status(fd, &error)) {
|
|
fprintf(stderr, "error: %s\n", error.c_str());
|
|
adb_close(fd);
|
|
return false;
|
|
}
|
|
|
|
ReadOrderlyShutdown(fd);
|
|
adb_close(fd);
|
|
return true;
|
|
}
|
|
|
|
bool adb_query(const std::string& service, std::string* result, std::string* error) {
|
|
D("adb_query: %s", service.c_str());
|
|
int fd = adb_connect(service, error);
|
|
if (fd < 0) {
|
|
return false;
|
|
}
|
|
|
|
result->clear();
|
|
if (!ReadProtocolString(fd, result, error)) {
|
|
adb_close(fd);
|
|
return false;
|
|
}
|
|
|
|
ReadOrderlyShutdown(fd);
|
|
adb_close(fd);
|
|
return true;
|
|
}
|
|
|
|
std::string format_host_command(const char* command, TransportType type, const char* serial) {
|
|
if (serial) {
|
|
return android::base::StringPrintf("host-serial:%s:%s", serial, command);
|
|
}
|
|
|
|
const char* prefix = "host";
|
|
if (type == kTransportUsb) {
|
|
prefix = "host-usb";
|
|
} else if (type == kTransportLocal) {
|
|
prefix = "host-local";
|
|
}
|
|
return android::base::StringPrintf("%s:%s", prefix, command);
|
|
}
|
|
|
|
bool adb_get_feature_set(FeatureSet* feature_set, std::string* error) {
|
|
std::string result;
|
|
if (adb_query(format_host_command("features", __adb_transport, __adb_serial), &result, error)) {
|
|
*feature_set = StringToFeatureSet(result);
|
|
return true;
|
|
}
|
|
feature_set->clear();
|
|
return false;
|
|
}
|