1From 66d94d8c304240d0729bd3fd077ba61ade0a97e7 Mon Sep 17 00:00:00 2001 2From: Lin Huang <hl@rock-chips.com> 3Date: Thu, 16 May 2019 09:28:03 +0800 4Subject: [PATCH 14/20] adbd: Fix adb forward issue 5 6Signed-off-by: Lin Huang <hl@rock-chips.com> 7Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 8--- 9 core/adbd/services.c | 2 +- 10 core/libcutils/socket_local_client.c | 2 +- 11 2 files changed, 2 insertions(+), 2 deletions(-) 12 13diff --git a/core/adbd/services.c b/core/adbd/services.c 14index e4eedc9..03140e7 100644 15--- a/core/adbd/services.c 16+++ b/core/adbd/services.c 17@@ -431,7 +431,7 @@ int service_to_fd(const char *name) 18 #ifndef HAVE_WINSOCK /* winsock doesn't implement unix domain sockets */ 19 } else if(!strncmp(name, "local:", 6)) { 20 ret = socket_local_client(name + 6, 21- ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM); 22+ ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); 23 } else if(!strncmp(name, "localreserved:", 14)) { 24 ret = socket_local_client(name + 14, 25 ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM); 26diff --git a/core/libcutils/socket_local_client.c b/core/libcutils/socket_local_client.c 27index 036ce2e..4ab600f 100644 28--- a/core/libcutils/socket_local_client.c 29+++ b/core/libcutils/socket_local_client.c 30@@ -50,7 +50,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId, 31 32 switch (namespaceId) { 33 case ANDROID_SOCKET_NAMESPACE_ABSTRACT: 34-#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 35+#if defined(__linux__) 36 namelen = strlen(name); 37 38 // Test with length +1 for the *initial* '\0'. 39-- 402.20.1 41 42