1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Subject: adb: Use local sockets where appropriate
Author: Hilko Bengen <bengen@debian.org>
Upstream-Status: Inappropriate
---
system/core/adb/adb.c | 6 +++++-
system/core/adb/adb_client.c | 5 +++--
system/core/adb/transport_local.c | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
--- a/system/core/adb/adb.c
+++ b/system/core/adb/adb.c
@@ -1230,7 +1230,11 @@ int launch_server(int server_port)
*/
void build_local_name(char* target_str, size_t target_size, int server_port)
{
- snprintf(target_str, target_size, "tcp:%d", server_port);
+ if (gListenAll > 0) {
+ snprintf(target_str, target_size, "tcp:%d", server_port);
+ } else {
+ snprintf(target_str, target_size, "local:%d", server_port);
+ }
}
#if !ADB_HOST
--- a/system/core/adb/adb_client.c
+++ b/system/core/adb/adb_client.c
@@ -185,12 +185,12 @@ int _adb_connect(const char *service)
strcpy(__adb_error, "service name too long");
return -1;
}
- snprintf(tmp, sizeof tmp, "%04x", len);
+ snprintf(tmp, sizeof tmp, "%d", __adb_server_port);
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_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
if(fd < 0) {
strcpy(__adb_error, "cannot connect to daemon");
@@ -201,6 +201,7 @@ int _adb_connect(const char *service)
return -1;
}
+ snprintf(tmp, sizeof tmp, "%04x", len);
if(writex(fd, tmp, 4) || writex(fd, service, len)) {
strcpy(__adb_error, "write failure during connection");
adb_close(fd);
--- a/system/core/adb/transport_local.c
+++ b/system/core/adb/transport_local.c
@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int co
}
#endif
if (fd < 0) {
- fd = socket_loopback_client(adb_port, SOCK_STREAM);
+ snprintf(buf, sizeof buf, "%d", adb_port);
+ fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
}
if (fd >= 0) {
|
