From ec90a7a92e03aa86f210707580668ccb02037924 Mon Sep 17 00:00:00 2001
From: Ali Ijaz Sheikh <ofrobots@google.com>
Date: Tue, 7 Jun 2016 18:02:03 -0700
Subject: [PATCH] inspector: change default port

We should use a different default port number for the new debug
protocol. This makes it easier for debuggers to guess which protocol
they are expected to use to talk to a node process with a debug
server.

PR-URL: https://github.com/nodejs/node/pull/7212
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
---
 src/inspector_agent.cc |  2 +-
 src/node.cc            | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index 821b131734..848fcf320f 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -244,7 +244,7 @@ class V8NodeInspector : public blink::V8Inspector {
   bool running_nested_loop_;
 };
 
-Agent::Agent(Environment* env) : port_(9229),
+Agent::Agent(Environment* env) : port_(0),
                                  wait_(false),
                                  connected_(false),
                                  shutting_down_(false),
diff --git a/src/node.cc b/src/node.cc
index cbb7e6433f..1544938cbe 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -143,6 +143,7 @@ static bool use_inspector = false;
 static bool use_debug_agent = false;
 static bool debug_wait_connect = false;
 static int debug_port = 5858;
+static int inspector_port = 9229;
 static const int v8_default_thread_pool_size = 4;
 static int v8_thread_pool_size = v8_default_thread_pool_size;
 static bool prof_process = false;
@@ -3436,12 +3437,17 @@ static bool ParseDebugOpt(const char* arg) {
   }
 
   if (port != nullptr) {
-    debug_port = atoi(port);
-    if (debug_port < 1024 || debug_port > 65535) {
+    int port_int = atoi(port);
+    if (port_int < 1024 || port_int > 65535) {
       fprintf(stderr, "Debug port must be in range 1024 to 65535.\n");
       PrintHelp();
       exit(12);
     }
+    if (use_inspector) {
+      inspector_port = port_int;
+    } else {
+      debug_port = port_int;
+    }
   }
 
   return true;
@@ -3703,22 +3709,21 @@ static void StartDebug(Environment* env, bool wait) {
   CHECK(!debugger_running);
 #if HAVE_INSPECTOR
   if (use_inspector) {
-    env->inspector_agent()->Start(default_platform, debug_port, wait);
+    env->inspector_agent()->Start(default_platform, inspector_port, wait);
     debugger_running = true;
   } else {
 #endif
     env->debugger_agent()->set_dispatch_handler(
           DispatchMessagesDebugAgentCallback);
     debugger_running = env->debugger_agent()->Start(debug_port, wait);
+    if (debugger_running == false) {
+      fprintf(stderr, "Starting debugger on port %d failed\n", debug_port);
+      fflush(stderr);
+      return;
+    }
 #if HAVE_INSPECTOR
   }
 #endif
-
-  if (debugger_running == false) {
-    fprintf(stderr, "Starting debugger on port %d failed\n", debug_port);
-    fflush(stderr);
-    return;
-  }
 }