2009-03-04 04:32:55 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2007 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.
|
|
|
|
*/
|
|
|
|
|
2015-09-23 00:52:57 +02:00
|
|
|
#define TRACE_TAG SOCKETS
|
2015-03-19 23:21:08 +01:00
|
|
|
|
|
|
|
#include "sysdeps.h"
|
|
|
|
|
2015-02-25 00:51:19 +01:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <errno.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2015-02-25 00:51:19 +01:00
|
|
|
#include <unistd.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-11-08 03:51:54 +01:00
|
|
|
#include <algorithm>
|
2016-05-18 02:46:27 +02:00
|
|
|
#include <mutex>
|
2016-03-01 17:58:26 +01:00
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
2015-11-08 03:51:54 +01:00
|
|
|
|
2015-02-25 00:51:19 +01:00
|
|
|
#if !ADB_HOST
|
2016-09-24 00:40:03 +02:00
|
|
|
#include <android-base/properties.h>
|
2017-04-14 08:48:57 +02:00
|
|
|
#include <log/log_properties.h>
|
2015-02-25 00:51:19 +01:00
|
|
|
#endif
|
2015-03-19 23:21:08 +01:00
|
|
|
|
|
|
|
#include "adb.h"
|
|
|
|
#include "adb_io.h"
|
2015-02-25 00:51:19 +01:00
|
|
|
#include "transport.h"
|
2018-03-08 01:52:28 +01:00
|
|
|
#include "types.h"
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-05-18 02:46:27 +02:00
|
|
|
static std::recursive_mutex& local_socket_list_lock = *new std::recursive_mutex();
|
2009-03-04 04:32:55 +01:00
|
|
|
static unsigned local_socket_next_id = 1;
|
|
|
|
|
2018-01-31 22:15:51 +01:00
|
|
|
static auto& local_socket_list = *new std::vector<asocket*>();
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
/* the the list of currently closing local sockets.
|
|
|
|
** these have no peer anymore, but still packets to
|
|
|
|
** write to their fd.
|
|
|
|
*/
|
2018-01-31 22:15:51 +01:00
|
|
|
static auto& local_socket_closing_list = *new std::vector<asocket*>();
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2013-12-13 14:09:44 +01:00
|
|
|
// Parse the global list of sockets to find one with id |local_id|.
|
|
|
|
// If |peer_id| is not 0, also check that it is connected to a peer
|
|
|
|
// with id |peer_id|. Returns an asocket handle on success, NULL on failure.
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* find_local_socket(unsigned local_id, unsigned peer_id) {
|
2018-01-31 22:15:51 +01:00
|
|
|
asocket* result = nullptr;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-05-18 02:46:27 +02:00
|
|
|
std::lock_guard<std::recursive_mutex> lock(local_socket_list_lock);
|
2018-01-31 22:15:51 +01:00
|
|
|
for (asocket* s : local_socket_list) {
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->id != local_id) {
|
2013-12-13 14:09:44 +01:00
|
|
|
continue;
|
2016-05-18 01:55:06 +02:00
|
|
|
}
|
2013-12-13 14:09:44 +01:00
|
|
|
if (peer_id == 0 || (s->peer && s->peer->id == peer_id)) {
|
2010-06-12 16:40:20 +02:00
|
|
|
result = s;
|
|
|
|
}
|
2013-12-13 14:09:44 +01:00
|
|
|
break;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
void install_local_socket(asocket* s) {
|
2016-05-18 02:46:27 +02:00
|
|
|
std::lock_guard<std::recursive_mutex> lock(local_socket_list_lock);
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
s->id = local_socket_next_id++;
|
2013-12-13 14:09:44 +01:00
|
|
|
|
|
|
|
// Socket ids should never be 0.
|
2016-05-18 01:55:06 +02:00
|
|
|
if (local_socket_next_id == 0) {
|
2016-05-18 02:46:27 +02:00
|
|
|
fatal("local socket id overflow");
|
2016-05-18 01:55:06 +02:00
|
|
|
}
|
2013-12-13 14:09:44 +01:00
|
|
|
|
2018-01-31 22:15:51 +01:00
|
|
|
local_socket_list.push_back(s);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
void remove_socket(asocket* s) {
|
2017-09-13 20:17:33 +02:00
|
|
|
std::lock_guard<std::recursive_mutex> lock(local_socket_list_lock);
|
2018-01-31 22:15:51 +01:00
|
|
|
for (auto list : { &local_socket_list, &local_socket_closing_list }) {
|
|
|
|
list->erase(std::remove_if(list->begin(), list->end(), [s](asocket* x) { return x == s; }),
|
|
|
|
list->end());
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
void close_all_sockets(atransport* t) {
|
|
|
|
/* this is a little gross, but since s->close() *will* modify
|
|
|
|
** the list out from under you, your options are limited.
|
|
|
|
*/
|
2016-05-18 02:46:27 +02:00
|
|
|
std::lock_guard<std::recursive_mutex> lock(local_socket_list_lock);
|
2009-03-04 04:32:55 +01:00
|
|
|
restart:
|
2018-01-31 22:15:51 +01:00
|
|
|
for (asocket* s : local_socket_list) {
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->transport == t || (s->peer && s->peer->transport == t)) {
|
2016-05-18 19:39:48 +02:00
|
|
|
s->close(s);
|
2009-03-04 04:32:55 +01:00
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
enum class SocketFlushResult {
|
|
|
|
Destroyed,
|
|
|
|
TryAgain,
|
|
|
|
Completed,
|
|
|
|
};
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
static SocketFlushResult local_socket_flush_incoming(asocket* s) {
|
|
|
|
while (!s->packet_queue.empty()) {
|
|
|
|
Range& r = s->packet_queue.front();
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
int rc = adb_write(s->fd, r.data(), r.size());
|
2018-03-19 21:20:29 +01:00
|
|
|
if (rc == static_cast<int>(r.size())) {
|
|
|
|
s->packet_queue.pop_front();
|
|
|
|
} else if (rc > 0) {
|
2018-02-01 22:17:50 +01:00
|
|
|
r.drop_front(rc);
|
2018-03-19 21:20:29 +01:00
|
|
|
fdevent_add(&s->fde, FDE_WRITE);
|
|
|
|
return SocketFlushResult::TryAgain;
|
|
|
|
} else if (rc == -1 && errno == EAGAIN) {
|
|
|
|
fdevent_add(&s->fde, FDE_WRITE);
|
|
|
|
return SocketFlushResult::TryAgain;
|
2018-03-30 22:56:24 +02:00
|
|
|
} else {
|
|
|
|
// We failed to write, but it's possible that we can still read from the socket.
|
|
|
|
// Give that a try before giving up.
|
|
|
|
s->has_write_error = true;
|
|
|
|
break;
|
2018-03-19 21:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we sent the last packet of a closing socket, we can now destroy it.
|
|
|
|
if (s->closing) {
|
|
|
|
s->close(s);
|
|
|
|
return SocketFlushResult::Destroyed;
|
|
|
|
}
|
|
|
|
|
|
|
|
fdevent_del(&s->fde, FDE_WRITE);
|
|
|
|
return SocketFlushResult::Completed;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns false if the socket has been closed and destroyed as a side-effect of this function.
|
|
|
|
static bool local_socket_flush_outgoing(asocket* s) {
|
|
|
|
const size_t max_payload = s->get_max_payload();
|
2018-03-08 01:52:28 +01:00
|
|
|
apacket::payload_type data;
|
2018-03-19 21:20:29 +01:00
|
|
|
data.resize(max_payload);
|
|
|
|
char* x = &data[0];
|
|
|
|
size_t avail = max_payload;
|
|
|
|
int r = 0;
|
|
|
|
int is_eof = 0;
|
|
|
|
|
|
|
|
while (avail > 0) {
|
|
|
|
r = adb_read(s->fd, x, avail);
|
|
|
|
D("LS(%d): post adb_read(fd=%d,...) r=%d (errno=%d) avail=%zu", s->id, s->fd, r,
|
|
|
|
r < 0 ? errno : 0, avail);
|
|
|
|
if (r == -1) {
|
|
|
|
if (errno == EAGAIN) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else if (r > 0) {
|
|
|
|
avail -= r;
|
|
|
|
x += r;
|
2009-03-04 04:32:55 +01:00
|
|
|
continue;
|
|
|
|
}
|
2018-02-01 22:17:50 +01:00
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
/* r = 0 or unhandled error */
|
|
|
|
is_eof = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
D("LS(%d): fd=%d post avail loop. r=%d is_eof=%d forced_eof=%d", s->id, s->fd, r, is_eof,
|
|
|
|
s->fde.force_eof);
|
|
|
|
|
|
|
|
if (avail != max_payload && s->peer) {
|
|
|
|
data.resize(max_payload - avail);
|
|
|
|
|
|
|
|
// s->peer->enqueue() may call s->close() and free s,
|
|
|
|
// so save variables for debug printing below.
|
|
|
|
unsigned saved_id = s->id;
|
|
|
|
int saved_fd = s->fd;
|
|
|
|
r = s->peer->enqueue(s->peer, std::move(data));
|
|
|
|
D("LS(%u): fd=%d post peer->enqueue(). r=%d", saved_id, saved_fd, r);
|
|
|
|
|
|
|
|
if (r < 0) {
|
|
|
|
// Error return means they closed us as a side-effect and we must
|
|
|
|
// return immediately.
|
|
|
|
//
|
|
|
|
// Note that if we still have buffered packets, the socket will be
|
|
|
|
// placed on the closing socket list. This handler function will be
|
|
|
|
// called again to process FDE_WRITE events.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (r > 0) {
|
|
|
|
/* if the remote cannot accept further events,
|
|
|
|
** we disable notification of READs. They'll
|
|
|
|
** be enabled again when we get a call to ready()
|
|
|
|
*/
|
|
|
|
fdevent_del(&s->fde, FDE_READ);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
// Don't allow a forced eof if data is still there.
|
|
|
|
if ((s->fde.force_eof && !r) || is_eof) {
|
|
|
|
D(" closing because is_eof=%d r=%d s->fde.force_eof=%d", is_eof, r, s->fde.force_eof);
|
|
|
|
s->close(s);
|
|
|
|
return false;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-03-08 01:52:28 +01:00
|
|
|
static int local_socket_enqueue(asocket* s, apacket::payload_type data) {
|
2018-03-19 21:20:29 +01:00
|
|
|
D("LS(%d): enqueue %zu", s->id, data.size());
|
|
|
|
|
|
|
|
Range r(std::move(data));
|
2018-02-01 22:17:50 +01:00
|
|
|
s->packet_queue.push_back(std::move(r));
|
2018-03-19 21:20:29 +01:00
|
|
|
switch (local_socket_flush_incoming(s)) {
|
|
|
|
case SocketFlushResult::Destroyed:
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
case SocketFlushResult::TryAgain:
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
case SocketFlushResult::Completed:
|
|
|
|
return 0;
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
return !s->packet_queue.empty();
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void local_socket_ready(asocket* s) {
|
2015-02-18 12:53:37 +01:00
|
|
|
/* far side is ready for data, pay attention to
|
|
|
|
readable events */
|
2009-03-04 04:32:55 +01:00
|
|
|
fdevent_add(&s->fde, FDE_READ);
|
|
|
|
}
|
|
|
|
|
|
|
|
// be sure to hold the socket list lock when calling this
|
2016-05-18 01:55:06 +02:00
|
|
|
static void local_socket_destroy(asocket* s) {
|
2012-03-16 22:50:07 +01:00
|
|
|
int exit_on_close = s->exit_on_close;
|
|
|
|
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): destroying fde.fd=%d", s->id, s->fde.fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* IMPORTANT: the remove closes the fd
|
|
|
|
** that belongs to this socket
|
|
|
|
*/
|
2009-03-04 04:32:55 +01:00
|
|
|
fdevent_remove(&s->fde);
|
|
|
|
|
|
|
|
remove_socket(s);
|
2018-02-13 02:24:00 +01:00
|
|
|
delete s;
|
2012-03-16 22:50:07 +01:00
|
|
|
|
|
|
|
if (exit_on_close) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("local_socket_destroy: exiting");
|
2012-03-16 22:50:07 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 02:46:27 +02:00
|
|
|
static void local_socket_close(asocket* s) {
|
|
|
|
D("entered local_socket_close. LS(%d) fd=%d", s->id, s->fd);
|
|
|
|
std::lock_guard<std::recursive_mutex> lock(local_socket_list_lock);
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->peer) {
|
|
|
|
D("LS(%d): closing peer. peer->id=%d peer->fd=%d", s->id, s->peer->id, s->peer->fd);
|
2013-12-13 14:09:44 +01:00
|
|
|
/* Note: it's important to call shutdown before disconnecting from
|
|
|
|
* the peer, this ensures that remote sockets can still get the id
|
|
|
|
* of the local socket they're connected to, to send a CLOSE()
|
|
|
|
* protocol event. */
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->peer->shutdown) {
|
|
|
|
s->peer->shutdown(s->peer);
|
|
|
|
}
|
2016-05-18 02:46:27 +02:00
|
|
|
s->peer->peer = nullptr;
|
|
|
|
s->peer->close(s->peer);
|
|
|
|
s->peer = nullptr;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* If we are already closing, or if there are no
|
|
|
|
** pending packets, destroy immediately
|
|
|
|
*/
|
2018-02-01 22:17:50 +01:00
|
|
|
if (s->closing || s->has_write_error || s->packet_queue.empty()) {
|
2016-05-18 01:55:06 +02:00
|
|
|
int id = s->id;
|
2009-03-04 04:32:55 +01:00
|
|
|
local_socket_destroy(s);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): closed", id);
|
2009-03-04 04:32:55 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* otherwise, put on the closing list
|
|
|
|
*/
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): closing", s->id);
|
2009-03-04 04:32:55 +01:00
|
|
|
s->closing = 1;
|
|
|
|
fdevent_del(&s->fde, FDE_READ);
|
|
|
|
remove_socket(s);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): put on socket_closing_list fd=%d", s->id, s->fd);
|
2018-01-31 22:15:51 +01:00
|
|
|
local_socket_closing_list.push_back(s);
|
2015-09-16 01:27:09 +02:00
|
|
|
CHECK_EQ(FDE_WRITE, s->fde.state & FDE_WRITE);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void local_socket_event_func(int fd, unsigned ev, void* _s) {
|
2015-02-26 02:51:28 +01:00
|
|
|
asocket* s = reinterpret_cast<asocket*>(_s);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): event_func(fd=%d(==%d), ev=%04x)", s->id, s->fd, fd, ev);
|
2011-03-16 23:57:42 +01:00
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
/* put the FDE_WRITE processing before the FDE_READ
|
|
|
|
** in order to simplify the code.
|
|
|
|
*/
|
2015-02-26 02:51:28 +01:00
|
|
|
if (ev & FDE_WRITE) {
|
2018-03-19 21:20:29 +01:00
|
|
|
switch (local_socket_flush_incoming(s)) {
|
|
|
|
case SocketFlushResult::Destroyed:
|
2009-03-04 04:32:55 +01:00
|
|
|
return;
|
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
case SocketFlushResult::TryAgain:
|
|
|
|
break;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-03-19 21:20:29 +01:00
|
|
|
case SocketFlushResult::Completed:
|
|
|
|
s->peer->ready(s->peer);
|
|
|
|
break;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 02:51:28 +01:00
|
|
|
if (ev & FDE_READ) {
|
2018-03-19 21:20:29 +01:00
|
|
|
if (!local_socket_flush_outgoing(s)) {
|
2015-09-16 01:27:09 +02:00
|
|
|
return;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
if (ev & FDE_ERROR) {
|
|
|
|
/* this should be caught be the next read or write
|
|
|
|
** catching it here means we may skip the last few
|
|
|
|
** bytes of readable data.
|
|
|
|
*/
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): FDE_ERROR (fd=%d)", s->id, s->fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* create_local_socket(int fd) {
|
2018-02-13 02:24:00 +01:00
|
|
|
asocket* s = new asocket();
|
2009-03-04 04:32:55 +01:00
|
|
|
s->fd = fd;
|
|
|
|
s->enqueue = local_socket_enqueue;
|
|
|
|
s->ready = local_socket_ready;
|
2013-12-13 14:09:44 +01:00
|
|
|
s->shutdown = NULL;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close = local_socket_close;
|
2011-03-16 23:57:42 +01:00
|
|
|
install_local_socket(s);
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
fdevent_install(&s->fde, fd, local_socket_event_func, s);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): created (fd=%d)", s->id, s->fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2018-04-13 21:17:03 +02:00
|
|
|
asocket* create_local_service_socket(const char* name, atransport* transport) {
|
2009-03-04 04:32:55 +01:00
|
|
|
#if !ADB_HOST
|
2016-05-18 01:55:06 +02:00
|
|
|
if (!strcmp(name, "jdwp")) {
|
2009-03-04 04:32:55 +01:00
|
|
|
return create_jdwp_service_socket();
|
|
|
|
}
|
2016-05-18 01:55:06 +02:00
|
|
|
if (!strcmp(name, "track-jdwp")) {
|
2009-03-04 04:32:55 +01:00
|
|
|
return create_jdwp_tracker_service_socket();
|
|
|
|
}
|
|
|
|
#endif
|
2015-08-31 19:42:13 +02:00
|
|
|
int fd = service_to_fd(name, transport);
|
2016-05-18 01:55:06 +02:00
|
|
|
if (fd < 0) {
|
2016-06-15 23:46:56 +02:00
|
|
|
return nullptr;
|
2016-05-18 01:55:06 +02:00
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2014-10-06 19:57:20 +02:00
|
|
|
asocket* s = create_local_socket(fd);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): bound to '%s' via %d", s->id, name, fd);
|
2012-03-16 22:50:07 +01:00
|
|
|
|
2012-03-30 22:19:11 +02:00
|
|
|
#if !ADB_HOST
|
2016-03-29 00:52:13 +02:00
|
|
|
if ((!strncmp(name, "root:", 5) && getuid() != 0 && __android_log_is_debuggable()) ||
|
2016-05-18 01:55:06 +02:00
|
|
|
(!strncmp(name, "unroot:", 7) && getuid() == 0) ||
|
|
|
|
!strncmp(name, "usb:", 4) ||
|
|
|
|
!strncmp(name, "tcpip:", 6)) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): enabling exit_on_close", s->id);
|
2012-03-16 22:50:07 +01:00
|
|
|
s->exit_on_close = 1;
|
|
|
|
}
|
2012-03-30 22:19:11 +02:00
|
|
|
#endif
|
2012-03-16 22:50:07 +01:00
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ADB_HOST
|
2017-08-17 01:57:01 +02:00
|
|
|
static asocket* create_host_service_socket(const char* name, const char* serial,
|
|
|
|
TransportId transport_id) {
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* s;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2017-08-17 01:57:01 +02:00
|
|
|
s = host_service_to_socket(name, serial, transport_id);
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
if (s != NULL) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d) bound to '%s'", s->id, name);
|
2009-03-04 04:32:55 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
#endif /* ADB_HOST */
|
|
|
|
|
2018-03-08 01:52:28 +01:00
|
|
|
static int remote_socket_enqueue(asocket* s, apacket::payload_type data) {
|
2016-05-18 01:55:06 +02:00
|
|
|
D("entered remote_socket_enqueue RS(%d) WRITE fd=%d peer.fd=%d", s->id, s->fd, s->peer->fd);
|
2018-02-01 22:17:50 +01:00
|
|
|
apacket* p = get_apacket();
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
p->msg.command = A_WRTE;
|
|
|
|
p->msg.arg0 = s->peer->id;
|
|
|
|
p->msg.arg1 = s->id;
|
2018-02-01 22:17:50 +01:00
|
|
|
|
2018-02-06 03:49:10 +01:00
|
|
|
if (data.size() > MAX_PAYLOAD) {
|
2018-02-01 22:17:50 +01:00
|
|
|
put_apacket(p);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2018-02-06 03:49:10 +01:00
|
|
|
p->payload = std::move(data);
|
|
|
|
p->msg.data_length = p->payload.size();
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
send_packet(p, s->transport);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void remote_socket_ready(asocket* s) {
|
|
|
|
D("entered remote_socket_ready RS(%d) OKAY fd=%d peer.fd=%d", s->id, s->fd, s->peer->fd);
|
|
|
|
apacket* p = get_apacket();
|
2009-03-04 04:32:55 +01:00
|
|
|
p->msg.command = A_OKAY;
|
|
|
|
p->msg.arg0 = s->peer->id;
|
|
|
|
p->msg.arg1 = s->id;
|
|
|
|
send_packet(p, s->transport);
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void remote_socket_shutdown(asocket* s) {
|
|
|
|
D("entered remote_socket_shutdown RS(%d) CLOSE fd=%d peer->fd=%d", s->id, s->fd,
|
|
|
|
s->peer ? s->peer->fd : -1);
|
|
|
|
apacket* p = get_apacket();
|
2009-03-04 04:32:55 +01:00
|
|
|
p->msg.command = A_CLSE;
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->peer) {
|
2009-03-04 04:32:55 +01:00
|
|
|
p->msg.arg0 = s->peer->id;
|
2013-12-13 14:09:44 +01:00
|
|
|
}
|
|
|
|
p->msg.arg1 = s->id;
|
|
|
|
send_packet(p, s->transport);
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void remote_socket_close(asocket* s) {
|
2013-12-13 14:09:44 +01:00
|
|
|
if (s->peer) {
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->peer = 0;
|
2016-05-18 01:55:06 +02:00
|
|
|
D("RS(%d) peer->close()ing peer->id=%d peer->fd=%d", s->id, s->peer->id, s->peer->fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->close(s->peer);
|
|
|
|
}
|
2016-05-18 01:55:06 +02:00
|
|
|
D("entered remote_socket_close RS(%d) CLOSE fd=%d peer->fd=%d", s->id, s->fd,
|
|
|
|
s->peer ? s->peer->fd : -1);
|
2015-09-03 02:44:28 +02:00
|
|
|
D("RS(%d): closed", s->id);
|
2018-02-13 02:24:00 +01:00
|
|
|
delete s;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-08-28 03:50:04 +02:00
|
|
|
// Create a remote socket to exchange packets with a remote service through transport
|
|
|
|
// |t|. Where |id| is the socket id of the corresponding service on the other
|
|
|
|
// side of the transport (it is allocated by the remote side and _cannot_ be 0).
|
|
|
|
// Returns a new non-NULL asocket handle.
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* create_remote_socket(unsigned id, atransport* t) {
|
|
|
|
if (id == 0) {
|
|
|
|
fatal("invalid remote socket id (0)");
|
|
|
|
}
|
2018-02-13 02:24:00 +01:00
|
|
|
asocket* s = new asocket();
|
2009-03-04 04:32:55 +01:00
|
|
|
s->id = id;
|
|
|
|
s->enqueue = remote_socket_enqueue;
|
|
|
|
s->ready = remote_socket_ready;
|
2013-12-13 14:09:44 +01:00
|
|
|
s->shutdown = remote_socket_shutdown;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close = remote_socket_close;
|
|
|
|
s->transport = t;
|
|
|
|
|
2015-09-03 02:44:28 +02:00
|
|
|
D("RS(%d): created", s->id);
|
2009-03-04 04:32:55 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
void connect_to_remote(asocket* s, const char* destination) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("Connect_to_remote call RS(%d) fd=%d", s->id, s->fd);
|
2016-05-18 01:55:06 +02:00
|
|
|
apacket* p = get_apacket();
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-09-03 02:44:28 +02:00
|
|
|
D("LS(%d): connect('%s')", s->id, destination);
|
2009-03-04 04:32:55 +01:00
|
|
|
p->msg.command = A_OPEN;
|
|
|
|
p->msg.arg0 = s->id;
|
2018-02-06 03:49:10 +01:00
|
|
|
|
|
|
|
// adbd expects a null-terminated string.
|
2018-03-08 01:52:28 +01:00
|
|
|
p->payload.assign(destination, destination + strlen(destination) + 1);
|
2018-02-06 03:49:10 +01:00
|
|
|
p->msg.data_length = p->payload.size();
|
|
|
|
|
|
|
|
if (p->msg.data_length > s->get_max_payload()) {
|
|
|
|
fatal("destination oversized");
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
send_packet(p, s->transport);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this is used by magic sockets to rig local sockets to
|
|
|
|
send the go-ahead message when they connect */
|
2016-05-18 01:55:06 +02:00
|
|
|
static void local_socket_ready_notify(asocket* s) {
|
2009-03-04 04:32:55 +01:00
|
|
|
s->ready = local_socket_ready;
|
2013-12-13 14:09:44 +01:00
|
|
|
s->shutdown = NULL;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close = local_socket_close;
|
2015-05-01 02:32:03 +02:00
|
|
|
SendOkay(s->fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
s->ready(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this is used by magic sockets to rig local sockets to
|
|
|
|
send the failure message if they are closed before
|
|
|
|
connected (to avoid closing them without a status message) */
|
2016-05-18 01:55:06 +02:00
|
|
|
static void local_socket_close_notify(asocket* s) {
|
2009-03-04 04:32:55 +01:00
|
|
|
s->ready = local_socket_ready;
|
2013-12-13 14:09:44 +01:00
|
|
|
s->shutdown = NULL;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close = local_socket_close;
|
2015-05-01 02:32:03 +02:00
|
|
|
SendFail(s->fd, "closed");
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close(s);
|
|
|
|
}
|
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
static unsigned unhex(const char* s, int len) {
|
2009-03-04 04:32:55 +01:00
|
|
|
unsigned n = 0, c;
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
while (len-- > 0) {
|
|
|
|
switch ((c = *s++)) {
|
|
|
|
case '0':
|
|
|
|
case '1':
|
|
|
|
case '2':
|
|
|
|
case '3':
|
|
|
|
case '4':
|
|
|
|
case '5':
|
|
|
|
case '6':
|
|
|
|
case '7':
|
|
|
|
case '8':
|
|
|
|
case '9':
|
|
|
|
c -= '0';
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
case 'b':
|
|
|
|
case 'c':
|
|
|
|
case 'd':
|
|
|
|
case 'e':
|
|
|
|
case 'f':
|
|
|
|
c = c - 'a' + 10;
|
|
|
|
break;
|
|
|
|
case 'A':
|
|
|
|
case 'B':
|
|
|
|
case 'C':
|
|
|
|
case 'D':
|
|
|
|
case 'E':
|
|
|
|
case 'F':
|
|
|
|
c = c - 'A' + 10;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0xffffffff;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
n = (n << 4) | c;
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2015-05-01 02:32:03 +02:00
|
|
|
#if ADB_HOST
|
|
|
|
|
2016-03-01 17:58:26 +01:00
|
|
|
namespace internal {
|
|
|
|
|
|
|
|
// Returns the position in |service| following the target serial parameter. Serial format can be
|
|
|
|
// any of:
|
|
|
|
// * [tcp:|udp:]<serial>[:<port>]:<command>
|
|
|
|
// * <prefix>:<serial>:<command>
|
|
|
|
// Where <port> must be a base-10 number and <prefix> may be any of {usb,product,model,device}.
|
|
|
|
//
|
|
|
|
// The returned pointer will point to the ':' just before <command>, or nullptr if not found.
|
2016-03-29 00:32:37 +02:00
|
|
|
char* skip_host_serial(char* service) {
|
2016-03-01 17:58:26 +01:00
|
|
|
static const std::vector<std::string>& prefixes =
|
|
|
|
*(new std::vector<std::string>{"usb:", "product:", "model:", "device:"});
|
|
|
|
|
|
|
|
for (const std::string& prefix : prefixes) {
|
|
|
|
if (!strncmp(service, prefix.c_str(), prefix.length())) {
|
|
|
|
return strchr(service + prefix.length(), ':');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// For fastboot compatibility, ignore protocol prefixes.
|
|
|
|
if (!strncmp(service, "tcp:", 4) || !strncmp(service, "udp:", 4)) {
|
|
|
|
service += 4;
|
2012-05-31 21:04:23 +02:00
|
|
|
}
|
|
|
|
|
2016-09-21 21:08:37 +02:00
|
|
|
// Check for an IPv6 address. `adb connect` creates the serial number from the canonical
|
|
|
|
// network address so it will always have the [] delimiters.
|
|
|
|
if (service[0] == '[') {
|
|
|
|
char* ipv6_end = strchr(service, ']');
|
|
|
|
if (ipv6_end != nullptr) {
|
|
|
|
service = ipv6_end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The next colon we find must either begin the port field or the command field.
|
|
|
|
char* colon_ptr = strchr(service, ':');
|
|
|
|
if (!colon_ptr) {
|
2016-03-01 17:58:26 +01:00
|
|
|
// No colon in service string.
|
|
|
|
return nullptr;
|
2011-03-16 09:43:56 +01:00
|
|
|
}
|
2016-03-01 17:58:26 +01:00
|
|
|
|
2016-09-21 21:08:37 +02:00
|
|
|
// If the next field is only decimal digits and ends with another colon, it's a port.
|
|
|
|
char* serial_end = colon_ptr;
|
2011-03-16 09:43:56 +01:00
|
|
|
if (isdigit(serial_end[1])) {
|
|
|
|
serial_end++;
|
2016-03-01 17:58:26 +01:00
|
|
|
while (*serial_end && isdigit(*serial_end)) {
|
2011-03-16 09:43:56 +01:00
|
|
|
serial_end++;
|
|
|
|
}
|
2016-03-01 17:58:26 +01:00
|
|
|
if (*serial_end != ':') {
|
2016-09-21 21:08:37 +02:00
|
|
|
// Something other than "<port>:" was found, this must be the command field instead.
|
|
|
|
serial_end = colon_ptr;
|
2011-03-16 09:43:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return serial_end;
|
|
|
|
}
|
|
|
|
|
2016-03-01 17:58:26 +01:00
|
|
|
} // namespace internal
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
#endif // ADB_HOST
|
2015-05-01 02:32:03 +02:00
|
|
|
|
2018-03-08 01:52:28 +01:00
|
|
|
static int smart_socket_enqueue(asocket* s, apacket::payload_type data) {
|
2009-03-04 04:32:55 +01:00
|
|
|
#if ADB_HOST
|
2016-05-18 01:55:06 +02:00
|
|
|
char* service = nullptr;
|
2015-10-07 23:55:10 +02:00
|
|
|
char* serial = nullptr;
|
2017-08-17 01:57:01 +02:00
|
|
|
TransportId transport_id = 0;
|
2015-05-05 22:10:43 +02:00
|
|
|
TransportType type = kTransportAny;
|
2009-03-04 04:32:55 +01:00
|
|
|
#endif
|
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
D("SS(%d): enqueue %zu", s->id, data.size());
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
if (s->smart_socket_data.empty()) {
|
2018-03-08 01:52:28 +01:00
|
|
|
// TODO: Make this a BlockChain?
|
|
|
|
s->smart_socket_data.assign(data.begin(), data.end());
|
2009-03-04 04:32:55 +01:00
|
|
|
} else {
|
2018-02-01 22:17:50 +01:00
|
|
|
std::copy(data.begin(), data.end(), std::back_inserter(s->smart_socket_data));
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-01-15 23:35:54 +01:00
|
|
|
/* don't bother if we can't decode the length */
|
2018-02-01 22:17:50 +01:00
|
|
|
if (s->smart_socket_data.size() < 4) {
|
2016-05-18 01:55:06 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
uint32_t len = unhex(s->smart_socket_data.data(), 4);
|
|
|
|
if (len == 0 || len > MAX_PAYLOAD) {
|
|
|
|
D("SS(%d): bad size (%u)", s->id, len);
|
2009-03-04 04:32:55 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
D("SS(%d): len is %u", s->id, len);
|
2016-01-15 23:35:54 +01:00
|
|
|
/* can't do anything until we have the full header */
|
2018-02-01 22:17:50 +01:00
|
|
|
if ((len + 4) > s->smart_socket_data.size()) {
|
|
|
|
D("SS(%d): waiting for %zu more bytes", s->id, len + 4 - s->smart_socket_data.size());
|
2009-03-04 04:32:55 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
s->smart_socket_data[len + 4] = 0;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
D("SS(%d): '%s'", s->id, (char*)(s->smart_socket_data.data() + 4));
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
#if ADB_HOST
|
2018-02-01 22:17:50 +01:00
|
|
|
service = &s->smart_socket_data[4];
|
2016-05-18 01:55:06 +02:00
|
|
|
if (!strncmp(service, "host-serial:", strlen("host-serial:"))) {
|
2009-03-04 04:32:55 +01:00
|
|
|
char* serial_end;
|
|
|
|
service += strlen("host-serial:");
|
|
|
|
|
2011-03-16 09:43:56 +01:00
|
|
|
// serial number should follow "host:" and could be a host:port string.
|
2016-03-01 17:58:26 +01:00
|
|
|
serial_end = internal::skip_host_serial(service);
|
2009-03-04 04:32:55 +01:00
|
|
|
if (serial_end) {
|
2016-05-18 01:55:06 +02:00
|
|
|
*serial_end = 0; // terminate string
|
2009-03-04 04:32:55 +01:00
|
|
|
serial = service;
|
|
|
|
service = serial_end + 1;
|
|
|
|
}
|
2017-08-17 01:57:01 +02:00
|
|
|
} else if (!strncmp(service, "host-transport-id:", strlen("host-transport-id:"))) {
|
|
|
|
service += strlen("host-transport-id:");
|
|
|
|
transport_id = strtoll(service, &service, 10);
|
|
|
|
|
|
|
|
if (*service != ':') {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
service++;
|
2009-03-04 04:32:55 +01:00
|
|
|
} else if (!strncmp(service, "host-usb:", strlen("host-usb:"))) {
|
2015-05-05 22:10:43 +02:00
|
|
|
type = kTransportUsb;
|
2009-03-04 04:32:55 +01:00
|
|
|
service += strlen("host-usb:");
|
|
|
|
} else if (!strncmp(service, "host-local:", strlen("host-local:"))) {
|
2015-05-05 22:10:43 +02:00
|
|
|
type = kTransportLocal;
|
2009-03-04 04:32:55 +01:00
|
|
|
service += strlen("host-local:");
|
|
|
|
} else if (!strncmp(service, "host:", strlen("host:"))) {
|
2015-05-05 22:10:43 +02:00
|
|
|
type = kTransportAny;
|
2009-03-04 04:32:55 +01:00
|
|
|
service += strlen("host:");
|
|
|
|
} else {
|
2015-10-07 23:55:10 +02:00
|
|
|
service = nullptr;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (service) {
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* s2;
|
|
|
|
|
|
|
|
/* some requests are handled immediately -- in that
|
|
|
|
** case the handle_host_request() routine has sent
|
|
|
|
** the OKAY or FAIL message and all we have to do
|
|
|
|
** is clean up.
|
|
|
|
*/
|
2017-08-17 01:57:01 +02:00
|
|
|
if (handle_host_request(service, type, serial, transport_id, s->peer->fd, s) == 0) {
|
2016-05-18 01:55:06 +02:00
|
|
|
/* XXX fail message? */
|
|
|
|
D("SS(%d): handled host service '%s'", s->id, service);
|
2009-03-04 04:32:55 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (!strncmp(service, "transport", strlen("transport"))) {
|
2016-05-18 01:55:06 +02:00
|
|
|
D("SS(%d): okay transport", s->id);
|
2018-02-01 22:17:50 +01:00
|
|
|
s->smart_socket_data.clear();
|
2009-03-04 04:32:55 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* try to find a local service with this name.
|
|
|
|
** if no such service exists, we'll fail out
|
|
|
|
** and tear down here.
|
|
|
|
*/
|
2017-08-17 01:57:01 +02:00
|
|
|
s2 = create_host_service_socket(service, serial, transport_id);
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s2 == 0) {
|
|
|
|
D("SS(%d): couldn't create host service '%s'", s->id, service);
|
2015-05-01 02:32:03 +02:00
|
|
|
SendFail(s->peer->fd, "unknown host service");
|
2009-03-04 04:32:55 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* we've connected to a local host service,
|
|
|
|
** so we make our peer back into a regular
|
|
|
|
** local socket and bind it to the new local
|
|
|
|
** service socket, acknowledge the successful
|
|
|
|
** connection, and close this smart socket now
|
|
|
|
** that its work is done.
|
|
|
|
*/
|
2015-05-01 02:32:03 +02:00
|
|
|
SendOkay(s->peer->fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
s->peer->ready = local_socket_ready;
|
2015-10-07 23:55:10 +02:00
|
|
|
s->peer->shutdown = nullptr;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->close = local_socket_close;
|
|
|
|
s->peer->peer = s2;
|
|
|
|
s2->peer = s->peer;
|
|
|
|
s->peer = 0;
|
2016-05-18 01:55:06 +02:00
|
|
|
D("SS(%d): okay", s->id);
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close(s);
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* initial state is "ready" */
|
2009-03-04 04:32:55 +01:00
|
|
|
s2->ready(s2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else /* !ADB_HOST */
|
2015-10-07 23:55:10 +02:00
|
|
|
if (s->transport == nullptr) {
|
2015-04-17 07:54:44 +02:00
|
|
|
std::string error_msg = "unknown failure";
|
2017-08-17 01:57:01 +02:00
|
|
|
s->transport = acquire_one_transport(kTransportAny, nullptr, 0, nullptr, &error_msg);
|
2015-10-07 23:55:10 +02:00
|
|
|
if (s->transport == nullptr) {
|
2015-05-01 02:32:03 +02:00
|
|
|
SendFail(s->peer->fd, error_msg);
|
2009-03-04 04:32:55 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-10-27 23:01:08 +02:00
|
|
|
if (!s->transport) {
|
|
|
|
SendFail(s->peer->fd, "device offline (no transport)");
|
|
|
|
goto fail;
|
adb: fix two device offline problems.
When device goes offline, user usually has to manually replug the
usb device. This patch tries to solve two offline situations, all
because when adb on host is killed, the adbd on device is not notified.
1. When adb server is killed while pushing a large file to device,
the device is still reading the unfinished large message. So the
device thinks of the CNXN message as part of the previous unfinished
message, so it doesn't reply and the device is in offline state.
The solution is to add a write_msg_lock in atransport struct. And it
kicks the transport only after sending a whole message. By kicking
all transports before exit, we ensure that we don't write part of
a message to any device. So next time we start adb server, the device
should be waiting for a new message.
2. When adb server is killed while pulling a large file from device,
the device is still trying to send the unfinished large message. So
adb on host usually reads data with EOVERFLOW error. This is because
adb on host is reading less than one packet sent from device.
The solution is to use buffered read on host. The max packet size
of bulk transactions in USB 3.0 is 1024 bytes. By preparing an at least
1024 bytes buffer when reading, EOVERFLOW no longer occurs. And teach
adb host to ignore wrong messages.
To be safe, this patch doesn't change any logic on device.
Bug: http://b/32952319
Test: run python -m unittest -q test_device.DeviceOfflineTest
Test: on linux/mac/windows with bullhead, ryu.
Change-Id: Ib149d30028a62a6f03857b8a95ab5a1d6e9b9c4e
2017-03-11 01:01:01 +01:00
|
|
|
} else if (s->transport->GetConnectionState() == kCsOffline) {
|
2016-05-18 01:55:06 +02:00
|
|
|
/* if there's no remote we fail the connection
|
|
|
|
** right here and terminate it
|
|
|
|
*/
|
2016-10-27 23:01:08 +02:00
|
|
|
SendFail(s->peer->fd, "device offline (transport offline)");
|
2009-03-04 04:32:55 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
/* instrument our peer to pass the success or fail
|
|
|
|
** message back once it connects or closes, then
|
|
|
|
** detach from it, request the connection, and
|
|
|
|
** tear down
|
|
|
|
*/
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->ready = local_socket_ready_notify;
|
2015-10-07 23:55:10 +02:00
|
|
|
s->peer->shutdown = nullptr;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->close = local_socket_close_notify;
|
|
|
|
s->peer->peer = 0;
|
2016-05-18 01:55:06 +02:00
|
|
|
/* give him our transport and upref it */
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->transport = s->transport;
|
|
|
|
|
2018-02-01 22:17:50 +01:00
|
|
|
connect_to_remote(s->peer, s->smart_socket_data.data() + 4);
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer = 0;
|
|
|
|
s->close(s);
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fail:
|
2016-05-18 01:55:06 +02:00
|
|
|
/* we're going to close our peer as a side-effect, so
|
|
|
|
** return -1 to signal that state to the local socket
|
|
|
|
** who is enqueueing against us
|
|
|
|
*/
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close(s);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void smart_socket_ready(asocket* s) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("SS(%d): ready", s->id);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static void smart_socket_close(asocket* s) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("SS(%d): closed", s->id);
|
2016-05-18 01:55:06 +02:00
|
|
|
if (s->peer) {
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer->peer = 0;
|
|
|
|
s->peer->close(s->peer);
|
2011-05-13 20:24:55 +02:00
|
|
|
s->peer = 0;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
2018-02-13 02:24:00 +01:00
|
|
|
delete s;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
static asocket* create_smart_socket(void) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("Creating smart socket");
|
2018-02-13 02:24:00 +01:00
|
|
|
asocket* s = new asocket();
|
2009-03-04 04:32:55 +01:00
|
|
|
s->enqueue = smart_socket_enqueue;
|
|
|
|
s->ready = smart_socket_ready;
|
2013-12-13 14:09:44 +01:00
|
|
|
s->shutdown = NULL;
|
2009-03-04 04:32:55 +01:00
|
|
|
s->close = smart_socket_close;
|
|
|
|
|
2015-09-03 02:44:28 +02:00
|
|
|
D("SS(%d)", s->id);
|
2009-03-04 04:32:55 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2016-05-18 01:55:06 +02:00
|
|
|
void connect_to_smartsocket(asocket* s) {
|
2015-09-03 02:44:28 +02:00
|
|
|
D("Connecting to smart socket");
|
2016-05-18 01:55:06 +02:00
|
|
|
asocket* ss = create_smart_socket();
|
2009-03-04 04:32:55 +01:00
|
|
|
s->peer = ss;
|
|
|
|
ss->peer = s;
|
|
|
|
s->ready(s);
|
|
|
|
}
|
2015-07-13 20:12:28 +02:00
|
|
|
|
|
|
|
size_t asocket::get_max_payload() const {
|
|
|
|
size_t max_payload = MAX_PAYLOAD;
|
|
|
|
if (transport) {
|
|
|
|
max_payload = std::min(max_payload, transport->get_max_payload());
|
|
|
|
}
|
|
|
|
if (peer && peer->transport) {
|
|
|
|
max_payload = std::min(max_payload, peer->transport->get_max_payload());
|
|
|
|
}
|
|
|
|
return max_payload;
|
|
|
|
}
|