inspector: perform DNS lookup for host

PR-URL: #13478 Fixes: #13477 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
nodejs · Jun 29, 2017 · 971009f · 971009f
1 parent 365d379
commit 971009f
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 163 deletions.
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -702,13 +702,7 @@ void Url(const FunctionCallbackInfo<Value>& args) {
 
   if (ids.empty()) return;
 
-  std::string url = "ws://";
-  url += io->host();
-  url += ":";
-  url += std::to_string(io->port());
-  url += "/";
-  url += ids[0];
-
+  std::string url = FormatWsAddress(io->host(), io->port(), ids[0], true);
   args.GetReturnValue().Set(OneByteString(env->isolate(), url.c_str()));
 }
 

diff --git a/src/inspector_io.cc b/src/inspector_io.cc
@@ -313,7 +313,7 @@ void InspectorIo::ThreadMain() {
     uv_sem_post(&thread_start_sem_);
     return;
   }
-  port_ = server.port();  // Safe, main thread is waiting on semaphore.
+  port_ = server.Port();  // Safe, main thread is waiting on semaphore.
   if (!wait_for_connect_) {
     uv_sem_post(&thread_start_sem_);
   }

diff --git a/src/inspector_io.h b/src/inspector_io.h
@@ -28,6 +28,10 @@ class StringView;
 namespace node {
 namespace inspector {
 
+std::string FormatWsAddress(const std::string& host, int port,
+                            const std::string& target_id,
+                            bool include_protocol);
+
 class InspectorIoDelegate;
 
 enum class InspectorAction {

diff --git a/src/inspector_socket.h b/src/inspector_socket.h
@@ -63,6 +63,7 @@ class InspectorSocket {
   bool ws_mode;
   bool shutting_down;
   bool connection_eof;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(InspectorSocket);
 };