diff --git a/lldb/source/Plugins/Platform/OHOS/HdcClient.cpp b/lldb/source/Plugins/Platform/OHOS/HdcClient.cpp index bcac55f04b7d8c9aa4f6fcc051b5b74caa8ebb8c..26742b8c80eb7d521e0ab6af40e2f6a1653a8e31 100644 --- a/lldb/source/Plugins/Platform/OHOS/HdcClient.cpp +++ b/lldb/source/Plugins/Platform/OHOS/HdcClient.cpp @@ -143,7 +143,7 @@ void HdcClient::SetDeviceID(const std::string &device_id) { const std::string &HdcClient::GetDeviceID() const { return m_device_id; } bool HdcClient::IsServerLocal() { - return m_connect_addr == "localhost"; + return m_connect_addr == "localhost" || m_connect_addr == "127.0.0.1"; } namespace { diff --git a/lldb/source/Plugins/Platform/OHOS/PlatformOHOSRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/OHOS/PlatformOHOSRemoteGDBServer.cpp index 0a6a7b208f404077663ba924762c22de4a8c1934..5d21313dc3f7e9c9872db717a689ebe88193e0a4 100644 --- a/lldb/source/Plugins/Platform/OHOS/PlatformOHOSRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/OHOS/PlatformOHOSRemoteGDBServer.cpp @@ -40,20 +40,20 @@ static Status ForwardPortWithHdc( device_id = hdc.GetDeviceID(); LLDB_LOGF(log, "Connected to OHOS device \"%s\"", device_id.c_str()); - if (remote_port != 0) { - LLDB_LOGF(log, "Forwarding remote TCP port %d to local TCP port %d", - remote_port, local_port); - return hdc.SetPortForwarding(local_port, remote_port); + if (socket_namespace) { + LLDB_LOGF(log, "Forwarding remote socket \"%s\" to local TCP port %d", + remote_socket_name.str().c_str(), local_port); + return hdc.SetPortForwarding(local_port, remote_socket_name, + *socket_namespace); } - LLDB_LOGF(log, "Forwarding remote socket \"%s\" to local TCP port %d", - remote_socket_name.str().c_str(), local_port); + LLDB_LOGF(log, "Forwarding remote TCP port %d to local TCP port %d", + remote_port, local_port); - if (!socket_namespace) - return Status("Invalid socket namespace"); - - return hdc.SetPortForwarding(local_port, remote_socket_name, - *socket_namespace); + if (remote_port == 0) + return Status("Invalid remote_port"); + + return hdc.SetPortForwarding(local_port, remote_port); } static Status DeleteForwardPortWithHdc(const std::string &connect_addr,