am 2507aed4: reset to 016806a7, but keep bad history for fast forward (823ce038) · Commits · e / os / android_system_core

adb/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ EXTRA_SRCS :=
		ifeq ($(HOST_OS),linux)
		USB_SRCS := usb_linux.c
		EXTRA_SRCS := get_my_path_linux.c
		LOCAL_LDLIBS += -lrt -ldl -lpthread
		LOCAL_LDLIBS += -lrt -lncurses -lpthread
		endif

		ifeq ($(HOST_OS),darwin)
		@@ -139,7 +139,7 @@ include $(BUILD_EXECUTABLE)
		ifneq ($(SDK_ONLY),true)
		include $(CLEAR_VARS)

		LOCAL_LDLIBS := -lrt -ldl -lpthread
		LOCAL_LDLIBS := -lrt -lncurses -lpthread

		LOCAL_SRC_FILES := \
		adb.c \

adb/SERVICES.TXT

+0 −27

Original line number	Diff line number	Diff line
		@@ -117,34 +117,7 @@ host:<request>

		or even any one of the local services described below.

		<host-prefix>:forward:norebind:<local>;<remote>
		Same as <host-prefix>:forward:<local>;<remote> except that it will
		fail it there is already a forward connection from <local>.

		Used to implement 'adb forward --no-rebind <local> <remote>'

		<host-prefix>:killforward:<local>
		Remove any existing forward local connection from <local>.
		This is used to implement 'adb forward --remove <local>'

		<host-prefix>:killforward-all
		Remove all forward network connections.
		This is used to implement 'adb forward --remove-all'.

		<host-prefix>:list-forward
		List all existing forward connections from this server.
		This returns something that looks like the following:

		<hex4>: The length of the payload, as 4 hexadecimal chars.
		<payload>: A series of lines of the following format:

		<serial> " " <local> " " <remote> "\n"

		Where <serial> is a device serial number.
		<local> is the host-specific endpoint (e.g. tcp:9000).
		<remote> is the device-specific endpoint.

		Used to implement 'adb forward --list'.

		LOCAL SERVICES:

adb/adb.c

