diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/derper/derper.go | 8 | ||||
| -rw-r--r-- | cmd/derpprobe/derpprobe.go | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmd/derper/derper.go b/cmd/derper/derper.go index 5513a2062..1f5543e28 100644 --- a/cmd/derper/derper.go +++ b/cmd/derper/derper.go @@ -81,6 +81,14 @@ func init() { expvar.Publish("gauge_derper_tls_active_version", tlsActiveVersion) } +// parseRegion reports the region "derp<N>" by parsing the -mesh-with flag. +func parseRegion() string { + // ExecStart=/home/derp/derper -c /home/derp/derper.conf --certdir=/home/derp/certs --hostname=derp.tailscale.com --mesh-with=derp4c.tailscale.com,derp4d.tailscale.com,derp4e.tailscale.com --stun --bootstrap-dns-names=log.tailscale.io,login.tailscale.com,controlplane.tailscale.com,login.us.tailscale.com + for _, host := range strings.Split(*meshWith, ",") { + } + return 0 +} + type config struct { PrivateKey key.NodePrivate } diff --git a/cmd/derpprobe/derpprobe.go b/cmd/derpprobe/derpprobe.go index 07660f8c7..46f349973 100644 --- a/cmd/derpprobe/derpprobe.go +++ b/cmd/derpprobe/derpprobe.go @@ -360,7 +360,7 @@ func probeUDP(ctx context.Context, dm *tailcfg.DERPMap, n *tailcfg.DERPNode) (la time.Sleep(100 * time.Millisecond) continue } - txBack, _, _, err := stun.ParseResponse(buf[:n]) + txBack, _, _, _, err := stun.ParseResponse(buf[:n]) if err != nil { return 0, fmt.Errorf("parsing STUN response from %v: %v", ip, err) } |