mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/netcheck: hard-code preferred DERP region 900 on js/wasm for now 

See TODO in code.

Updates #3157

Change-Id: I3a14dd2cf51d3c21336bb357af5abc362a079ff4
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-10-22 09:08:15 -07:00
parent c209278a9b
commit a8e2cceefd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/netcheck/netcheck.go
View File

@ -17,6 +17,7 @@ import (
"net" "net"
"net/http" "net/http"
"os" "os"
"runtime"
"sort" "sort"
"strconv" "strconv"
"sync" "sync"
@ -737,6 +738,16 @@ func (c *Client) udpBindAddr() string {
// //
// It may not be called concurrently with itself. // It may not be called concurrently with itself.
func (c *Client) GetReport(ctx context.Context, dm *tailcfg.DERPMap) (*Report, error) { func (c *Client) GetReport(ctx context.Context, dm *tailcfg.DERPMap) (*Report, error) {
if runtime.GOOS == "js" {
// TODO(bradfitz): do a real js/wasm netcheck, once
// the WebSocket-capable DERPs are rolled out. For now
// you need to be running in a tailnet with Region 900
// derper available that supports webassembly.
return &Report{
PreferredDERP: 900,
}, nil
}
// Mask user context with ours that we guarantee to cancel so // Mask user context with ours that we guarantee to cancel so
// we can depend on it being closed in goroutines later. // we can depend on it being closed in goroutines later.
// (User ctx might be context.Background, etc) // (User ctx might be context.Background, etc)