Revert "Make adb's daemon-port on the host machine configurable."
Fix the build.
This reverts commit 5a00fd1c5542b302e5534d7c424ee92da3d6bceb.
diff --git a/adb/adb.c b/adb/adb.c
index f12120f..a34dd71 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -693,7 +693,7 @@
#endif
#if ADB_HOST
-int launch_server(int server_port)
+int launch_server()
{
#ifdef HAVE_WIN32_PROC
/* we need to start the server in the background */
@@ -828,17 +828,7 @@
}
#endif
-/* Constructs a local name of form tcp:port.
- * target_str points to the target string, it's content will be overwritten.
- * target_size is the capacity of the target string.
- * server_port is the port number to use for the local name.
- */
-void build_local_name(char* target_str, size_t target_size, int server_port)
-{
- snprintf(target_str, target_size, "tcp:%d", server_port);
-}
-
-int adb_main(int is_daemon, int server_port)
+int adb_main(int is_daemon)
{
#if !ADB_HOST
int secure = 0;
@@ -861,11 +851,9 @@
HOST = 1;
usb_vendors_init();
usb_init();
- local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
+ local_init(ADB_LOCAL_TRANSPORT_PORT);
- char local_name[30];
- build_local_name(local_name, sizeof(local_name), server_port);
- if(install_listener(local_name, "*smartsocket*", NULL)) {
+ if(install_listener("tcp:5037", "*smartsocket*", NULL)) {
exit(1);
}
#else
@@ -891,7 +879,7 @@
}
}
- /* don't listen on a port (default 5037) if running in secure mode */
+ /* don't listen on port 5037 if we are running in secure mode */
/* don't run as root if we are running in secure mode */
if (secure) {
struct __user_cap_header_struct header;
@@ -924,11 +912,9 @@
cap.inheritable = 0;
capset(&header, &cap);
- D("Local port disabled\n");
+ D("Local port 5037 disabled\n");
} else {
- char[30] local_name;
- build_local_name(local_name, sizeof(local_name), server_port);
- if(install_listener(&local_name, "*smartsocket*", NULL)) {
+ if(install_listener("tcp:5037", "*smartsocket*", NULL)) {
exit(1);
}
}
diff --git a/adb/adb.h b/adb/adb.h
index a2b611e..aaf8a28 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -237,8 +237,8 @@
void send_packet(apacket *p, atransport *t);
void get_my_path(char *s, size_t maxLen);
-int launch_server(int server_port);
-int adb_main(int is_daemon, int server_port);
+int launch_server();
+int adb_main(int is_daemon);
/* transports are ref-counted
@@ -358,8 +358,8 @@
#define print_packet(tag,p) do {} while (0)
#endif
-#define DEFAULT_ADB_PORT 5037
-#define DEFAULT_ADB_LOCAL_TRANSPORT_PORT 5555
+#define ADB_PORT 5037
+#define ADB_LOCAL_TRANSPORT_PORT 5555
#define ADB_CLASS 0xff
#define ADB_SUBCLASS 0x42
diff --git a/adb/adb_client.c b/adb/adb_client.c
index 882810a..243f0fa 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -16,19 +16,12 @@
static transport_type __adb_transport = kTransportAny;
static const char* __adb_serial = NULL;
-static int __adb_server_port = DEFAULT_ADB_PORT;
-
void adb_set_transport(transport_type type, const char* serial)
{
__adb_transport = type;
__adb_serial = serial;
}
-void adb_set_tcp_specifics(int server_port)
-{
- __adb_server_port = server_port;
-}
-
int adb_get_emulator_console_port(void)
{
const char* serial = __adb_serial;
@@ -181,7 +174,7 @@
}
snprintf(tmp, sizeof tmp, "%04x", len);
- fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);
+ fd = socket_loopback_client(ADB_PORT, SOCK_STREAM);
if(fd < 0) {
strcpy(__adb_error, "cannot connect to daemon");
return -2;
@@ -211,10 +204,9 @@
int fd = _adb_connect("host:version");
if(fd == -2) {
- fprintf(stdout,"* daemon not running. starting it now on port %d *\n",
- __adb_server_port);
+ fprintf(stdout,"* daemon not running. starting it now *\n");
start_server:
- if(launch_server(__adb_server_port)) {
+ if(launch_server(0)) {
fprintf(stderr,"* failed to start daemon *\n");
return -1;
} else {
@@ -322,3 +314,5 @@
adb_close(fd);
return 0;
}
+
+
diff --git a/adb/adb_client.h b/adb/adb_client.h
index 40ab189..8061579 100644
--- a/adb/adb_client.h
+++ b/adb/adb_client.h
@@ -25,10 +25,6 @@
*/
void adb_set_transport(transport_type type, const char* serial);
-/* Set TCP specifics of the transport to use
-*/
-void adb_set_tcp_specifics(int server_port);
-
/* 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...
diff --git a/adb/commandline.c b/adb/commandline.c
index 5e2e453..857cee3 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -761,7 +761,6 @@
int quote;
transport_type ttype = kTransportAny;
char* serial = NULL;
- char* server_port_str = NULL;
/* If defined, this should be an absolute path to
* the directory containing all of the various system images
@@ -777,20 +776,7 @@
serial = getenv("ANDROID_SERIAL");
- /* Validate and assign the server port */
- server_port_str = getenv("ANDROID_ADB_SERVER_PORT");
- int server_port = DEFAULT_ADB_PORT;
- if (server_port_str && strlen(server_port_str) > 0) {
- server_port = (int) strtol(server_port_str, NULL, 0);
- if (server_port <= 0) {
- fprintf(stderr,
- "adb: Env var ANDROID_ADB_SERVER_PORT must be a positive number. Got \"%s\"\n",
- server_port_str);
- return usage();
- }
- }
-
- /* modifiers and flags */
+ /* modifiers and flags */
while(argc > 0) {
if(!strcmp(argv[0],"nodaemon")) {
no_daemon = 1;
@@ -819,7 +805,7 @@
if (isdigit(argv[0][2])) {
serial = argv[0] + 2;
} else {
- if(argc < 2 || argv[0][2] != '\0') return usage();
+ if(argc < 2) return usage();
serial = argv[1];
argc--;
argv++;
@@ -837,13 +823,12 @@
}
adb_set_transport(ttype, serial);
- adb_set_tcp_specifics(server_port);
if ((argc > 0) && (!strcmp(argv[0],"server"))) {
if (no_daemon || is_daemon) {
- r = adb_main(is_daemon, server_port);
+ r = adb_main(is_daemon);
} else {
- r = launch_server(server_port);
+ r = launch_server();
}
if(r) {
fprintf(stderr,"* could not start server *\n");
@@ -908,10 +893,10 @@
/* quote empty strings and strings with spaces */
quote = (**argv == 0 || strchr(*argv, ' '));
if (quote)
- strcat(buf, "\"");
+ strcat(buf, "\"");
strcat(buf, *argv++);
if (quote)
- strcat(buf, "\"");
+ strcat(buf, "\"");
}
for(;;) {
diff --git a/adb/transport_local.c b/adb/transport_local.c
index cfd3b4b..81d120e 100644
--- a/adb/transport_local.c
+++ b/adb/transport_local.c
@@ -132,7 +132,7 @@
static void *client_socket_thread(void *x)
{
#if ADB_HOST
- int port = DEFAULT_ADB_LOCAL_TRANSPORT_PORT;
+ int port = ADB_LOCAL_TRANSPORT_PORT;
int count = ADB_LOCAL_TRANSPORT_MAX;
D("transport: client_socket_thread() starting\n");
@@ -244,7 +244,7 @@
if (HOST && local) {
adb_mutex_lock( &local_transports_lock );
{
- int index = (port - DEFAULT_ADB_LOCAL_TRANSPORT_PORT)/2;
+ int index = (port - ADB_LOCAL_TRANSPORT_PORT)/2;
if (!(port & 1) || index < 0 || index >= ADB_LOCAL_TRANSPORT_MAX) {
D("bad local transport port number: %d\n", port);