Allow binding the vm service to IPv6 addresses.

runtime/bin/main.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_tools_api.h"
@@ skipping 90 matching lines @@
 
 
 // Global flag that is used to indicate that we want to trace resolution of
 // URIs and the loading of libraries, parts and scripts.
 static bool trace_loading = false;
 
 
 static Dart_Isolate main_isolate = NULL;
 
 
-static const char* DEFAULT_VM_SERVICE_SERVER_IP = "127.0.0.1";
+static const char* DEFAULT_VM_SERVICE_SERVER_IP = "localhost";
 static const int DEFAULT_VM_SERVICE_SERVER_PORT = 8181;
 // VM Service options.
 static const char* vm_service_server_ip = DEFAULT_VM_SERVICE_SERVER_IP;
 // The 0 port is a magic value which results in the first available port
 // being allocated.
 static int vm_service_server_port = -1;
 // True when we are running in development mode and cross origin security
 // checks are disabled.
 static bool vm_service_dev_mode = false;
 
@@ skipping 94 matching lines @@
   commandline_packages_file = arg;
   return true;
 }
 
 
 static void* GetHashmapKeyFromString(char* key) {
   return reinterpret_cast<void*>(key);
 }
 
 
-static bool ExtractPortAndIP(const char* option_value,
-                             int* out_port,
-                             const char** out_ip,
-                             int default_port,
-                             const char* default_ip) {
+static bool ExtractPortAndAddress(const char* option_value,
+                                  int* out_port,
+                                  const char** out_ip,
+                                  int default_port,
+                                  const char* default_ip) {
   // [option_value] has to be one of the following formats:
   //   - ""
   //   - ":8181"
   //   - "=8181"
   //   - ":8181/192.168.0.1"
   //   - "=8181/192.168.0.1"
+  //   - "=8181/::1"
 
   if (*option_value == '\0') {
     *out_ip = default_ip;
     *out_port = default_port;
     return true;
   }
 
   if ((*option_value != '=') && (*option_value != ':')) {
     return false;
   }
 
   int port = atoi(option_value + 1);
   const char* slash = strstr(option_value, "/");
   if (slash == NULL) {
     *out_ip = default_ip;
     *out_port = port;
     return true;
   }
 
-  int _, n;
-  if (sscanf(option_value + 1, "%d/%d.%d.%d.%d%n",  // NOLINT(runtime/printf)
-             &_, &_, &_, &_, &_, &n)) {
-    if (option_value[1 + n] == '\0') {
-      *out_ip = slash + 1;
-      *out_port = port;
-      return true;
-    }
-  }
-  return false;
+  *out_ip = slash + 1;
+  *out_port = port;
+  return true;
 }
 
 
 static bool ProcessEnvironmentOption(const char* arg,
                                      CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg == '\0') {
     // Ignore empty -D option.
     Log::PrintErr("No arguments given to -D option, ignoring it\n");
     return true;
@@ skipping 93 matching lines @@
       "script, app-aot, app-jit\n",
       kind);
   return false;
 }
 
 
 static bool ProcessEnableVmServiceOption(const char* option_value,
                                          CommandLineOptions* vm_options) {
   ASSERT(option_value != NULL);
 
-  if (!ExtractPortAndIP(option_value, &vm_service_server_port,
-                        &vm_service_server_ip, DEFAULT_VM_SERVICE_SERVER_PORT,
-                        DEFAULT_VM_SERVICE_SERVER_IP)) {
+  if (!ExtractPortAndAddress(
+          option_value, &vm_service_server_port, &vm_service_server_ip,
+          DEFAULT_VM_SERVICE_SERVER_PORT, DEFAULT_VM_SERVICE_SERVER_IP)) {
     Log::PrintErr(
         "unrecognized --enable-vm-service option syntax. "
-        "Use --enable-vm-service[=<port number>[/<IPv4 address>]]\n");
+        "Use --enable-vm-service[=<port number>[/<bind address>]]\n");
     return false;
   }
 
   return true;
 }
 
 
 static bool ProcessDisableServiceOriginCheckOption(
     const char* option_value,
     CommandLineOptions* vm_options) {
   ASSERT(option_value != NULL);
   Log::PrintErr(
       "WARNING: You are running with the service protocol in an "
       "insecure mode.\n");
   vm_service_dev_mode = true;
   return true;
 }
 
 
 static bool ProcessObserveOption(const char* option_value,
                                  CommandLineOptions* vm_options) {
   ASSERT(option_value != NULL);
 
-  if (!ExtractPortAndIP(option_value, &vm_service_server_port,
-                        &vm_service_server_ip, DEFAULT_VM_SERVICE_SERVER_PORT,
-                        DEFAULT_VM_SERVICE_SERVER_IP)) {
+  if (!ExtractPortAndAddress(
+          option_value, &vm_service_server_port, &vm_service_server_ip,
+          DEFAULT_VM_SERVICE_SERVER_PORT, DEFAULT_VM_SERVICE_SERVER_IP)) {
     Log::PrintErr(
         "unrecognized --observe option syntax. "
-        "Use --observe[=<port number>[/<IPv4 address>]]\n");
+        "Use --observe[=<port number>[/<bind address>]]\n");
     return false;
   }
 
   // These options should also be documented in the help message.
   vm_options->AddArgument("--pause-isolates-on-exit");
   vm_options->AddArgument("--pause-isolates-on-unhandled-exceptions");
   vm_options->AddArgument("--warn-on-pause-with-no-debugger");
   return true;
 }
 
@@ skipping 599 matching lines @@
 "                    script(default), app-aot or app-jit\n"
 "    <file_name> specifies the file into which the snapshot is written\n"
 "--version\n"
 "  Print the VM version.\n"
 "\n"
 "--trace-loading\n"
 "  enables tracing of library and script loading\n"
 "\n"
 "--enable-vm-service[=<port>[/<bind-address>]]\n"
 "  enables the VM service and listens on specified port for connections\n"
-"  (default port number is 8181, default bind address is 127.0.0.1).\n"
+"  (default port number is 8181, default bind address is localhost).\n"
 #if !defined(TARGET_OS_MACOS)
 "\n"
 "--root-certs-file=<path>\n"
 "  The path to a file containing the trusted root certificates to use for\n"
 "  secure socket connections.\n"
 "--root-certs-cache=<path>\n"
 "  The path to a cache directory containing the trusted root certificates to\n"
 "  use for secure socket connections.\n"
 #endif  // !defined(TARGET_OS_MACOS)
 "\n"
@@ skipping 904 matching lines @@
   Platform::Exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }