diff options
Diffstat (limited to 'adb/adb_client.c')
| -rw-r--r-- | adb/adb_client.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/adb/adb_client.c b/adb/adb_client.c index 8340738..9a812f0 100644 --- a/adb/adb_client.c +++ b/adb/adb_client.c @@ -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); - + 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); |