[Lldb-commits] [PATCH] D79757: Try IPv4 before IPv6 when creating TCP connection

[Emre Kultursay via Phabricator via lldb-commits]

emrekultursay updated this revision to Diff 263599.
emrekultursay added a comment.

Enforce IPv4 usage only in Android code, revert non-Android changes.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D79757/new/

https://reviews.llvm.org/D79757

Files:
  lldb/source/Plugins/Platform/Android/AdbClient.cpp
  lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp


Index: lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
===================================================================
--- lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -188,7 +188,7 @@
     if (error.Success()) {
       m_port_forwards[pid] = local_port;
       std::ostringstream url_str;
-      url_str << "connect://localhost:" << local_port;
+      url_str << "connect://127.0.0.1:" << local_port;
       connect_url = url_str.str();
       break;
     }
Index: lldb/source/Plugins/Platform/Android/AdbClient.cpp
===================================================================
--- lldb/source/Plugins/Platform/Android/AdbClient.cpp
+++ lldb/source/Plugins/Platform/Android/AdbClient.cpp
@@ -141,7 +141,7 @@
   if (const char *env_port = std::getenv("ANDROID_ADB_SERVER_PORT")) {
     port = env_port;
   }
-  std::string uri = "connect://localhost:" + port;
+  std::string uri = "connect://127.0.0.1:" + port;
   m_conn->Connect(uri.c_str(), &error);
 
   return error;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79757.263599.patch
Type: text/x-patch
Size: 1112 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20200513/11625fb2/attachment-0001.bin>