Support for IPV6 for observatory in Dartium.

runtime/bin/vmservice_dartium.cc

 // Copyright (c) 2015, 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 "bin/vmservice_dartium.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/eventhandler.h"
 #include "bin/platform.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 #include "bin/vmservice_impl.h"
 #include "zlib/zlib.h"
 
 namespace dart {
 namespace bin {
 
 #define CHECK_RESULT(result)                                                   \
   if (Dart_IsError(result)) {                                                  \
     fprintf(stderr, "CHECK_RESULT failed: %s", Dart_GetError(result));         \
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
     return 0;                                                                  \
   }
 
+static const char* DART_IPV6_ONLY_FLAG = "DART_IPV6_ONLY";
+static const char* DEFAULT_VM_SERVICE_SERVER_IP_V6 = "localhost";

[rmacnak, 2017/06/20 21:24:06]

Do you mean ::1?

localhost could resolve to 127.0.0.1 or ::1 on an IPv6-capable system, but
presumably DART_IPV6_ONLY_FLAG should force ::1

[terry, 2017/06/20 21:39:01]

Done.

+static const char* DEFAULT_VM_SERVICE_SERVER_IP_V4 = "127.0.0.1";
+static const int DEFAULT_VM_SERVICE_SERVER_PORT = 0;
 
-static const char* DEFAULT_VM_SERVICE_SERVER_IP = "127.0.0.1";
-static const int DEFAULT_VM_SERVICE_SERVER_PORT = 0;
+static int IsIpv6Only() {

[rmacnak, 2017/06/20 21:24:06]

int -> bool

[terry, 2017/06/20 21:39:02]

Done.

+  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");
   }
   DartUtils::SetOriginalWorkingDirectory();
   Thread::InitOnce();
   TimerUtils::InitOnce();
   EventHandler::Start();
 }
@@ skipping 11 matching lines @@
   if (!isolate) {
     fprintf(stderr, "Dart_CreateIsolate failed: %s\n", error);
     return 0;
   }
 
   Dart_EnterScope();
   Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
   Builtin::SetNativeResolver(Builtin::kIOLibrary);
 
   ASSERT(Dart_IsServiceIsolate(isolate));
+  int ipv6 = IsIpv6Only();

[rmacnak, 2017/06/20 21:24:05]

int -> bool

[terry, 2017/06/20 21:39:02]

Done.

   if (!VmService::Setup(
-          DEFAULT_VM_SERVICE_SERVER_IP, DEFAULT_VM_SERVICE_SERVER_PORT,
+          ipv6 ? 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",
             VmService::GetErrorMessage());
     isolate = NULL;
   }
   Dart_ExitScope();
   Dart_ExitIsolate();
   return isolate;
 }
@@ skipping 68 matching lines @@
 
 
 /* DISALLOW_ALLOCATION */
 void VmServiceServer::operator delete(void* pointer) {
   fprintf(stderr, "unreachable code\n");
   abort();
 }
 
 }  // namespace bin
 }  // namespace dart