commit f50463fe16e9b33e7121dc48b8a9b468495a956e
author Terry Lucas <terry@google.com> Tue Jun 20 19:31:54 2017 -0700
committer William Hesse <whesse@google.com> Wed Jun 21 14:10:11 2017 +0200
tree 028767a7248b5e8c32c657233fd4df91321dd2f8
parent de4c13d8e7bfd5151389c92857c66d351ce17f72

Support for IPV6 for observatory in Dartium.

R=rmacnak@google.com
BUG=62811100

Review-Url: https://codereview.chromium.org/2944303003 .

runtime/bin/vmservice_dartium.cc

diff --git a/runtime/bin/vmservice_dartium.cc b/runtime/bin/vmservice_dartium.cc
index c0e6f78..2b674d2 100644
--- a/runtime/bin/vmservice_dartium.cc
+++ b/runtime/bin/vmservice_dartium.cc
@@ -24,10 +24,17 @@
     return 0;                                                                  \
   }
 
-
-static const char* DEFAULT_VM_SERVICE_SERVER_IP = "127.0.0.1";
+static const char* DART_IPV6_ONLY_FLAG = "DART_IPV6_ONLY";
+static const char* DEFAULT_VM_SERVICE_SERVER_IP_V6 = "::1";
+static const char* DEFAULT_VM_SERVICE_SERVER_IP_V4 = "127.0.0.1";
 static const int DEFAULT_VM_SERVICE_SERVER_PORT = 0;
 
+static bool IsIpv6Only() {
+  char* v = getenv(DART_IPV6_ONLY_FLAG);
+  if (!v) return 0;
+  return v[0] == '1';
+}
+
 void VmServiceServer::Bootstrap() {
   if (!Platform::Initialize()) {
     fprintf(stderr, "Platform::Initialize() failed\n");
@@ -59,7 +66,9 @@
 
   ASSERT(Dart_IsServiceIsolate(isolate));
   if (!VmService::Setup(
-          DEFAULT_VM_SERVICE_SERVER_IP, DEFAULT_VM_SERVICE_SERVER_PORT,
+          IsIpv6Only() ? DEFAULT_VM_SERVICE_SERVER_IP_V6 :
+                 DEFAULT_VM_SERVICE_SERVER_IP_V4,
+          DEFAULT_VM_SERVICE_SERVER_PORT,
           false /* running_precompiled */, false /* disable origin checks */,
           false /* trace_loading */)) {
     fprintf(stderr, "Vmservice::Setup failed: %s\n",