From ed7e08872991ca628ae93e01085f2dcc41a7689d Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Wed, 11 Mar 2020 12:38:41 -0700
Subject: [PATCH] netcheck: ignore IPv6 STUN failures

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 netcheck/netcheck.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/netcheck/netcheck.go b/netcheck/netcheck.go
index 4764d9e64..3f31a200a 100644
--- a/netcheck/netcheck.go
+++ b/netcheck/netcheck.go
@@ -311,7 +311,14 @@ func (c *Client) GetReport(ctx context.Context) (*Report, error) {
 			DNSCache: dnscache.Get(),
 		}
 		c.s6 = s6
-		grp.Go(func() error { return s6.Run(ctx) })
+		grp.Go(func() error {
+			if err := s6.Run(ctx); err != nil {
+				// IPv6 seemed like it was configured, but actually failed.
+				// Just log and return a nil error.
+				c.logf("netcheck: ignoring IPv6 failure: %v", err)
+			}
+			return nil
+		})
 		if c.GetSTUNConn6 == nil {
 			go reader(s6, pc6)
 		}