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