+30 −182

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <string.h>
		#include <time.h>
		#include <sys/time.h>
		#include <stdint.h>

		#include "sysdeps.h"
		#include "adb.h"
		@@ -47,7 +46,6 @@ ADB_MUTEX_DEFINE( D_lock );
		#endif

		int HOST = 0;
		int gListenAll = 0;

		static int auth_enabled = 0;

		@@ -703,13 +701,7 @@ int local_name_to_fd(const char *name)
		if(!strncmp("tcp:", name, 4)){
		int ret;
		port = atoi(name + 4);

		if (gListenAll > 0) {
		ret = socket_inaddr_any_server(port, SOCK_STREAM);
		} else {
		ret = socket_loopback_server(port, SOCK_STREAM);
		}

		return ret;
		}
		#ifndef HAVE_WIN32_IPC /* no Unix-domain sockets on Win32 */
		@@ -730,90 +722,24 @@ int local_name_to_fd(const char *name)
		return -1;
		}

		// Write a single line describing a listener to a user-provided buffer.
		// Appends a trailing zero, even in case of truncation, but the function
		// returns the full line length.
		// If \|buffer\| is NULL, does not write but returns required size.
		static int format_listener(alistener* l, char* buffer, size_t buffer_len) {
		// Format is simply:
		//
		// <device-serial> " " <local-name> " " <remote-name> "\n"
		//
		int local_len = strlen(l->local_name);
		int connect_len = strlen(l->connect_to);
		int serial_len = strlen(l->transport->serial);

		if (buffer != NULL) {
		snprintf(buffer, buffer_len, "%s %s %s\n",
		l->transport->serial, l->local_name, l->connect_to);
		}
		// NOTE: snprintf() on Windows returns -1 in case of truncation, so
		// return the computed line length instead.
		return local_len + connect_len + serial_len + 3;
		}

		// Write the list of current listeners (network redirections) into a
		// user-provided buffer. Appends a trailing zero, even in case of
		// trunctaion, but return the full size in bytes.
		// If \|buffer\| is NULL, does not write but returns required size.
		static int format_listeners(char* buf, size_t buflen)
		{
		alistener* l;
		int result = 0;
		for (l = listener_list.next; l != &listener_list; l = l->next) {
		// Ignore special listeners like those for smartsocket
		if (l->connect_to[0] == '*')
		continue;
		int len = format_listener(l, buf, buflen);
		// Ensure there is space for the trailing zero.
		result += len;
		if (buf != NULL) {
		buf += len;
		buflen -= len;
		if (buflen <= 0)
		break;
		}
		}
		return result;
		}

		static int remove_listener(const char local_name, atransport transport)
		static int remove_listener(const char local_name, const char connect_to, atransport* transport)
		{
		alistener *l;

		for (l = listener_list.next; l != &listener_list; l = l->next) {
		if (!strcmp(local_name, l->local_name)) {
		listener_disconnect(l, l->transport);
		if (!strcmp(local_name, l->local_name) &&
		!strcmp(connect_to, l->connect_to) &&
		l->transport && l->transport == transport) {

		listener_disconnect(l, transport);
		return 0;
		}
		}

		return -1;
		}

		static void remove_all_listeners(void)
		{
		alistener l, l_next;
		for (l = listener_list.next; l != &listener_list; l = l_next) {
		l_next = l->next;
		// Never remove smart sockets.
		if (l->connect_to[0] == '*')
		continue;
		listener_disconnect(l, l->transport);
		}
		}

		// error/status codes for install_listener.
		typedef enum {
		INSTALL_STATUS_OK = 0,
		INSTALL_STATUS_INTERNAL_ERROR = -1,
		INSTALL_STATUS_CANNOT_BIND = -2,
		INSTALL_STATUS_CANNOT_REBIND = -3,
		} install_status_t;

		static install_status_t install_listener(const char *local_name,
		const char *connect_to,
		atransport* transport,
		int no_rebind)
		static int install_listener(const char local_name, const char connect_to, atransport* transport)
		{
		alistener *l;

		@@ -825,17 +751,12 @@ static install_status_t install_listener(const char *local_name,

		/* can't repurpose a smartsocket */
		if(l->connect_to[0] == '*') {
		return INSTALL_STATUS_INTERNAL_ERROR;
		}

		/* can't repurpose a listener if 'no_rebind' is true */
		if (no_rebind) {
		return INSTALL_STATUS_CANNOT_REBIND;
		return -1;
		}

		cto = strdup(connect_to);
		if(cto == 0) {
		return INSTALL_STATUS_INTERNAL_ERROR;
		return -1;
		}

		//printf("rebinding '%s' to '%s'\n", local_name, connect_to);
		@@ -846,7 +767,7 @@ static install_status_t install_listener(const char *local_name,
		l->transport = transport;
		add_transport_disconnect(l->transport, &l->disconnect);
		}
		return INSTALL_STATUS_OK;
		return 0;
		}
		}

		@@ -883,11 +804,11 @@ static install_status_t install_listener(const char *local_name,
		l->disconnect.func = listener_disconnect;
		add_transport_disconnect(transport, &l->disconnect);
		}
		return INSTALL_STATUS_OK;
		return 0;

		nomem:
		fatal("cannot allocate listener");
		return INSTALL_STATUS_INTERNAL_ERROR;
		return 0;
		}

		#ifdef HAVE_WIN32_PROC
		@@ -992,7 +913,6 @@ int launch_server(int server_port)
		/* message since the pipe handles must be inheritable, we use a */
		/* security attribute */
		HANDLE pipe_read, pipe_write;
		HANDLE stdout_handle, stderr_handle;
		SECURITY_ATTRIBUTES sa;
		STARTUPINFO startup;
		PROCESS_INFORMATION pinfo;
		@@ -1012,26 +932,6 @@ int launch_server(int server_port)

		SetHandleInformation( pipe_read, HANDLE_FLAG_INHERIT, 0 );

		/* Some programs want to launch an adb command and collect its output by
		* calling CreateProcess with inheritable stdout/stderr handles, then
		* using read() to get its output. When this happens, the stdout/stderr
		* handles passed to the adb client process will also be inheritable.
		* When starting the adb server here, care must be taken to reset them
		* to non-inheritable.
		* Otherwise, something bad happens: even if the adb command completes,
		* the calling process is stuck while read()-ing from the stdout/stderr
		* descriptors, because they're connected to corresponding handles in the
		* adb server process (even if the latter never uses/writes to them).
		*/
		stdout_handle = GetStdHandle( STD_OUTPUT_HANDLE );
		stderr_handle = GetStdHandle( STD_ERROR_HANDLE );
		if (stdout_handle != INVALID_HANDLE_VALUE) {
		SetHandleInformation( stdout_handle, HANDLE_FLAG_INHERIT, 0 );
		}
		if (stderr_handle != INVALID_HANDLE_VALUE) {
		SetHandleInformation( stderr_handle, HANDLE_FLAG_INHERIT, 0 );
		}

		ZeroMemory( &startup, sizeof(startup) );
		startup.cb = sizeof(startup);
		startup.hStdInput = GetStdHandle( STD_INPUT_HANDLE );
		@@ -1108,10 +1008,8 @@ int launch_server(int server_port)
		dup2(fd[1], STDERR_FILENO);
		adb_close(fd[1]);

		char str_port[30];
		snprintf(str_port, sizeof(str_port), "%d", server_port);
		// child process
		int result = execl(path, "adb", "-P", str_port, "fork-server", "server", NULL);
		int result = execl(path, "adb", "fork-server", "server", NULL);
		// this should not return
		fprintf(stderr, "OOPS! execl returned %d, errno: %d\n", result, errno);
		} else {
		@@ -1215,7 +1113,7 @@ int adb_main(int is_daemon, int server_port)

		char local_name[30];
		build_local_name(local_name, sizeof(local_name), server_port);
		if(install_listener(local_name, "smartsocket", NULL, 0)) {
		if(install_listener(local_name, "smartsocket", NULL)) {
		exit(1);
		}
		#else
		@@ -1282,7 +1180,7 @@ int adb_main(int is_daemon, int server_port)
		} else {
		char local_name[30];
		build_local_name(local_name, sizeof(local_name), server_port);
		if(install_listener(local_name, "smartsocket", NULL, 0)) {
		if(install_listener(local_name, "smartsocket", NULL)) {
		exit(1);
		}
		}
		@@ -1576,47 +1474,15 @@ int handle_host_request(char service, transport_type ttype, char serial, int r
		}
		#endif // ADB_HOST

		if(!strcmp(service,"list-forward")) {
		// Create the list of forward redirections.
		char header[9];
		int buffer_size = format_listeners(NULL, 0);
		// Add one byte for the trailing zero.
		char* buffer = malloc(buffer_size+1);
		(void) format_listeners(buffer, buffer_size+1);
		snprintf(header, sizeof header, "OKAY%04x", buffer_size);
		writex(reply_fd, header, 8);
		writex(reply_fd, buffer, buffer_size);
		free(buffer);
		return 0;
		}

		if (!strcmp(service,"killforward-all")) {
		remove_all_listeners();
		adb_write(reply_fd, "OKAYOKAY", 8);
		return 0;
		}

		if(!strncmp(service,"forward:",8) \|\|
		!strncmp(service,"killforward:",12)) {
		if(!strncmp(service,"forward:",8) \|\| !strncmp(service,"killforward:",12)) {
		char local, remote, *err;
		int r;
		atransport *transport;

		int createForward = strncmp(service,"kill",4);
		int no_rebind = 0;

		local = strchr(service, ':') + 1;

		// Handle forward:norebind:<local>... here
		if (createForward && !strncmp(local, "norebind:", 9)) {
		no_rebind = 1;
		local = strchr(local, ':') + 1;
		}

		local = service + (createForward ? 8 : 12);
		remote = strchr(local,';');

		if (createForward) {
		// Check forward: parameter format: '<local>;<remote>'
		if(remote == 0) {
		sendfailmsg(reply_fd, "malformed forward spec");
		return 0;
		@@ -1627,13 +1493,6 @@ int handle_host_request(char service, transport_type ttype, char serial, int r
		sendfailmsg(reply_fd, "malformed forward spec");
		return 0;
		}
		} else {
		// Check killforward: parameter format: '<local>'
		if (local[0] == 0) {
		sendfailmsg(reply_fd, "malformed forward spec");
		return 0;
		}
		}

		transport = acquire_one_transport(CS_ANY, ttype, serial, &err);
		if (!transport) {
		@@ -1642,9 +1501,9 @@ int handle_host_request(char service, transport_type ttype, char serial, int r
		}

		if (createForward) {
		r = install_listener(local, remote, transport, no_rebind);
		r = install_listener(local, remote, transport);
		} else {
		r = remove_listener(local, transport);
		r = remove_listener(local, remote, transport);
		}
		if(r == 0) {
		/* 1st OKAY is connect, 2nd OKAY is status */
		@@ -1653,18 +1512,7 @@ int handle_host_request(char service, transport_type ttype, char serial, int r
		}

		if (createForward) {
		const char* message;
		switch (r) {
		case INSTALL_STATUS_CANNOT_BIND:
		message = "cannot bind to socket";
		break;
		case INSTALL_STATUS_CANNOT_REBIND:
		message = "cannot rebind existing socket";
		break;
		default:
		message = "internal error";
		}
		sendfailmsg(reply_fd, message);
		sendfailmsg(reply_fd, (r == -1) ? "cannot rebind smartsocket" : "cannot bind socket");
		} else {
		sendfailmsg(reply_fd, "cannot remove listener");
		}

adb/adb_client.c

+3 −16

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ static transport_type __adb_transport = kTransportAny;
		static const char* __adb_serial = NULL;

		static int __adb_server_port = DEFAULT_ADB_PORT;
		static const char* __adb_server_name = NULL;

		void adb_set_transport(transport_type type, const char* serial)
		{
		@@ -30,11 +29,6 @@ void adb_set_tcp_specifics(int server_port)
		__adb_server_port = server_port;
		}

		void adb_set_tcp_name(const char* hostname)
		{
		__adb_server_name = hostname;
		}

		int adb_get_emulator_console_port(void)
		{
		const char* serial = __adb_serial;
		@@ -187,11 +181,7 @@ int _adb_connect(const char *service)
		}
		snprintf(tmp, sizeof tmp, "%04x", len);

		if (__adb_server_name)
		fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM);
		else
		fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);

		if(fd < 0) {
		strcpy(__adb_error, "cannot connect to daemon");
		return -2;
		@@ -222,10 +212,7 @@ int adb_connect(const char *service)
		int fd = _adb_connect("host:version");

		D("adb_connect: service %s\n", service);
		if(fd == -2 && __adb_server_name) {
		fprintf(stderr,"** Cannot start server on remote host\n");
		return fd;
		} else if(fd == -2) {
		if(fd == -2) {
		fprintf(stdout,"* daemon not running. starting it now on port %d *\n",
		__adb_server_port);
		start_server:
		@@ -279,7 +266,7 @@ int adb_connect(const char *service)

		fd = _adb_connect(service);
		if(fd == -2) {
		fprintf(stderr,"** daemon still not running\n");
		fprintf(stderr,"** daemon still not running");
		}
		D("adb_connect: return fd %d\n", fd);

adb/adb_client.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,6 @@ void adb_set_transport(transport_type type, const char* serial);
		*/
		void adb_set_tcp_specifics(int server_port);

		/* Set TCP Hostname of the transport to use
		*/
		void adb_set_tcp_name(const char* hostname);

		/* Return the console port of the currently connected emulator (if any)
		* of -1 if there is no emulator, and -2 if there is more than one.
		* assumes adb_set_transport() was alled previously...