From 72bfea2ece2c91424f830219076e13fcc30803c6 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Mon, 29 Jun 2020 09:03:00 -0700
Subject: [PATCH] control/controlclient: remove IPv6 opt-out environment
 variable

It was temporary and 3 months has elapsed without problems.
---
 control/controlclient/direct.go | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go
index 8346b59a7..8658fd220 100644
--- a/control/controlclient/direct.go
+++ b/control/controlclient/direct.go
@@ -478,7 +478,7 @@ func (c *Direct) PollNetMap(ctx context.Context, maxPolls int, cb func(*NetworkM
 
 	request := tailcfg.MapRequest{
 		Version:     4,
-		IncludeIPv6: includeIPv6(),
+		IncludeIPv6: true,
 		KeepAlive:   c.keepAlive,
 		NodeKey:     tailcfg.NodeKey(persist.PrivateNodeKey.Public()),
 		DiscoKey:    c.discoPubKey,
@@ -766,14 +766,3 @@ func loadServerKey(ctx context.Context, httpc *http.Client, serverURL string) (w
 	}
 	return key, nil
 }
-
-// includeIPv6 reports whether we should enable IPv6 for magicsock
-// connections. This is only here temporarily (2020-03-26) as a
-// opt-out in case there are problems.
-func includeIPv6() bool {
-	if e := os.Getenv("DEBUG_INCLUDE_IPV6"); e != "" {
-		v, _ := strconv.ParseBool(e)
-		return v
-	}
-	return true
-}